aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/po
diff options
context:
space:
mode:
authorRui Abreu Ferreira <raf-ep@gmx.com>2014-12-01 10:25:40 +0000
committerRui Abreu Ferreira <raf-ep@gmx.com>2014-12-03 14:23:08 +0000
commit923d021c0f97740dfa35b3cb0d95f02987cdf4cc (patch)
tree84388477261a13e5bf612e30b58047b9aec39c1f /src/nvim/po
parentcb86eca91f9bdffe8b0214664169093d41902415 (diff)
downloadrneovim-923d021c0f97740dfa35b3cb0d95f02987cdf4cc.tar.gz
rneovim-923d021c0f97740dfa35b3cb0d95f02987cdf4cc.tar.bz2
rneovim-923d021c0f97740dfa35b3cb0d95f02987cdf4cc.zip
Don't use env vars for configuration time options
- As a general rule of thumb one shouldn't use environment variables for setting configuration options for CMake. The reason for this is we don't know when CMake will be executed and re-evaluate that variable. - e.g. If we run cmake a first time with a var set, and then run make on a second session (with no var) and cmake is called because a dependency changed, the option would be disabled - This commit removes the use of environment vars from src/nvim/CMakeLists.txt entirely - Removed SKIP_UNITTEST since it could only be used to remove a target at configuration time (and the target was optional anyway) - Turned SANITIZE into an option, clang-asan.sh now passes cmake -DSANITIZE=ON - Removed SKIP_EXEC since it was disabling a target at configuration time (not being used)
Diffstat (limited to 'src/nvim/po')
-rw-r--r--src/nvim/po/CMakeLists.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt
index 6a56e302e9..443f3c6595 100644
--- a/src/nvim/po/CMakeLists.txt
+++ b/src/nvim/po/CMakeLists.txt
@@ -2,8 +2,7 @@ find_package(Gettext)
find_program(XGETTEXT_PRG xgettext)
find_program(ICONV_PRG iconv)
-if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG AND
- NOT DEFINED ENV{SKIP_EXEC})
+if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
set(ENV{OLD_PO_FILE_INPUT} yes)
set(ENV{OLD_PO_FILE_OUTPUT} yes)