瀏覽代碼

Expose ctkMacroGenerateMocs.cmake and ctkTest.h also if BUILD_TESTING is OFF

Jean-Christophe Fillion-Robin 13 年之前
父節點
當前提交
bafec58796
共有 4 個文件被更改,包括 5 次插入3 次删除
  1. 1 3
      CMakeLists.txt
  2. 1 0
      CTKConfig.cmake.in
  3. 1 0
      Libs/Testing/CMakeLists.txt
  4. 2 0
      Utilities/LastConfigureStep/CTKGenerateCTKConfig.cmake

+ 1 - 3
CMakeLists.txt

@@ -827,9 +827,7 @@ set(CTK_EXPORT_HEADER_TEMPLATE "${CTK_SOURCE_DIR}/Libs/ctkExport.h.in")
 #-----------------------------------------------------------------------------
 # Setup testing environment before Libs are added
 #
-if(BUILD_TESTING)
-  add_subdirectory(Libs/Testing)
-endif()
+add_subdirectory(Libs/Testing)
 
 #-----------------------------------------------------------------------------
 # Add CTK library subdirectories

+ 1 - 0
CTKConfig.cmake.in

@@ -67,6 +67,7 @@ INCLUDE("@CTK_CMAKE_DIR_CONFIG@/ctkFunctionGetAllPluginTargets.cmake")
 INCLUDE("@CTK_CMAKE_DIR_CONFIG@/ctkFunctionGetTargetDependencies.cmake")
 INCLUDE("@CTK_CMAKE_DIR_CONFIG@/ctkFunctionGetPluginDependencies.cmake")
 INCLUDE("@CTK_CMAKE_DIR_CONFIG@/ctkMacroSetupPlugins.cmake")
+INCLUDE("@CTKTesting_CMAKE_DIR_CONFIG@/ctkMacroGenerateMocs.cmake")
 
 SET(CTK_EXPORT_HEADER_TEMPLATE "@CTK_EXPORT_HEADER_TEMPLATE@")
 

+ 1 - 0
Libs/Testing/CMakeLists.txt

@@ -2,3 +2,4 @@ project(CTKTesting)
 
 # CMake Macros
 include(CMake/ctkMacroGenerateMocs.cmake)
+

+ 2 - 0
Utilities/LastConfigureStep/CTKGenerateCTKConfig.cmake

@@ -102,6 +102,8 @@ set(CTK_INCLUDE_DIRS_CONFIG
   ${CTK_BASE_INCLUDE_DIRS}
 )
 
+set(CTKTesting_CMAKE_DIR_CONFIG "${CTKTesting_SOURCE_DIR}/CMake")
+
 # Consider "headeronly" libraries
 set(headeronly_libs CTKTesting)
 foreach(lib ${headeronly_libs})