diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2022-01-12 17:21:45 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-01-13 02:22:17 +0100 |
| commit | 2062d6933841593a1f2b8172881a9dda24895a7f (patch) | |
| tree | 9818bca8ef64d5ee1255b57427d8c232af9825ff | |
| parent | 41d6726c0990db8debd866e69d045a29d67a1431 (diff) | |
| download | tde-cmake-2062d6933841593a1f2b8172881a9dda24895a7f.tar.gz tde-cmake-2062d6933841593a1f2b8172881a9dda24895a7f.zip | |
Add TQT_CMAKE_DIR variable.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d863e15b5049a05b617276fdf86e2df42a0d7501)
| -rw-r--r-- | modules/FindTQt.cmake | 7 | ||||
| -rw-r--r-- | modules/TDEMacros.cmake | 6 |
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 1cb14fd..ea77211 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() |