summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-05-24 20:54:20 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-05-24 20:54:35 +0200
commit26d3de3fcd0e59b4500e1973ad6f98233b0fbdfd (patch)
tree00c1457d1923cb2881ca172c8341f598fd71a8cd
parentbfa3a90b73588be47dc3f4d373ff63ce17dfb6ab (diff)
downloadtde-cmake-26d3de3fcd0e59b4500e1973ad6f98233b0fbdfd.tar.gz
tde-cmake-26d3de3fcd0e59b4500e1973ad6f98233b0fbdfd.zip
tde_add_ui_files: Use TDE_CMAKE_MODULES to determine the path for tde_uic.cmake.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 639294f9627de22e91e016d81329a532d65ea8f4)
-rw-r--r--modules/TDEMacros.cmake3
-rw-r--r--modules/tde_uic.cmake2
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake
index 776e2e8..902e627 100644
--- a/modules/TDEMacros.cmake
+++ b/modules/TDEMacros.cmake
@@ -425,7 +425,8 @@ macro( tde_add_ui_files _sources )
-DUI_FILE:FILEPATH=${_ui_absolute_path}
-DMASTER_SOURCE_DIR:FILEPATH=${CMAKE_SOURCE_DIR}
-DMASTER_BINARY_DIR:FILEPATH=${CMAKE_BINARY_DIR}
- -P ${CMAKE_MODULE_PATH}/tde_uic.cmake
+ -DTDE_CMAKE_MODULES:FILEPATH=${TDE_CMAKE_MODULES}
+ -P ${TDE_CMAKE_MODULES}/tde_uic.cmake
DEPENDS ${_ui_absolute_path} )
endforeach( _ui_file )
diff --git a/modules/tde_uic.cmake b/modules/tde_uic.cmake
index 7114d20..5688485 100644
--- a/modules/tde_uic.cmake
+++ b/modules/tde_uic.cmake
@@ -9,7 +9,7 @@
#
#################################################
-set( CMAKE_MODULE_PATH "${MASTER_SOURCE_DIR}/cmake/modules" )
+set( CMAKE_MODULE_PATH "${TDE_CMAKE_MODULES}" )
include( TDEMacros )
get_filename_component( _ui_basename ${UI_FILE} NAME_WE )