liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5465 from ff2000/tcmalloc

Browse Source 
Add option to link against libtcmalloc.so
This commit is contained in:
Ingo Weyrich
2019-09-21 23:56:26 +02:00
committed by GitHub
parent 27ba217d5b 706c16510f
commit da800c8589
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@@ -136,6 +136,9 @@ option(TRACE_MYRWMUTEX "Trace custom R/W Mutex (Debug builds only); redirecting
option(AUTO_GDK_FLUSH "Use gdk_flush on all gdk_thread_leave other than the GUI thread; set it ON if you experience X Server warning/errors" OFF) option(AUTO_GDK_FLUSH "Use gdk_flush on all gdk_thread_leave other than the GUI thread; set it ON if you experience X Server warning/errors" OFF)
#option(TARGET32BIT "Build for 32-bit architecture when ON, otherwise 64-bit. Default is OFF" OFF) #option(TARGET32BIT "Build for 32-bit architecture when ON, otherwise 64-bit. Default is OFF" OFF)
option(ENABLE_TCMALLOC "Use the tcmalloc library if available" OFF)
set(TCMALLOC_LIB_DIR "" CACHE PATH "Custom path for the tcmalloc library")
# Set installation directories: # Set installation directories:
if(WIN32 OR APPLE) if(WIN32 OR APPLE)
if(BUILD_BUNDLE) if(BUILD_BUNDLE)
@@ -564,6 +567,23 @@ int main()
return 0; return 0;
}" LENSFUN_HAS_LOAD_DIRECTORY) }" LENSFUN_HAS_LOAD_DIRECTORY)
set(TCMALLOC_LIB_DIR)
if(ENABLE_TCMALLOC)
if(TCMALLOC_LIB_DIR)
find_library(TCMALLOC_LIBRARIES tcmalloc PATHS ${TCMALLOC_LIB_DIR} NO_DEFAULT_PATH)
else()
find_library(TCMALLOC_LIBRARIES tcmalloc)
endif()
if(TCMALLOC_LIBRARIES)
message(STATUS "using tcmalloc library in ${TCMALLOC_LIBRARIES}")
else()
set(TCMALLOC_LIBRARIES "" CACHE INTERNAL "" FORCE)
message(STATUS "tcmalloc not found")
endif()
else()
set(TCMALLOC_LIBRARIES "" CACHE INTERNAL "" FORCE)
endif()
add_subdirectory(rtexif) add_subdirectory(rtexif)
add_subdirectory(rtengine) add_subdirectory(rtengine)

2
rtgui/CMakeLists.txt
View File

@@ -286,6 +286,7 @@ target_link_libraries(rth rtengine
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${LENSFUN_LIBRARIES} ${LENSFUN_LIBRARIES}
${RSVG_LIBRARIES} ${RSVG_LIBRARIES}
${TCMALLOC_LIBRARIES}
) )
target_link_libraries(rth-cli rtengine target_link_libraries(rth-cli rtengine
@@ -307,6 +308,7 @@ target_link_libraries(rth-cli rtengine
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${LENSFUN_LIBRARIES} ${LENSFUN_LIBRARIES}
${RSVG_LIBRARIES} ${RSVG_LIBRARIES}
${TCMALLOC_LIBRARIES}
) )
# Install executables # Install executables