From 0b21eac01cbe785c08bf669cf79afec2440e86f4 Mon Sep 17 00:00:00 2001 From: Thomas James Passmore Date: Tue, 13 Nov 2018 01:29:15 +1300 Subject: [PATCH] Fix CMake scripts cmake/configure_macros.cmake and cmake/configure_compiler.cmake incorrectly reference CMAKE_SOURCE_DIR, occurences have been changed to PROJECT_SOURCE_DIR closes #7 --- cmake/configure_compiler.cmake | 6 +++--- cmake/configure_macros.cmake | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/configure_compiler.cmake b/cmake/configure_compiler.cmake index 33d3957..5181b58 100644 --- a/cmake/configure_compiler.cmake +++ b/cmake/configure_compiler.cmake @@ -22,11 +22,11 @@ # Select the compiler specific cmake file set(MSVC_ID "MSVC") if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") - include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang.cmake) + include(${PROJECT_SOURCE_DIR}/cmake/compiler/clang.cmake) elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") - include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc.cmake) + include(${PROJECT_SOURCE_DIR}/cmake/compiler/gcc.cmake) elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL ${MSVC_ID}) - include(${CMAKE_SOURCE_DIR}/cmake/compiler/msvc.cmake) + include(${PROJECT_SOURCE_DIR}/cmake/compiler/msvc.cmake) else() message(FATAL_ERROR "Unknown compiler!") endif() diff --git a/cmake/configure_macros.cmake b/cmake/configure_macros.cmake index 91b6bac..7a19aaa 100644 --- a/cmake/configure_macros.cmake +++ b/cmake/configure_macros.cmake @@ -19,4 +19,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -include(${CMAKE_SOURCE_DIR}/cmake/macros/group_sources.cmake) +include(${PROJECT_SOURCE_DIR}/cmake/macros/group_sources.cmake)