From 842b39d68b8f80abf4865e9a2b601d2af315a32b Mon Sep 17 00:00:00 2001 From: Simon De Backer Date: Sun, 13 Dec 2020 20:57:10 +0100 Subject: [PATCH] Fix som Cmake PATH --- CMakeLists.txt | 2 +- cmake/define_definitions.cmake | 16 ++++++++-------- cmake/paths_compilation_installation.cmake | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2836ef208..c9f551291 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,7 +72,7 @@ find_package( set(CMAKE_AUTOUIC_SEARCH_PATHS ${QET_DIR}/sources/ui) -set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "l10n") +set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "lang") qt5_add_translation(QM_FILES ${TS_FILES}) # als laatse diff --git a/cmake/define_definitions.cmake b/cmake/define_definitions.cmake index c3f93bbe8..8f300d33c 100644 --- a/cmake/define_definitions.cmake +++ b/cmake/define_definitions.cmake @@ -25,23 +25,23 @@ message("INSTALL_PREFIX " ${INSTALL_PREFIX}) message("QET_BINARY_PATH " ${QET_BINARY_PATH}) if(${QET_COMMON_COLLECTION_PATH} STRGREATER "") - message("QET_COMMON_COLLECTION_PATH " ${QET_COMMON_COLLECTION_PATH}) - add_definitions(-DQET_COMMON_COLLECTION_PATH=${QET_COMMON_COLLECTION_PATH}) + message("QET_COMMON_COLLECTION_PATH " ${INSTALL_PREFIX}${QET_COMMON_COLLECTION_PATH}) + add_definitions(-DQET_COMMON_COLLECTION_PATH=${INSTALL_PREFIX}${QET_COMMON_COLLECTION_PATH}) endif() if(${QET_COMMON_TBT_PATH} STRGREATER "") - message("QET_COMMON_TBT_PATH " ${QET_COMMON_TBT_PATH}) - add_definitions(-DQET_COMMON_TBT_PATH=${QET_COMMON_TBT_PATH}) + message("QET_COMMON_TBT_PATH " ${INSTALL_PREFIX}${QET_COMMON_TBT_PATH}) + add_definitions(-DQET_COMMON_TBT_PATH=${INSTALL_PREFIX}${QET_COMMON_TBT_PATH}) endif() if(${QET_LANG_PATH_RELATIVE_TO_BINARY_PATH}) add_definitions(-DQET_LANG_PATH_RELATIVE_TO_BINARY_PATH) endif() if(${QET_LANG_PATH} STRGREATER "") - message("QET_LANG_PATH " ${QET_LANG_PATH}) - add_definitions(-DQET_LANG_PATH=${QET_LANG_PATH}) + message("QET_LANG_PATH " ${INSTALL_PREFIX}${QET_LANG_PATH}) + add_definitions(-DQET_LANG_PATH=${INSTALL_PREFIX}${QET_LANG_PATH}) endif() if(${QET_EXAMPLES_PATH} STRGREATER "") - message("QET_EXAMPLES_PATH " ${QET_EXAMPLES_PATH}) - add_definitions(-DQET_EXAMPLES_PATH=${QET_EXAMPLES_PATH}) + message("QET_EXAMPLES_PATH " ${INSTALL_PREFIX}${QET_EXAMPLES_PATH}) + add_definitions(-DQET_EXAMPLES_PATH=${INSTALL_PREFIX}${QET_EXAMPLES_PATH}) endif() message("QET_LICENSE_PATH " ${QET_LICENSE_PATH}) diff --git a/cmake/paths_compilation_installation.cmake b/cmake/paths_compilation_installation.cmake index 863ac6aff..80ea425ea 100644 --- a/cmake/paths_compilation_installation.cmake +++ b/cmake/paths_compilation_installation.cmake @@ -25,7 +25,7 @@ if(UNIX AND NOT APPLE) set(QET_BINARY_PATH "bin/") set(QET_COMMON_COLLECTION_PATH "share/qelectrotech/elements/") set(QET_COMMON_TBT_PATH "share/qelectrotech/titleblocks/") - set(QET_LANG_PATH "share/qelectrotech/l10n/") + set(QET_LANG_PATH "share/qelectrotech/lang/") set(QET_EXAMPLES_PATH "share/qelectrotech/examples/") set(QET_LICENSE_PATH "doc/qelectrotech/") set(QET_MIME_XML_PATH "../share/mime/application/") @@ -44,7 +44,7 @@ if(APPLE) set(QET_BINARY_PATH "bin/") set(QET_COMMON_COLLECTION_PATH "../Resources/elements/") set(QET_COMMON_TBT_PATH "../Resources/titleblocks/") - set(QET_LANG_PATH "../Resources/l10n/") + set(QET_LANG_PATH "../Resources/lang/") set(QET_EXAMPLES_PATH "share/qelectrotech/examples/") set(QET_LICENSE_PATH "doc/qelectrotech/") set(QET_MIME_XML_PATH "../share/mime/application/")