summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2023-02-16 03:21:23 +0100
committerSlávek Banko <slavek.banko@axis.cz>2023-02-16 03:22:10 +0100
commit2dbc318de9a4a33c019c6c6895ac8ddc2d8e6042 (patch)
treeafc4e10b972e9a34c12bf3fef4e1d2aa5abdcc1b
parent25734cf5067ccfe838f5ec5df6b6bd7f053d3620 (diff)
downloadtde-cmake-2dbc318de9a4a33c019c6c6895ac8ddc2d8e6042.tar.gz
tde-cmake-2dbc318de9a4a33c019c6c6895ac8ddc2d8e6042.zip
tde_add_ui_files: Fix the wrong automatic use of TQT_ONLY mode when building tdelibs as such.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--modules/TDEMacros.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake
index 590d4a8..97b1f1b 100644
--- a/modules/TDEMacros.cmake
+++ b/modules/TDEMacros.cmake
@@ -414,6 +414,10 @@ endmacro( tde_install_la_file )
##### tde_add_ui_files
macro( tde_add_ui_files _sources )
+ if( TDE_FOUND OR "${CMAKE_PROJECT_NAME}" STREQUAL "tdelibs" )
+ set( HAVE_TDE 1 )
+ endif()
+
foreach( _ui_file ${ARGN} )
get_filename_component( _ui_basename ${_ui_file} NAME_WE )
@@ -430,7 +434,7 @@ 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}
- -DTDE_FOUND=${TDE_FOUND}
+ -DTDE_FOUND=${HAVE_TDE}
-DTQT_ONLY=${TQT_ONLY}
-P ${TDE_CMAKE_MODULES}/tde_uic.cmake
DEPENDS ${_ui_absolute_path} )