diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2016-04-19 02:56:43 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2016-04-19 02:57:15 +0200 |
| commit | d4e69bf65ff0b76a2b78b98e86e01c122cbe8831 (patch) | |
| tree | 82c727b972f6b71d7beeb560181c4cf6f1eeef5a | |
| parent | 3bb71d2ebdd01402ddf924b52114c4649346c57d (diff) | |
| download | tde-cmake-d4e69bf65ff0b76a2b78b98e86e01c122cbe8831.tar.gz tde-cmake-d4e69bf65ff0b76a2b78b98e86e01c122cbe8831.zip | |
Fix FTBFS when tdelibs was built without tdelfeditorr14.0.4
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
(cherry picked from commit 0e0f4e9be4ce481304f4a9e7b0069af157425d74)
| -rw-r--r-- | modules/FindTDE.cmake | 6 |
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; |