From c5dcdad6b0c0861b298e4a40cdf7ce8c5f3198cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 13 Oct 2012 17:01:17 +0200 Subject: Fix inadvertent rename of kcachegrind in cmake build --- CMakeLists.txt | 2 +- kcachegrind/CMakeLists.txt | 21 +++++++++++++ kcachegrind/ConfigureChecks.cmake | 12 +++++++ kcachegrind/converters/CMakeLists.txt | 15 +++++++++ kcachegrind/kcachegrind/CMakeLists.txt | 50 ++++++++++++++++++++++++++++++ kcachegrind/pics/CMakeLists.txt | 14 +++++++++ kcachegrind/pics/hicolor/CMakeLists.txt | 12 +++++++ kdecachegrind/CMakeLists.txt | 21 ------------- kdecachegrind/ConfigureChecks.cmake | 12 ------- kdecachegrind/converters/CMakeLists.txt | 15 --------- kdecachegrind/kdecachegrind/CMakeLists.txt | 50 ------------------------------ kdecachegrind/pics/CMakeLists.txt | 14 --------- kdecachegrind/pics/hicolor/CMakeLists.txt | 12 ------- 13 files changed, 125 insertions(+), 125 deletions(-) create mode 100644 kcachegrind/CMakeLists.txt create mode 100644 kcachegrind/ConfigureChecks.cmake create mode 100644 kcachegrind/converters/CMakeLists.txt create mode 100644 kcachegrind/kcachegrind/CMakeLists.txt create mode 100644 kcachegrind/pics/CMakeLists.txt create mode 100644 kcachegrind/pics/hicolor/CMakeLists.txt delete mode 100644 kdecachegrind/CMakeLists.txt delete mode 100644 kdecachegrind/ConfigureChecks.cmake delete mode 100644 kdecachegrind/converters/CMakeLists.txt delete mode 100644 kdecachegrind/kdecachegrind/CMakeLists.txt delete mode 100644 kdecachegrind/pics/CMakeLists.txt delete mode 100644 kdecachegrind/pics/hicolor/CMakeLists.txt 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/kcachegrind/CMakeLists.txt b/kcachegrind/CMakeLists.txt new file mode 100644 index 00000000..e12f2f1f --- /dev/null +++ b/kcachegrind/CMakeLists.txt @@ -0,0 +1,21 @@ +################################################# +# +# (C) 2012 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include( ConfigureChecks.cmake ) + +set( KCACHEGRIND_VERSION "0.4.6kde" ) +configure_file( version.h.in version.h @ONLY ) +configure_file( kcachegrind.spec.in kcachegrind.spec @ONLY ) +configure_file( kcachegrind.lsm.in kcachegrind.lsm @ONLY ) + +add_subdirectory( kcachegrind ) +add_subdirectory( pics ) +add_subdirectory( converters ) diff --git a/kcachegrind/ConfigureChecks.cmake b/kcachegrind/ConfigureChecks.cmake new file mode 100644 index 00000000..e9b5cc27 --- /dev/null +++ b/kcachegrind/ConfigureChecks.cmake @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2012 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +check_function_exists( mmap HAVE_MMAP ) diff --git a/kcachegrind/converters/CMakeLists.txt b/kcachegrind/converters/CMakeLists.txt new file mode 100644 index 00000000..03e86bcf --- /dev/null +++ b/kcachegrind/converters/CMakeLists.txt @@ -0,0 +1,15 @@ +################################################# +# +# (C) 2012 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( PROGRAMS + hotshot2calltree op2calltree pprof2calltree + dprof2calltree memprof2calltree + DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcachegrind/kcachegrind/CMakeLists.txt b/kcachegrind/kcachegrind/CMakeLists.txt new file mode 100644 index 00000000..c9ca874a --- /dev/null +++ b/kcachegrind/kcachegrind/CMakeLists.txt @@ -0,0 +1,50 @@ +################################################# +# +# (C) 2012 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +tde_install_icons( ) +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 ) + + +##### kcachegrind (executable) ################## + +tde_add_executable( kcachegrind AUTOMOC + SOURCES + functionselectionbase.ui stackselectionbase.ui partselectionbase.ui + configdlgbase.ui loader.cpp cachegrindloader.cpp treemap.cpp pool.cpp + main.cpp configuration.cpp functionselection.cpp coverage.cpp + partgraph.cpp toplevel.cpp stackselection.cpp stackbrowser.cpp + subcost.cpp tracedata.cpp partselection.cpp configdlg.cpp + utils.cpp fixcost.cpp traceitemview.cpp instrview.cpp tabview.cpp + sourceview.cpp callmapview.cpp callview.cpp coverageview.cpp + costtypeview.cpp partview.cpp listutils.cpp costtypeitem.cpp + multiview.cpp callitem.cpp coverageitem.cpp sourceitem.cpp + costlistitem.cpp partlistitem.cpp functionitem.cpp instritem.cpp + stackitem.cpp callgraphview.cpp + LINK kio-shared + DESTINATION ${BIN_INSTALL_DIR} +) \ No newline at end of file diff --git a/kcachegrind/pics/CMakeLists.txt b/kcachegrind/pics/CMakeLists.txt new file mode 100644 index 00000000..3c9441d7 --- /dev/null +++ b/kcachegrind/pics/CMakeLists.txt @@ -0,0 +1,14 @@ +################################################# +# +# (C) 2012 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( hicolor ) + +tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kcachegrind/icons ) diff --git a/kcachegrind/pics/hicolor/CMakeLists.txt b/kcachegrind/pics/hicolor/CMakeLists.txt new file mode 100644 index 00000000..bf44b086 --- /dev/null +++ b/kcachegrind/pics/hicolor/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2012 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kcachegrind/icons ) diff --git a/kdecachegrind/CMakeLists.txt b/kdecachegrind/CMakeLists.txt deleted file mode 100644 index 3c9e51f0..00000000 --- a/kdecachegrind/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -################################################# -# -# (C) 2012 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -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 ) - -add_subdirectory( kdecachegrind ) -add_subdirectory( pics ) -add_subdirectory( converters ) diff --git a/kdecachegrind/ConfigureChecks.cmake b/kdecachegrind/ConfigureChecks.cmake deleted file mode 100644 index e9b5cc27..00000000 --- a/kdecachegrind/ConfigureChecks.cmake +++ /dev/null @@ -1,12 +0,0 @@ -################################################# -# -# (C) 2012 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -check_function_exists( mmap HAVE_MMAP ) diff --git a/kdecachegrind/converters/CMakeLists.txt b/kdecachegrind/converters/CMakeLists.txt deleted file mode 100644 index 03e86bcf..00000000 --- a/kdecachegrind/converters/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -################################################# -# -# (C) 2012 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -install( PROGRAMS - hotshot2calltree op2calltree pprof2calltree - dprof2calltree memprof2calltree - DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdecachegrind/kdecachegrind/CMakeLists.txt b/kdecachegrind/kdecachegrind/CMakeLists.txt deleted file mode 100644 index b7b36eea..00000000 --- a/kdecachegrind/kdecachegrind/CMakeLists.txt +++ /dev/null @@ -1,50 +0,0 @@ -################################################# -# -# (C) 2012 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -##### 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 ) - - -##### kdecachegrind (executable) ################## - -tde_add_executable( kdecachegrind AUTOMOC - SOURCES - functionselectionbase.ui stackselectionbase.ui partselectionbase.ui - configdlgbase.ui loader.cpp cachegrindloader.cpp treemap.cpp pool.cpp - main.cpp configuration.cpp functionselection.cpp coverage.cpp - partgraph.cpp toplevel.cpp stackselection.cpp stackbrowser.cpp - subcost.cpp tracedata.cpp partselection.cpp configdlg.cpp - utils.cpp fixcost.cpp traceitemview.cpp instrview.cpp tabview.cpp - sourceview.cpp callmapview.cpp callview.cpp coverageview.cpp - costtypeview.cpp partview.cpp listutils.cpp costtypeitem.cpp - multiview.cpp callitem.cpp coverageitem.cpp sourceitem.cpp - costlistitem.cpp partlistitem.cpp functionitem.cpp instritem.cpp - stackitem.cpp callgraphview.cpp - LINK kio-shared - DESTINATION ${BIN_INSTALL_DIR} -) diff --git a/kdecachegrind/pics/CMakeLists.txt b/kdecachegrind/pics/CMakeLists.txt deleted file mode 100644 index 8c5c4d67..00000000 --- a/kdecachegrind/pics/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -################################################# -# -# (C) 2012 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_subdirectory( hicolor ) - -tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kdecachegrind/icons ) diff --git a/kdecachegrind/pics/hicolor/CMakeLists.txt b/kdecachegrind/pics/hicolor/CMakeLists.txt deleted file mode 100644 index c0f971c3..00000000 --- a/kdecachegrind/pics/hicolor/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -################################################# -# -# (C) 2012 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kdecachegrind/icons ) -- cgit v1.2.1