diff options
| author | John Szakmeister <john@szakmeister.net> | 2014-03-22 07:14:55 -0400 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2014-03-23 05:42:18 -0400 |
| commit | 7bd4d68d9316e13c6a8b3ff805daaf6b4c35e18c (patch) | |
| tree | 8935917a1cf11db1634e0f03661d0b80157c6132 | |
| parent | 9a277a612fdfa892c9c23da330056487d9ead191 (diff) | |
| download | rneovim-7bd4d68d9316e13c6a8b3ff805daaf6b4c35e18c.tar.gz rneovim-7bd4d68d9316e13c6a8b3ff805daaf6b4c35e18c.tar.bz2 rneovim-7bd4d68d9316e13c6a8b3ff805daaf6b4c35e18c.zip | |
Don't require busted.
Only provide the unittest target if busted was found. And only build
nvim-test if the unittest target exists by excluding nvim-test from all.
Note: this means nvim-test won't be built by default, but it will be
built when you try to run unittests.
| -rw-r--r-- | CMakeLists.txt | 26 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 6 |
2 files changed, 17 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 38fa216010..3475ca0640 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,18 +88,20 @@ if(NOT BUSTED_OUTPUT_TYPE) set(BUSTED_OUTPUT_TYPE "utf_terminal") endif() -get_target_property(NVIM_TEST_LIB nvim-test LOCATION) -add_custom_target(unittest - COMMAND ${CMAKE_COMMAND} - -DBUSTED_PRG=${BUSTED_PRG} - -DLUAJIT_PRG=${LUAJIT_PRG} - -DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR} - -DNVIM_TEST_LIB=${NVIM_TEST_LIB} - -DBUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE} - -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test - -DTEST_INCLUDES=${CMAKE_BINARY_DIR}/test/includes/post - -P ${CMAKE_MODULE_PATH}/RunUnittests.cmake - DEPENDS nvim-test unittest-headers) +if(BUSTED_PRG) + get_target_property(NVIM_TEST_LIB nvim-test LOCATION) + add_custom_target(unittest + COMMAND ${CMAKE_COMMAND} + -DBUSTED_PRG=${BUSTED_PRG} + -DLUAJIT_PRG=${LUAJIT_PRG} + -DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR} + -DNVIM_TEST_LIB=${NVIM_TEST_LIB} + -DBUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE} + -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test + -DTEST_INCLUDES=${CMAKE_BINARY_DIR}/test/includes/post + -P ${CMAKE_MODULE_PATH}/RunUnittests.cmake + DEPENDS nvim-test unittest-headers) +endif() # Unfortunately, the below does not work under Ninja. Ninja doesn't use a # pseudo-tty when launching processes, because it can put many jobs in parallel diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e89672a91f..386eb3f592 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -55,8 +55,8 @@ if(NOT DEFINED ENV{SKIP_EXEC}) endif() if(NOT DEFINED ENV{SKIP_UNITTEST}) - add_library(nvim-test MODULE ${NEOVIM_SOURCES} ${OS_SOURCES}) - target_link_libraries (nvim-test ${NVIM_LINK_LIBRARIES}) + add_library(nvim-test MODULE EXCLUDE_FROM_ALL ${NEOVIM_SOURCES} ${OS_SOURCES}) + target_link_libraries(nvim-test ${NVIM_LINK_LIBRARIES}) endif() -include_directories ("${PROJECT_SOURCE_DIR}/src/proto") +include_directories("${PROJECT_SOURCE_DIR}/src/proto") |