From 46406e25c759cd2756ba8166b8b3bbbf687010d1 Mon Sep 17 00:00:00 2001 From: Eric Lavesson Date: Thu, 25 Dec 2014 14:55:22 +0100 Subject: [PATCH 1/2] Use CMAKE_CURRENT_SOURCE_DIR for modules This makes it possible to add cAudio from another CMakeLists.txt --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c7dcf28..a4afcb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,9 +11,9 @@ project(cAudio) # Include necessary submodules set(CMAKE_MODULE_PATH - "${CMAKE_SOURCE_DIR}/CMake" - "${CMAKE_SOURCE_DIR}/CMake/Utils" - "${CMAKE_SOURCE_DIR}/CMake/Packages" + "${CMAKE_CURRENT_SOURCE_DIR}/CMake" + "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Utils" + "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Packages" ) include(CMakeDependentOption) From 77fd0e4b6ad98cdd31d8c288f96193ba8f7a3ac2 Mon Sep 17 00:00:00 2001 From: Eric Lavesson Date: Thu, 25 Dec 2014 15:13:33 +0100 Subject: [PATCH 2/2] Use a relative path for configure_file --- cAudio/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cAudio/CMakeLists.txt b/cAudio/CMakeLists.txt index f5a1d09..6787837 100644 --- a/cAudio/CMakeLists.txt +++ b/cAudio/CMakeLists.txt @@ -5,7 +5,7 @@ if(CAUDIO_STATIC) endif() # generate cAudioBuildSettings.h -configure_file(${CMAKE_SOURCE_DIR}/CMake/Templates/cAudioBuildSettings.h.in ${CMAKE_BINARY_DIR}/include/cAudioBuildSettings.h @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../CMake/Templates/cAudioBuildSettings.h.in ${CMAKE_BINARY_DIR}/include/cAudioBuildSettings.h @ONLY) install(FILES ${CMAKE_BINARY_DIR}/include/cAudioBuildSettings.h DESTINATION include/cAudio) INSTALL(DIRECTORY include/ DESTINATION include/cAudio FILES_MATCHING PATTERN "*.h")