diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-25 16:41:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-25 16:41:07 -0600 |
| commit | 975cc10f8bfcab94ff4e641775473095af0e778a (patch) | |
| tree | 1d7e1e100ab31d9c6be4325842d119b4a64fb252 /modules/FindTDE.cmake | |
| parent | 8e6f203f9221d336edfa84b2e3eba6205a30c816 (diff) | |
| download | tde-cmake-975cc10f8bfcab94ff4e641775473095af0e778a.tar.gz tde-cmake-975cc10f8bfcab94ff4e641775473095af0e778a.zip | |
Fix vague build errors due to blind execution in CMake
This closes Bug 874
Thanks to Aleksey Midenkov for the patch!
Diffstat (limited to 'modules/FindTDE.cmake')
| -rw-r--r-- | modules/FindTDE.cmake | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/modules/FindTDE.cmake b/modules/FindTDE.cmake index b5356f8..056ed23 100644 --- a/modules/FindTDE.cmake +++ b/modules/FindTDE.cmake @@ -25,14 +25,12 @@ if( NOT TDE_FOUND ) endif( NOT DEFINED KDECONFIG_EXECUTABLE ) # check for installed trinity version - execute_process( + tde_execute_process( COMMAND ${KDECONFIG_EXECUTABLE} --version OUTPUT_VARIABLE _version RESULT_VARIABLE _result - OUTPUT_STRIP_TRAILING_WHITESPACE ) - if( _result ) - tde_message_fatal( "Unable to run kde-config!\n TDELIBS are correctly installed?\n Path to kde-config are corect?" ) - endif( _result ) + OUTPUT_STRIP_TRAILING_WHITESPACE + MESSAGE "Unable to run kde-config!\n TDELIBS are correctly installed?\n Path to kde-config are corect?" ) # parse kde-config output, to extract TDE version string( REGEX MATCH "TDE: ([0-9\\.]+)" __dummy "${_version}" ) @@ -40,7 +38,7 @@ if( NOT TDE_FOUND ) # ask kde-config for few paths macro( __internal_get_path __type __var ) - execute_process( + tde_execute_process( COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install ${__type} OUTPUT_VARIABLE ${__var} OUTPUT_STRIP_TRAILING_WHITESPACE ) |