From 74ed09fda08471b65d054bd55624d104af472911 Mon Sep 17 00:00:00 2001 From: Romuald CARI Date: Tue, 13 Oct 2015 15:24:52 +0200 Subject: [PATCH] Allow inclusion in another project 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. --- src/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2e30ded..7d3dd42 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ find_package(Boost 1.54 REQUIRED) include_directories( - ${CMAKE_SOURCE_DIR}/include + ${PROJECT_SOURCE_DIR}/include ${Boost_INCLUDE_DIR}) set(SRC @@ -29,7 +29,7 @@ install( ARCHIVE DESTINATION lib) install( - FILES "${CMAKE_SOURCE_DIR}/include/mstch/mstch.hpp" + FILES "${PROJECT_SOURCE_DIR}/include/mstch/mstch.hpp" DESTINATION include/mstch COMPONENT Devel) @@ -45,7 +45,7 @@ export( NAMESPACE mstch::) configure_file( - "${CMAKE_SOURCE_DIR}/cmake/mstch-config.cmake" + "${PROJECT_SOURCE_DIR}/cmake/mstch-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/mstch/mstch-config.cmake") install( @@ -55,7 +55,7 @@ install( DESTINATION lib/cmake/mstch) 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" DESTINATION lib/cmake/mstch COMPONENT Devel)