diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:44 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:44 -0600 |
| commit | 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d (patch) | |
| tree | 75e46e0b442a04ea742c702123363613a16fde8d | |
| parent | 0953d90e24d84a91d72f741f3f8ea5791d84f41b (diff) | |
| download | tde-cmake-9a217903f9fa35ca12213a6e9ee3d2cb87d1131d.tar.gz tde-cmake-9a217903f9fa35ca12213a6e9ee3d2cb87d1131d.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | modules/FindTDE.cmake | 2 | ||||
| -rw-r--r-- | modules/TDESetupPaths.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/FindTDE.cmake b/modules/FindTDE.cmake index 503a3d3..1e6076b 100644 --- a/modules/FindTDE.cmake +++ b/modules/FindTDE.cmake @@ -77,7 +77,7 @@ if( NOT TDE_FOUND ) __internal_find_program( dcopidlng KDE3_DCOPIDLNG_EXECUTABLE ) __internal_find_program( dcopidl2cpp KDE3_DCOPIDL2CPP_EXECUTABLE ) __internal_find_program( meinproc KDE3_MEINPROC_EXECUTABLE ) - __internal_find_program( kconfig_compiler KDE3_KCFGC_EXECUTABLE ) + __internal_find_program( tdeconfig_compiler KDE3_KCFGC_EXECUTABLE ) __internal_find_program( makekdewidgets KDE3_MAKEKDEWIDGETS_EXECUTABLE ) # dcopidlng is a bash script which using tde-config; diff --git a/modules/TDESetupPaths.cmake b/modules/TDESetupPaths.cmake index f995664..465df7f 100644 --- a/modules/TDESetupPaths.cmake +++ b/modules/TDESetupPaths.cmake @@ -44,7 +44,7 @@ macro( tde_setup_paths ) _tde_internal_setup_path( DATA_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/apps" "The parent directory where applications can install their data" ) _tde_internal_setup_path( HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/tde/HTML" "The HTML install dir for documentation" ) _tde_internal_setup_path( ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons" "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)" ) - _tde_internal_setup_path( KCFG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config.kcfg" "The install dir for kconfig files" ) + _tde_internal_setup_path( KCFG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config.kcfg" "The install dir for tdeconfig files" ) _tde_internal_setup_path( LOCALE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/locale" "The install dir for translations" ) _tde_internal_setup_path( APPS_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/applnk" "The install dir for the application desktop files" ) _tde_internal_setup_path( MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mimelnk" "The install dir for the mimetype desktop files" ) @@ -53,7 +53,7 @@ macro( tde_setup_paths ) _tde_internal_setup_path( SOUND_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/sounds" "The install dir for sound files" ) _tde_internal_setup_path( TEMPLATES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/templates" "The install dir for templates (Create new file...)" ) _tde_internal_setup_path( WALLPAPER_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/wallpapers" "The install dir for wallpapers" ) - _tde_internal_setup_path( KCONF_UPDATE_INSTALL_DIR "${DATA_INSTALL_DIR}/kconf_update" "The kconf_update install dir" ) + _tde_internal_setup_path( KCONF_UPDATE_INSTALL_DIR "${DATA_INSTALL_DIR}/tdeconf_update" "The tdeconf_update install dir" ) _tde_internal_setup_path( AUTOSTART_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/autostart" "The install dir for autostart files" ) _tde_internal_setup_path( SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc" "The sysconfig install dir (default ${CMAKE_INSTALL_PREFIX}/etc)" ) |