From 56ad760cc58ee6ab1614e25af7a84bd0dc759766 Mon Sep 17 00:00:00 2001 From: nafsub <46298181+nafsub@users.noreply.github.com> Date: Tue, 1 Jan 2019 21:48:07 +0000 Subject: [PATCH] Add CFGDIR as CMake variable (#1554) * Add CFGDIR as CMake variable Adds CFGDIR as a CMake variable. Previously CFGDIR was hardcoded. * Add CFGDIR as CMake variable Adds CFGDIR as a CMake variable. Previously CFGDIR was hardcoded. --- cmake/compilerDefinitions.cmake | 2 +- cmake/options.cmake | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/compilerDefinitions.cmake b/cmake/compilerDefinitions.cmake index 7179c6898..5ef19b4b6 100644 --- a/cmake/compilerDefinitions.cmake +++ b/cmake/compilerDefinitions.cmake @@ -5,5 +5,5 @@ if (UNIX) if (HAVE_RULES) add_definitions(-DHAVE_RULES -DTIXML_USE_STL) endif() - add_definitions(-DCFGDIR="${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}") + add_definitions(-DCFGDIR="${CFGDIR}") endif() diff --git a/cmake/options.cmake b/cmake/options.cmake index 8a2c21ece..53f06a66e 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -46,3 +46,6 @@ set(CMAKE_LIB_DIRS_CONFIGCMAKE ${CMAKE_INSTALL_PREFIX}/lib CACHE PA set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) + +set(CFGDIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} CACHE STRING "CFG files directory") +