Merge pull request #30 from Lavesson/master

Use CMAKE_CURRENT_SOURCE_DIR for modules
This commit is contained in:
Raynaldo Rivera 2015-01-14 14:09:38 -07:00
commit 188bc2c2ed
2 changed files with 4 additions and 4 deletions

View File

@ -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)

View File

@ -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")