Find tdelfeditor executable on the system paths

instead of on the current installation path

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 416e4baaa9)

modules/FindTDE.cmake

@@ -79,6 +79,7 @@ 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 )
 
   # dcopidlng is a bash script which using tde-config;
   # if PATH to tde-config is not set, dcopidlng will fail;

modules/TDEMacros.cmake

@@ -835,23 +835,23 @@ macro( tde_add_library _arg_target )
   # embed name and metadata
   set( ELF_EMBEDDING_METADATA "\"${_target}\" \"${_description}\" \"${_license}\" \"${_copyright}\" \"${_authors}\" \"${_product}\" \"${_organization}\" \"${_version}\" \"${_datetime}\" \"x-sharedlib\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"${_notes}\"" )
   separate_arguments( ELF_EMBEDDING_METADATA )
-  if( EXISTS ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor AND _soname )
+  if( TDELFEDITOR_EXECUTABLE AND _soname )
     if( _version )
       add_custom_command(
         TARGET ${_target}
         POST_BUILD
-        COMMAND ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor -m ${CMAKE_CURRENT_BINARY_DIR}/${_soname}.${_version} ${ELF_EMBEDDING_METADATA} || true
-        COMMAND ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor -e ${CMAKE_CURRENT_BINARY_DIR}/${_soname}.${_version} || true
+        COMMAND ${TDELFEDITOR_EXECUTABLE} -m ${CMAKE_CURRENT_BINARY_DIR}/${_soname}.${_version} ${ELF_EMBEDDING_METADATA} || true
+        COMMAND ${TDELFEDITOR_EXECUTABLE} -e ${CMAKE_CURRENT_BINARY_DIR}/${_soname}.${_version} || true
       )
     else( )
       add_custom_command(
         TARGET ${_target}
         POST_BUILD
-        COMMAND ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor -m ${CMAKE_CURRENT_BINARY_DIR}/${_soname} ${ELF_EMBEDDING_METADATA} || true
-        COMMAND ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor -e ${CMAKE_CURRENT_BINARY_DIR}/${_soname} || true
+        COMMAND ${TDELFEDITOR_EXECUTABLE} -m ${CMAKE_CURRENT_BINARY_DIR}/${_soname} ${ELF_EMBEDDING_METADATA} || true
+        COMMAND ${TDELFEDITOR_EXECUTABLE} -e ${CMAKE_CURRENT_BINARY_DIR}/${_soname} || true
       )
     endif( )
-  endif( EXISTS ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor AND _soname )
+  endif( TDELFEDITOR_EXECUTABLE AND _soname )
 
 endmacro( tde_add_library )
 
@@ -1047,15 +1047,15 @@ macro( tde_add_executable _arg_target )
   # embed icon, name, and metadata
   set( ELF_EMBEDDING_METADATA "\"${_target}\" \"${_description}\" \"${_license}\" \"${_copyright}\" \"${_authors}\" \"${_product}\" \"${_organization}\" \"${_version}\" \"${_datetime}\" \"${_target}\" \"${TDE_SCM_MODULE_NAME}\" \"${TDE_SCM_MODULE_REVISION}\" \"${_notes}\"" )
   separate_arguments( ELF_EMBEDDING_METADATA )
-  if( EXISTS ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor )
+  if( TDELFEDITOR_EXECUTABLE )
     add_custom_command(
       TARGET ${_target}
       POST_BUILD
-      COMMAND ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor -m ${CMAKE_CURRENT_BINARY_DIR}/${_target} ${ELF_EMBEDDING_METADATA} || true
-      COMMAND ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor -e ${CMAKE_CURRENT_BINARY_DIR}/${_target} || true
-      COMMAND ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor -t ${CMAKE_CURRENT_BINARY_DIR}/${_target} ${_target} || true
+      COMMAND ${TDELFEDITOR_EXECUTABLE} -m ${CMAKE_CURRENT_BINARY_DIR}/${_target} ${ELF_EMBEDDING_METADATA} || true
+      COMMAND ${TDELFEDITOR_EXECUTABLE} -e ${CMAKE_CURRENT_BINARY_DIR}/${_target} || true
+      COMMAND ${TDELFEDITOR_EXECUTABLE} -t ${CMAKE_CURRENT_BINARY_DIR}/${_target} ${_target} || true
     )
-  endif( EXISTS ${CMAKE_INSTALL_PREFIX}/bin/tdelfeditor )
+  endif( TDELFEDITOR_EXECUTABLE )
 
 endmacro( tde_add_executable )