Add CMAKE_MODULE_PATH for tests #8

BoostCMake · Jul 10, 2018 · f692654 · f692654
1 parent abb6269
commit f692654
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required (VERSION 3.5)
 
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/share/modules/cmake")
+
 install(DIRECTORY share DESTINATION .)
 
 enable_testing()

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -17,7 +17,7 @@ endif()
 function(create_test NAME TEST)
     set(CONTEXT)
     # get_cmake_property(VARS VARIABLES)
-    foreach(VAR_NAME CMAKE_TOOLCHAIN_FILE CMAKE_CROSSCOMPILING)
+    foreach(VAR_NAME CMAKE_TOOLCHAIN_FILE CMAKE_CROSSCOMPILING CMAKE_MODULE_PATH)
         list(APPEND CONTEXT -D${VAR_NAME}=${${VAR_NAME}})
     endforeach()
     add_custom_target(${NAME} COMMAND ${CMAKE_COMMAND} ${CONTEXT} -P ${CMAKE_CURRENT_SOURCE_DIR}/test.cmake ${TEST} ${CMAKE_CURRENT_BINARY_DIR}/tmp/${NAME})

diff --git a/test/libbasicnamespace/CMakeLists.txt b/test/libbasicnamespace/CMakeLists.txt
@@ -7,6 +7,7 @@ include(CMInstallTargets)
 include(CMDeploy)
 include(CMTest)
 include(CMSetupVersion)
+include(CMFuture)
 
 cm_setup_version(VERSION 1.0)
 

diff --git a/test/test.cmake b/test/test.cmake
@@ -56,6 +56,7 @@ function(install_dir DIR)
         set(TOOLCHAIN_ARG "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
     endif()
     test_exec(COMMAND ${CMAKE_COMMAND}
+              -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
               -DCMAKE_PREFIX_PATH=${PREFIX}
               -DCMAKE_INSTALL_PREFIX=${PREFIX}
               -DTHREADS_PREFER_PTHREAD_FLAG=1