summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-04-19 02:56:43 +0200
committerSlávek Banko <slavek.banko@axis.cz>2016-04-19 02:56:47 +0200
commit0e0f4e9be4ce481304f4a9e7b0069af157425d74 (patch)
tree82c727b972f6b71d7beeb560181c4cf6f1eeef5a
parent416e4baaa96058a323968657ee51d5eb0ff0c5c6 (diff)
downloadtde-cmake-0e0f4e9b.tar.gz
tde-cmake-0e0f4e9b.zip
Fix FTBFS when tdelibs was built without tdelfeditor
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
-rw-r--r--modules/FindTDE.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/FindTDE.cmake b/modules/FindTDE.cmake
index 4d59b56..f91d827 100644
--- a/modules/FindTDE.cmake
+++ b/modules/FindTDE.cmake
@@ -68,7 +68,7 @@ if( NOT TDE_FOUND )
HINTS "${TDE_PREFIX}/bin" ${BIN_INSTALL_DIR}
OUTPUT_STRIP_TRAILING_WHITESPACE )
if( NOT ${__var} )
- tde_message_fatal( "${__prog} are NOT found.\n TDELIBS are correctly installed?" )
+ tde_message_fatal( "${__prog} is NOT found.\n TDELIBS are correctly installed?" )
endif( NOT ${__var} )
set( ${__var} ${${__var}} CACHE INTERNAL "${__prog} executable" FORCE )
endmacro( __internal_find_program )
@@ -79,7 +79,9 @@ if( NOT TDE_FOUND )
__internal_find_program( meinproc KDE3_MEINPROC_EXECUTABLE )
__internal_find_program( tdeconfig_compiler KDE3_KCFGC_EXECUTABLE )
__internal_find_program( maketdewidgets KDE3_MAKETDEWIDGETS_EXECUTABLE )
- __internal_find_program( tdelfeditor TDELFEDITOR_EXECUTABLE )
+ # Don't use __internal_find_program due to it's not mandatory
+ find_program( TDELFEDITOR_EXECUTABLE NAMES tdelfeditor
+ HINTS "${TDE_PREFIX}/bin" ${BIN_INSTALL_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE )
# dcopidlng is a bash script which using tde-config;
# if PATH to tde-config is not set, dcopidlng will fail;