Skip to content

Commit f27b0bb

Browse files
committedMay 22, 2015
Move our project-specific cmake files into their own directory.
1 parent e7fd2ec commit f27b0bb

12 files changed

+10
-9
lines changed
 

‎CMakeLists.txt

+10-9
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ if(CMAKE_VERSION VERSION_LESS 3.0.0)
55
message(FATAL_ERROR "You must use CMake 3.0.0 or greater.")
66
endif()
77

8+
set(LOCAL_CMAKE_MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake-local")
89
# Custom CMake modules from https://github.com/rpavlik/cmake-modules
9-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}")
10+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${LOCAL_CMAKE_MODULE_DIR}")
1011

1112
###
1213
# Package Options
@@ -370,16 +371,16 @@ export(EXPORT osvrTargets
370371
# Register the current build dir as a package search location
371372
export(PACKAGE osvr)
372373

373-
configure_file(osvrConfig.cmake
374+
configure_file("${LOCAL_CMAKE_MODULE_DIR}/osvrConfig.cmake"
374375
"${CMAKE_CURRENT_BINARY_DIR}/osvrConfig.cmake"
375376
@ONLY)
376377

377378
# Copy over the shared CMake modules for use in a build tree.
378379
foreach(HELPER osvrAddPlugin osvrConvertJson)
379-
configure_file(${HELPER}.cmake "${CMAKE_CURRENT_BINARY_DIR}/${HELPER}.cmake" COPYONLY)
380+
configure_file("${LOCAL_CMAKE_MODULE_DIR}/${HELPER}.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${HELPER}.cmake" COPYONLY)
380381
endforeach()
381382

382-
configure_file(osvrConfigBuildTreePaths.cmake
383+
configure_file("${LOCAL_CMAKE_MODULE_DIR}/osvrConfigBuildTreePaths.cmake"
383384
"${CMAKE_CURRENT_BINARY_DIR}/osvrConfigBuildTreePaths.cmake"
384385
@ONLY)
385386

@@ -396,18 +397,18 @@ install(EXPORT osvrTargets
396397
install(FILES
397398
"${CMAKE_CURRENT_BINARY_DIR}/osvrConfig.cmake"
398399
"${CMAKE_CURRENT_BINARY_DIR}/osvrConfigVersion.cmake"
399-
"${CMAKE_CURRENT_SOURCE_DIR}/osvrAddPlugin.cmake"
400-
"${CMAKE_CURRENT_SOURCE_DIR}/osvrConfigInstalledBoost.cmake"
401-
"${CMAKE_CURRENT_SOURCE_DIR}/osvrConfigInstalledOpenCV.cmake"
402-
"${CMAKE_CURRENT_SOURCE_DIR}/osvrConvertJson.cmake"
400+
"${LOCAL_CMAKE_MODULE_DIR}/osvrAddPlugin.cmake"
401+
"${LOCAL_CMAKE_MODULE_DIR}/osvrConfigInstalledBoost.cmake"
402+
"${LOCAL_CMAKE_MODULE_DIR}/osvrConfigInstalledOpenCV.cmake"
403+
"${LOCAL_CMAKE_MODULE_DIR}/osvrConvertJson.cmake"
403404
DESTINATION
404405
${CONFIG_INSTALL_DIR}
405406
COMPONENT
406407
Devel)
407408

408409
if(WIN32)
409410
install(FILES
410-
"${CMAKE_CURRENT_SOURCE_DIR}/CMakeBoostHelper.cmake"
411+
"${LOCAL_CMAKE_MODULE_DIR}/CMakeBoostHelper.cmake"
411412
DESTINATION
412413
${CONFIG_INSTALL_DIR}
413414
COMPONENT
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)
Please sign in to comment.