diff options
author | Aleksei Vereshchagin <avereschagin@dev.rtsoft.ru> | 2018-09-13 23:15:20 +0300 |
---|---|---|
committer | Aleksei Vereshchagin <avereschagin@dev.rtsoft.ru> | 2018-09-25 20:56:21 +0300 |
commit | 8048acc400f75beeb5264fe3c6afe0bc75109a44 (patch) | |
tree | 37f29e4a11aa63b5b7bd610b8dfddf6fa3da558f | |
parent | c393da4b3cea0915376d84da032c2d3c13af221b (diff) | |
download | heaptrack-8048acc400f75beeb5264fe3c6afe0bc75109a44.tar.gz heaptrack-8048acc400f75beeb5264fe3c6afe0bc75109a44.tar.bz2 heaptrack-8048acc400f75beeb5264fe3c6afe0bc75109a44.zip |
Add TIZEN building option and remove 0001-Target-build patch
-rw-r--r-- | CMakeLists.txt | 7 | ||||
-rw-r--r-- | packaging/0001-Target-build | 43 | ||||
-rw-r--r-- | packaging/heaptrack.spec | 6 | ||||
-rw-r--r-- | src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/track/CMakeLists.txt | 18 |
5 files changed, 22 insertions, 56 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d02e780..cb73977 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,13 @@ option( On ) +option( + TIZEN + "Tizen platform" + Off +) +add_definitions(-DTIZEN=$<BOOL:${TIZEN}>) + if(HEAPTRACK_BUILD_GUI) find_package(Qt5 5.2.0 NO_MODULE OPTIONAL_COMPONENTS Widgets) find_package(ECM 1.0.0 NO_MODULE) diff --git a/packaging/0001-Target-build b/packaging/0001-Target-build deleted file mode 100644 index ea68e5f..0000000 --- a/packaging/0001-Target-build +++ /dev/null @@ -1,43 +0,0 @@ - heaptrack/src/CMakeLists.txt | 4 ++-- - heaptrack/src/track/CMakeLists.txt | 12 ++++++------ - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/heaptrack/src/CMakeLists.txt b/heaptrack/src/CMakeLists.txt -index f29097a..afa1a09 100644 ---- a/heaptrack/src/CMakeLists.txt -+++ b/heaptrack/src/CMakeLists.txt -@@ -5,5 +5,5 @@ include_directories( - - add_subdirectory(util) - add_subdirectory(track) --add_subdirectory(interpret) --add_subdirectory(analyze) -+add_subdirectory(interpret) -+#add_subdirectory(analyze) -diff --git a/heaptrack/src/track/CMakeLists.txt b/heaptrack/src/track/CMakeLists.txt -index 06f59b7..ef005e7 100644 ---- a/heaptrack/src/track/CMakeLists.txt -+++ b/heaptrack/src/track/CMakeLists.txt -@@ -8,9 +8,9 @@ configure_file(heaptrack.sh.cmake - ${PROJECT_BINARY_DIR}/${BIN_INSTALL_DIR}/heaptrack @ONLY - ) - --install(PROGRAMS ${PROJECT_BINARY_DIR}/${BIN_INSTALL_DIR}/heaptrack -- DESTINATION ${BIN_INSTALL_DIR} --) -+#install(PROGRAMS ${PROJECT_BINARY_DIR}/${BIN_INSTALL_DIR}/heaptrack -+# DESTINATION ${BIN_INSTALL_DIR} -+#) - - # heaptrack_preload: track a newly started process - add_library(heaptrack_preload MODULE -@@ -62,6 +62,6 @@ install(TARGETS heaptrack_inject - ) - - # public API for custom pool allocators or static binaries --install(FILES heaptrack_api.h -- DESTINATION ${CMAKE_INSTALL_PREFIX}/include --) -+#install(FILES heaptrack_api.h -+# DESTINATION ${CMAKE_INSTALL_PREFIX}/include -+#) diff --git a/packaging/heaptrack.spec b/packaging/heaptrack.spec index 704ad9d..a34c3e3 100644 --- a/packaging/heaptrack.spec +++ b/packaging/heaptrack.spec @@ -7,7 +7,6 @@ Group: Application Framework/Application State Management License: GPL Source0: %{name}-%{version}.tar.gz Source1001: heaptrack.manifest -Source1002: 0001-Target-build %define heaptrack_src heaptrack-%{version} %define heaptrack_build build-%{_target_platform} AutoReqProv: no @@ -37,11 +36,7 @@ Heaptrack for Tizen applications %prep %setup -q -# 0001-Target-build.patch cp %{SOURCE1001} . -cp %{SOURCE1002} . -# Gbp-Patch-Macros -patch -p2 < 0001-Target-build %build @@ -64,6 +59,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX=install \ -DCMAKE_BUILD_TYPE=%{_heaptrack_build_conf} \ -DHEAPTRACK_BUILD_GUI=OFF \ + -DTIZEN=ON \ .. make %{?jobs:-j%jobs} VERBOSE=1 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f29097a..db4d61d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,4 +6,6 @@ include_directories( add_subdirectory(util) add_subdirectory(track) add_subdirectory(interpret) -add_subdirectory(analyze) +if (NOT TIZEN) + add_subdirectory(analyze) +endif() diff --git a/src/track/CMakeLists.txt b/src/track/CMakeLists.txt index 06f59b7..162cacd 100644 --- a/src/track/CMakeLists.txt +++ b/src/track/CMakeLists.txt @@ -8,9 +8,11 @@ configure_file(heaptrack.sh.cmake ${PROJECT_BINARY_DIR}/${BIN_INSTALL_DIR}/heaptrack @ONLY ) -install(PROGRAMS ${PROJECT_BINARY_DIR}/${BIN_INSTALL_DIR}/heaptrack - DESTINATION ${BIN_INSTALL_DIR} -) +if (NOT TIZEN) + install(PROGRAMS ${PROJECT_BINARY_DIR}/${BIN_INSTALL_DIR}/heaptrack + DESTINATION ${BIN_INSTALL_DIR} + ) +endif() # heaptrack_preload: track a newly started process add_library(heaptrack_preload MODULE @@ -61,7 +63,9 @@ install(TARGETS heaptrack_inject LIBRARY DESTINATION ${LIB_INSTALL_DIR}/heaptrack/ ) -# public API for custom pool allocators or static binaries -install(FILES heaptrack_api.h - DESTINATION ${CMAKE_INSTALL_PREFIX}/include -) +if (NOT TIZEN) + # public API for custom pool allocators or static binaries + install(FILES heaptrack_api.h + DESTINATION ${CMAKE_INSTALL_PREFIX}/include + ) +endif() |