summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2022-01-12 17:21:45 +0100
committerSlávek Banko <slavek.banko@axis.cz>2022-01-12 17:21:45 +0100
commitd863e15b5049a05b617276fdf86e2df42a0d7501 (patch)
tree03fc7a0c36e2e93b847d0aa681120d8826d7889c
parent857971e81015596d53ce861d08b0e64169a33d7c (diff)
downloadcmake-d863e15b.tar.gz
cmake-d863e15b.zip
Add TQT_CMAKE_DIR variable.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--modules/FindTQt.cmake7
-rw-r--r--modules/TDEMacros.cmake6
2 files changed, 11 insertions, 2 deletions
diff --git a/modules/FindTQt.cmake b/modules/FindTQt.cmake
index 9c36cb9..1b7df8e 100644
--- a/modules/FindTQt.cmake
+++ b/modules/FindTQt.cmake
@@ -99,6 +99,13 @@ if( NOT TQT_FOUND )
tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
+ # TQT_CMAKE_DIR
+ if( NOT DEFINED TQT_CMAKE_DIR )
+ set( TQT_CMAKE_DIR "${TQT_LIBDIR}/cmake"
+ CACHE FILEPATH "Path for shared TQt CMake targets" )
+ endif()
+
+
# TQT_CXX_FLAGS
foreach( _flag ${TQT_CFLAGS} ${TQT_CFLAGS_OTHER} )
set( TQT_CXX_FLAGS "${TQT_CXX_FLAGS} ${_flag}" )
diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake
index 661587f..b438deb 100644
--- a/modules/TDEMacros.cmake
+++ b/modules/TDEMacros.cmake
@@ -773,10 +773,12 @@ macro( tde_import _library )
else()
if( EXISTS "${TDE_CMAKE_DIR}/${_library}.cmake" )
include( "${TDE_CMAKE_DIR}/${_library}.cmake" )
- message( STATUS " ok, found import file" )
+ elseif( EXISTS "${TQT_CMAKE_DIR}/${_library}.cmake" )
+ include( "${TQT_CMAKE_DIR}/${_library}.cmake" )
else()
- tde_message_fatal( "'${_library}' are required,\n but is not installed nor selected for build" )
+ tde_message_fatal( "'${_library}' is required, but is not installed nor selected for build" )
endif()
+ message( STATUS " ok, found import file" )
endif()
endmacro()