diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 178ff0bf..eea4b248 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -2,21 +2,24 @@ # Install project-specific modules and scripts. The module directory will be # appended to CMAKE_MODULE_PATH when loading this project's configuration file # -if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Modules) - install(DIRECTORY - ${CMAKE_CURRENT_SOURCE_DIR}/Modules - DESTINATION ${INSTALL_CONFIGDIR} - PATTERN "PoddCreate*.cmake" EXCLUDE - ) -endif() +install(DIRECTORY + ${CMAKE_CURRENT_LIST_DIR}/Modules + DESTINATION ${INSTALL_CONFIGDIR} + PATTERN "PoddCreate*.cmake" EXCLUDE + ) -if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts) - install(DIRECTORY - ${CMAKE_CURRENT_SOURCE_DIR}/scripts - DESTINATION ${INSTALL_CONFIGDIR} - USE_SOURCE_PERMISSIONS - ) -endif() +install(DIRECTORY + ${CMAKE_CURRENT_LIST_DIR}/scripts + DESTINATION ${INSTALL_CONFIGDIR} + USE_SOURCE_PERMISSIONS + ) + +install(DIRECTORY + ${CMAKE_CURRENT_LIST_DIR}/templates + DESTINATION ${INSTALL_CONFIGDIR} + USE_SOURCE_PERMISSIONS + FILES_MATCHING PATTERN "GrabGitRef.cmake.in" + ) #---------------------------------------------------------------------------- # Create Config.cmake and ConfigVersion.cmake diff --git a/cmake/Modules/PoddCMakeEnv.cmake b/cmake/Modules/PoddCMakeEnv.cmake index caa2060f..95e477f7 100644 --- a/cmake/Modules/PoddCMakeEnv.cmake +++ b/cmake/Modules/PoddCMakeEnv.cmake @@ -189,6 +189,7 @@ function(report_build_info) endif() message(STATUS "${PROJECT_NAME_UC}_CXX_FLAGS = ${${PROJECT_NAME_UC}_CXX_FLAGS} ${${PROJECT_NAME_UC}_DIAG_FLAGS}") message(STATUS "CMAKE_CXX_STANDARD = ${CMAKE_CXX_STANDARD}") + message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}") if(CMAKE_INSTALL_RPATH) message(STATUS "CMAKE_INSTALL_RPATH = ${CMAKE_INSTALL_RPATH}") endif()