summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-03-26 01:50:00 +0100
committerSlávek Banko <slavek.banko@axis.cz>2019-04-02 19:32:54 +0200
commit74654feb3bd49ba97c57e83ba2dd23c7c3d83c05 (patch)
treeee5bfddf91c8ab605e9aa190deb53ef40fd18aef
parent8aa2f7199eb24b3b491096de805e5b3dd9349807 (diff)
downloadtde-cmake-74654feb.tar.gz
tde-cmake-74654feb.zip
Use cache for TQt executables paths.
This allows these values to be pre-defined - for example, to optimize cross-build. This resolves issue #28. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--modules/FindTQt.cmake18
1 files changed, 15 insertions, 3 deletions
diff --git a/modules/FindTQt.cmake b/modules/FindTQt.cmake
index c82ab95..6194bb2 100644
--- a/modules/FindTQt.cmake
+++ b/modules/FindTQt.cmake
@@ -19,10 +19,18 @@ if( NOT TQT_FOUND )
tde_message_fatal( "Unable to find tqt!\n Try adding the directory in which the tqt.pc file is located\nto the PKG_CONFIG_PATH variable." )
endif( )
+mark_as_advanced(
+ TMOC_EXECUTABLE
+ MOC_EXECUTABLE
+ UIC_EXECUTABLE
+)
+
# tmoc_executable
tde_execute_process(
COMMAND pkg-config tqt --variable=tmoc_executable
- OUTPUT_VARIABLE TMOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
+ OUTPUT_VARIABLE TMOC_EXECUTABLE
+ CACHE FILEPATH "TQt tmoc executable path"
+ OUTPUT_STRIP_TRAILING_WHITESPACE )
if( NOT EXISTS ${TMOC_EXECUTABLE} )
tde_message_fatal( "tmoc is not found!\n tqt is correctly installed?" )
@@ -34,7 +42,9 @@ tqt_message( " tmoc path: ${TMOC_EXECUTABLE}" )
# moc_executable
tde_execute_process(
COMMAND pkg-config tqt --variable=moc_executable
- OUTPUT_VARIABLE MOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
+ OUTPUT_VARIABLE MOC_EXECUTABLE
+ CACHE FILEPATH "TQt moc executable path"
+ OUTPUT_STRIP_TRAILING_WHITESPACE )
if( NOT EXISTS ${MOC_EXECUTABLE} )
tde_message_fatal( "Path to moc is not set.\n tqt is correctly installed?" )
@@ -46,7 +56,9 @@ tqt_message( " moc path: ${MOC_EXECUTABLE}" )
# uic_executable
tde_execute_process(
COMMAND pkg-config tqt --variable=uic_executable
- OUTPUT_VARIABLE UIC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
+ OUTPUT_VARIABLE UIC_EXECUTABLE
+ CACHE FILEPATH "TQt uic executable path"
+ OUTPUT_STRIP_TRAILING_WHITESPACE )
if( NOT EXISTS ${UIC_EXECUTABLE} )
tde_message_fatal( "uic not found!\n tqt is correctly installed?" )