Bläddra i källkod

Clean top-level folder by moving files into CMake folder

See #161
Jean-Christophe Fillion-Robin 12 år sedan
förälder
incheckning
3763f8e6bb

CTKConfig.cmake.in → CMake/CTKConfig.cmake.in


CTKConfigVersion.cmake.in → CMake/CTKConfigVersion.cmake.in


CTKPluginUseFile.cmake.in → CMake/CTKPluginUseFile.cmake.in


CTestConfigSubProject.cmake.in → CMake/CTestConfigSubProject.cmake.in


+ 3 - 3
CMake/LastConfigureStep/CTKGenerateCTKConfig.cmake

@@ -171,11 +171,11 @@ set(CTK_BUILD_TYPE_CONFIG ${CMAKE_BUILD_TYPE})
 
 #-----------------------------------------------------------------------------
 # Configure CTKConfig.cmake for the build tree.
-configure_file(${CTK_SOURCE_DIR}/CTKConfig.cmake.in
+configure_file(${CTK_SOURCE_DIR}/CMake/CTKConfig.cmake.in
                ${CTK_SUPERBUILD_BINARY_DIR}/CTKConfig.cmake @ONLY IMMEDIATE)
-configure_file(${CTK_SOURCE_DIR}/CTKConfigVersion.cmake.in
+configure_file(${CTK_SOURCE_DIR}/CMake/CTKConfigVersion.cmake.in
                ${CTK_SUPERBUILD_BINARY_DIR}/CTKConfigVersion.cmake @ONLY IMMEDIATE)
-configure_file(${CTK_SOURCE_DIR}/ctkConfig.h.in
+configure_file(${CTK_SOURCE_DIR}/CMake/ctkConfig.h.in
                ${CTK_CONFIG_H_INCLUDE_DIR}/ctkConfig.h @ONLY IMMEDIATE)
 
 #-----------------------------------------------------------------------------

UseCTK.cmake.in → CMake/UseCTK.cmake.in


ctkConfig.h.in → CMake/ctkConfig.h.in


+ 1 - 1
CMake/ctkFunctionGeneratePluginUseFile.cmake

@@ -53,5 +53,5 @@ set(${plugin}_LIBRARY_DIRS \"${${plugin}_LIBRARY_DIRS}\")")
   set(_ctk_plugin_libraries_variable ${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES)
   set(_ctk_plugin_libraries ${${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES})
 
-  configure_file("${CTK_CMAKE_DIR}/../CTKPluginUseFile.cmake.in" "${filename}" @ONLY)
+  configure_file("${CTK_CMAKE_DIR}/../CMake/CTKPluginUseFile.cmake.in" "${filename}" @ONLY)
 endfunction()

+ 3 - 3
CMakeLists.txt

@@ -723,8 +723,8 @@ IF (subproject_count EQUAL 0)
   set(CTEST_PROJECT_SUBPROJECTS CTKCore)
 endif()
 
-# Configure CTestConfigSubProject.cmake used that could be used by CTest scripts
-configure_file(${CTK_SOURCE_DIR}/CTestConfigSubProject.cmake.in
+# Configure CTestConfigSubProject.cmake that could be used by CTest scripts
+configure_file(${CTK_SOURCE_DIR}/CMake/CTestConfigSubProject.cmake.in
                ${CTK_BINARY_DIR}/CTestConfigSubProject.cmake)
 
 #-----------------------------------------------------------------------------
@@ -818,7 +818,7 @@ endif()
 #-----------------------------------------------------------------------------
 # Configure files with settings
 #
-configure_file(${CTK_SOURCE_DIR}/UseCTK.cmake.in
+configure_file(${CTK_SOURCE_DIR}/CMake/UseCTK.cmake.in
                ${CTK_SUPERBUILD_BINARY_DIR}/UseCTK.cmake COPYONLY IMMEDIATE)
 
 set(CTK_CONFIG_H_INCLUDE_DIR ${CTK_BINARY_DIR})