tqcq/mstch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow inclusion in another project

Browse Source 
CMake allows projects to build dependencies as subdirectories using the
add_subdirectory command.
CMAKE_SOURCE_DIR refers to the top-level project directory which may very well
*not* be the mstch root directory if mstch is "embedded" in another project.
This patch offers to use PROJECT_SOURCE_DIR instead which accurately refers to
the "source directory of the most recent `project()` command", in this case, the
mstch root directory.
This commit is contained in:
Romuald CARI 2015-10-13 15:24:52 +02:00
parent 8a7fb778b3
commit 74ed09fda0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/CMakeLists.txt
View File

@ -1,7 +1,7 @@
find_package(Boost 1.54 REQUIRED) find_package(Boost 1.54 REQUIRED)
include_directories( include_directories(
${CMAKE_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/include
${Boost_INCLUDE_DIR}) ${Boost_INCLUDE_DIR})
set(SRC set(SRC
@ -29,7 +29,7 @@ install(
ARCHIVE DESTINATION lib) ARCHIVE DESTINATION lib)
install( install(
FILES "${CMAKE_SOURCE_DIR}/include/mstch/mstch.hpp" FILES "${PROJECT_SOURCE_DIR}/include/mstch/mstch.hpp"
DESTINATION include/mstch DESTINATION include/mstch
COMPONENT Devel) COMPONENT Devel)
@ -45,7 +45,7 @@ export(
NAMESPACE mstch::) NAMESPACE mstch::)
configure_file( configure_file(
"${CMAKE_SOURCE_DIR}/cmake/mstch-config.cmake" "${PROJECT_SOURCE_DIR}/cmake/mstch-config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/mstch/mstch-config.cmake") "${CMAKE_CURRENT_BINARY_DIR}/mstch/mstch-config.cmake")
install( install(
@ -55,7 +55,7 @@ install(
DESTINATION lib/cmake/mstch) DESTINATION lib/cmake/mstch)
install(FILES install(FILES
"${CMAKE_SOURCE_DIR}/cmake/mstch-config.cmake" "${PROJECT_SOURCE_DIR}/cmake/mstch-config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/mstch/mstch-config-version.cmake" "${CMAKE_CURRENT_BINARY_DIR}/mstch/mstch-config-version.cmake"
DESTINATION lib/cmake/mstch DESTINATION lib/cmake/mstch
COMPONENT Devel) COMPONENT Devel)