diff --git a/cmake/modules/AppTarget.cmake b/cmake/modules/AppTarget.cmake index f33f9a3..970da57 100644 --- a/cmake/modules/AppTarget.cmake +++ b/cmake/modules/AppTarget.cmake @@ -80,9 +80,9 @@ elseif(EXISTS "${CPP_UTILITIES_SOURCE_DIR}/cmake/templates/desktop.in") # check sources of c++utilities set(APP_DESKTOP_TEMPLATE_FILE "${CPP_UTILITIES_SOURCE_DIR}/cmake/templates/desktop.in") message(STATUS "Using template for *.desktop file from c++utilities source directory.") -elseif(EXISTS "${CMAKE_INSTALL_PREFIX}/share/c++utilities/cmake/templates/desktop.in") +elseif(EXISTS "${CPP_UTILITIES_CONFIG_DIRS}/templates/desktop.in") # check installed version of c++utilities - set(APP_DESKTOP_TEMPLATE_FILE "${CMAKE_INSTALL_PREFIX}/share/c++utilities/cmake/templates/desktop.in") + set(APP_DESKTOP_TEMPLATE_FILE "${CPP_UTILITIES_CONFIG_DIRS}/templates/desktop.in") message(STATUS "Using template for *.desktop file from c++utilities installation.") else() message(FATAL_ERROR "Template for *.desktop file can not be located.") diff --git a/cmake/modules/BasicConfig.cmake b/cmake/modules/BasicConfig.cmake index 2fa7c5b..baa9b06 100644 --- a/cmake/modules/BasicConfig.cmake +++ b/cmake/modules/BasicConfig.cmake @@ -38,9 +38,9 @@ elseif(EXISTS "${CPP_UTILITIES_SOURCE_DIR}/cmake/templates/config.h.in") # check sources of c++utilities set(CONFIG_H_TEMPLATE_FILE "${CPP_UTILITIES_SOURCE_DIR}/cmake/templates/config.h.in") message(STATUS "Using template for config.h from c++utilities source directory.") -elseif(EXISTS "${CMAKE_INSTALL_PREFIX}/share/c++utilities/cmake/templates/config.h.in") +elseif(EXISTS "${CPP_UTILITIES_CONFIG_DIRS}/templates/config.h.in") # check installed version of c++utilities - set(CONFIG_H_TEMPLATE_FILE "${CMAKE_INSTALL_PREFIX}/share/c++utilities/cmake/templates/config.h.in") + set(CONFIG_H_TEMPLATE_FILE "${CPP_UTILITIES_CONFIG_DIRS}/templates/config.h.in") message(STATUS "Using template for config.h from c++utilities installation.") else() message(FATAL_ERROR "Template for config.h file can not be located.") diff --git a/cmake/modules/LibraryTarget.cmake b/cmake/modules/LibraryTarget.cmake index 65cd194..fed0c01 100644 --- a/cmake/modules/LibraryTarget.cmake +++ b/cmake/modules/LibraryTarget.cmake @@ -10,9 +10,9 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/Config.cmake.in") elseif(EXISTS "${CPP_UTILITIES_SOURCE_DIR}/cmake/templates/Config.cmake.in") # check sources of c++utilities set(CONFIG_TEMPLATE_FILE "${CPP_UTILITIES_SOURCE_DIR}/cmake/templates/Config.cmake.in") -elseif(EXISTS "${CMAKE_INSTALL_PREFIX}/share/c++utilities/cmake/templates/Config.cmake.in") +elseif(EXISTS "${CPP_UTILITIES_CONFIG_DIRS}/templates/Config.cmake.in") # check installed version of c++utilities - set(CONFIG_TEMPLATE_FILE "${CMAKE_INSTALL_PREFIX}/share/c++utilities/cmake/templates/Config.cmake.in") + set(CONFIG_TEMPLATE_FILE "${CPP_UTILITIES_CONFIG_DIRS}/templates/Config.cmake.in") else() message(FATAL_ERROR "Template for configuration file can not be located.") endif() diff --git a/cmake/modules/WindowsResources.cmake b/cmake/modules/WindowsResources.cmake index 40d6ba1..0852814 100644 --- a/cmake/modules/WindowsResources.cmake +++ b/cmake/modules/WindowsResources.cmake @@ -12,9 +12,9 @@ if(MINGW) elseif(EXISTS "${CPP_UTILITIES_SOURCE_DIR}/cmake/templates/windows.rc.in") # check sources of c++utilities set(RC_TEMPLATE_FILE "${CPP_UTILITIES_SOURCE_DIR}/cmake/templates/windows.rc.in") - elseif(EXISTS "${CMAKE_INSTALL_PREFIX}/share/c++utilities/cmake/templates/windows.rc.in") + elseif(EXISTS "${CPP_UTILITIES_CONFIG_DIRS}/templates/windows.rc.in") # check installed version of c++utilities - set(RC_TEMPLATE_FILE "${CMAKE_INSTALL_PREFIX}/share/c++utilities/cmake/templates/windows.rc.in") + set(RC_TEMPLATE_FILE "${CPP_UTILITIES_CONFIG_DIRS}/templates/windows.rc.in") else() message(FATAL_ERROR "Template for Windows *.rc file can not be located.") endif()