diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-10-13 17:01:17 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-10-13 17:01:17 +0200 |
| commit | c5dcdad6b0c0861b298e4a40cdf7ce8c5f3198cd (patch) | |
| tree | a3efcb9b7e36c1fe3d1d0aa941577cc653878ca8 | |
| parent | 81a59ef9696a2d30558efd87e24fc44312c4ad28 (diff) | |
| download | tdesdk-c5dcdad6b0c0861b298e4a40cdf7ce8c5f3198cd.tar.gz tdesdk-c5dcdad6b0c0861b298e4a40cdf7ce8c5f3198cd.zip | |
Fix inadvertent rename of kcachegrind in cmake build
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcachegrind/CMakeLists.txt (renamed from kdecachegrind/CMakeLists.txt) | 6 | ||||
| -rw-r--r-- | kcachegrind/ConfigureChecks.cmake (renamed from kdecachegrind/ConfigureChecks.cmake) | 0 | ||||
| -rw-r--r-- | kcachegrind/converters/CMakeLists.txt (renamed from kdecachegrind/converters/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | kcachegrind/kcachegrind/CMakeLists.txt (renamed from kdecachegrind/kdecachegrind/CMakeLists.txt) | 12 | ||||
| -rw-r--r-- | kcachegrind/pics/CMakeLists.txt (renamed from kdecachegrind/pics/CMakeLists.txt) | 2 | ||||
| -rw-r--r-- | kcachegrind/pics/hicolor/CMakeLists.txt (renamed from kdecachegrind/pics/hicolor/CMakeLists.txt) | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e5d7726e..ec678812 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,7 +109,7 @@ tde_conditional_add_subdirectory( BUILD_KUNITTEST kunittest ) tde_conditional_add_subdirectory( BUILD_POXML poxml ) tde_conditional_add_subdirectory( BUILD_SCHECK scheck ) tde_conditional_add_subdirectory( BUILD_SCRIPTS scripts ) -tde_conditional_add_subdirectory( BUILD_KDECACHEGRIND kdecachegrind ) +tde_conditional_add_subdirectory( BUILD_KDECACHEGRIND kcachegrind ) tde_conditional_add_subdirectory( BUILD_UMBRELLO umbrello ) diff --git a/kdecachegrind/CMakeLists.txt b/kcachegrind/CMakeLists.txt index 3c9e51f0..e12f2f1f 100644 --- a/kdecachegrind/CMakeLists.txt +++ b/kcachegrind/CMakeLists.txt @@ -13,9 +13,9 @@ include( ConfigureChecks.cmake ) set( KCACHEGRIND_VERSION "0.4.6kde" ) configure_file( version.h.in version.h @ONLY ) -configure_file( kdecachegrind.spec.in kcachegrind.spec @ONLY ) -configure_file( kdecachegrind.lsm.in kcachegrind.lsm @ONLY ) +configure_file( kcachegrind.spec.in kcachegrind.spec @ONLY ) +configure_file( kcachegrind.lsm.in kcachegrind.lsm @ONLY ) -add_subdirectory( kdecachegrind ) +add_subdirectory( kcachegrind ) add_subdirectory( pics ) add_subdirectory( converters ) diff --git a/kdecachegrind/ConfigureChecks.cmake b/kcachegrind/ConfigureChecks.cmake index e9b5cc27..e9b5cc27 100644 --- a/kdecachegrind/ConfigureChecks.cmake +++ b/kcachegrind/ConfigureChecks.cmake diff --git a/kdecachegrind/converters/CMakeLists.txt b/kcachegrind/converters/CMakeLists.txt index 03e86bcf..03e86bcf 100644 --- a/kdecachegrind/converters/CMakeLists.txt +++ b/kcachegrind/converters/CMakeLists.txt diff --git a/kdecachegrind/kdecachegrind/CMakeLists.txt b/kcachegrind/kcachegrind/CMakeLists.txt index b7b36eea..c9ca874a 100644 --- a/kdecachegrind/kdecachegrind/CMakeLists.txt +++ b/kcachegrind/kcachegrind/CMakeLists.txt @@ -25,14 +25,14 @@ link_directories( ##### other data ################################ tde_install_icons( ) -install( FILES kdecachegrind.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES kdecachegrindui.rc tips DESTINATION ${DATA_INSTALL_DIR}/kcachegrind ) -install( FILES x-kdecachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/application ) +install( FILES kcachegrind.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES kcachegrindui.rc tips DESTINATION ${DATA_INSTALL_DIR}/kcachegrind ) +install( FILES x-kcachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/application ) -##### kdecachegrind (executable) ################## +##### kcachegrind (executable) ################## -tde_add_executable( kdecachegrind AUTOMOC +tde_add_executable( kcachegrind AUTOMOC SOURCES functionselectionbase.ui stackselectionbase.ui partselectionbase.ui configdlgbase.ui loader.cpp cachegrindloader.cpp treemap.cpp pool.cpp @@ -47,4 +47,4 @@ tde_add_executable( kdecachegrind AUTOMOC stackitem.cpp callgraphview.cpp LINK kio-shared DESTINATION ${BIN_INSTALL_DIR} -) +)
\ No newline at end of file diff --git a/kdecachegrind/pics/CMakeLists.txt b/kcachegrind/pics/CMakeLists.txt index 8c5c4d67..3c9441d7 100644 --- a/kdecachegrind/pics/CMakeLists.txt +++ b/kcachegrind/pics/CMakeLists.txt @@ -11,4 +11,4 @@ add_subdirectory( hicolor ) -tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kdecachegrind/icons ) +tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kcachegrind/icons ) diff --git a/kdecachegrind/pics/hicolor/CMakeLists.txt b/kcachegrind/pics/hicolor/CMakeLists.txt index c0f971c3..bf44b086 100644 --- a/kdecachegrind/pics/hicolor/CMakeLists.txt +++ b/kcachegrind/pics/hicolor/CMakeLists.txt @@ -9,4 +9,4 @@ # ################################################# -tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kdecachegrind/icons ) +tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kcachegrind/icons ) |