diff options
| author | John Szakmeister <john@szakmeister.net> | 2014-11-10 19:26:01 -0500 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2014-11-10 19:26:01 -0500 |
| commit | 2540155591034610bd5550bd0a4e63b425907395 (patch) | |
| tree | a431f502d5eeadfda063bedeee157ba5c30c1531 /src | |
| parent | 3080672650b1a6583684edfdafef7e07c0c7cf56 (diff) | |
| download | rneovim-2540155591034610bd5550bd0a4e63b425907395.tar.gz rneovim-2540155591034610bd5550bd0a4e63b425907395.tar.bz2 rneovim-2540155591034610bd5550bd0a4e63b425907395.zip | |
build: fix CMAKE_MODULE_PATH usage
Fixes #1447. `CMAKE_MODULE_PATH` is meant to be a list of directories,
and as such, is not the proper way to launch our scripts. Let's use
`${PROJECT_SOURCE_DIR}/cmake` instead. Also, let's not outright set
`CMAKE_MODULE_PATH`, but instead append our location to the list.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/po/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt index 0ed39e8c49..6a56e302e9 100644 --- a/src/nvim/po/CMakeLists.txt +++ b/src/nvim/po/CMakeLists.txt @@ -50,7 +50,7 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG AND -DPOT_FILE=${NVIM_POT} -DSEARCH_DIR=${CMAKE_CURRENT_SOURCE_DIR} "'-DSOURCES=${NEOVIM_RELATIVE_SOURCES}'" - -P ${CMAKE_MODULE_PATH}/RunXgettext.cmake + -P ${PROJECT_SOURCE_DIR}/cmake/RunXgettext.cmake DEPENDS ${NEOVIM_SOURCES}) add_custom_target(potfile DEPENDS ${NVIM_POT}) @@ -68,7 +68,7 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG AND -DMSGFMT_PRG=${GETTEXT_MSGFMT_EXECUTABLE} -DMO_FILE=${moFile} -DPO_FILE=${poFile} - -P ${CMAKE_MODULE_PATH}/RunMsgfmt.cmake + -P ${PROJECT_SOURCE_DIR}/cmake/RunMsgfmt.cmake DEPENDS ${poFile} ${NVIM_POT}) install_helper( @@ -107,7 +107,7 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG AND -DINPUT_ENC=${inputEnc} -DOUTPUT_ENC=${outputEnc} -DOUTPUT_CHARSET=${outputCharSet} - -P ${CMAKE_MODULE_PATH}/ConvertPo.cmake + -P ${PROJECT_SOURCE_DIR}/cmake/ConvertPo.cmake COMMENT "Updating ${outputName}.po" DEPENDS ${inputFile}) @@ -190,7 +190,7 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG AND -DMSGMERGE_PRG=${GETTEXT_MSGMERGE_EXECUTABLE} -DPO_FILE=${poFile} -DPOT_FILE=${NVIM_POT} - -P ${CMAKE_MODULE_PATH}/RunMsgmerge.cmake + -P ${PROJECT_SOURCE_DIR}/cmake/RunMsgmerge.cmake COMMENT "Updating ${LANGUAGE}.po" DEPENDS ${NVIM_POT}) |