From d1f36ae1a5a8219b7a118cd7f5f5c9a725a94dd0 Mon Sep 17 00:00:00 2001 From: Leif Walsh <leif@tokutek.com> Date: Tue, 12 Jun 2012 19:27:11 +0000 Subject: [PATCH] [t:4871] silence FindValgrind, fix debug settings for release icc builds git-svn-id: file:///svn/toku/tokudb@44486 c7de825b-a66e-492c-adef-691d508d4ae1 --- cmake_modules/FindValgrind.cmake | 2 -- cmake_modules/TokuSetupCompiler.cmake | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cmake_modules/FindValgrind.cmake b/cmake_modules/FindValgrind.cmake index 4072ecc7c2..3862ba9b10 100644 --- a/cmake_modules/FindValgrind.cmake +++ b/cmake_modules/FindValgrind.cmake @@ -8,8 +8,6 @@ # If you have valgrind installed in a non-standard place, you can define # VALGRIND_PREFIX to tell cmake where it is. -message(STATUS "Valgrind Prefix: ${VALGRIND_PREFIX}") - find_path(VALGRIND_INCLUDE_DIR include/valgrind/memcheck.h ${VALGRIND_PREFIX} /usr/local /usr) find_program(VALGRIND_PROGRAM NAMES valgrind PATH ${VALGRIND_PREFIX}/bin /usr/local/bin /usr/bin) diff --git a/cmake_modules/TokuSetupCompiler.cmake b/cmake_modules/TokuSetupCompiler.cmake index 2a74262964..16b3b02d87 100644 --- a/cmake_modules/TokuSetupCompiler.cmake +++ b/cmake_modules/TokuSetupCompiler.cmake @@ -80,7 +80,7 @@ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g3 -ggdb -O0") set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG FORTIFY_SOURCE=2) ## set extra release flags, we overwrite this because the default passes -DNDEBUG and we don't want that -set(CMAKE_C_FLAGS_RELEASE "-g3 -ggdb -O3") +set(CMAKE_C_FLAGS_RELEASE "-g -O3") ## check how to do inter-procedural optimization check_c_compiler_flag(-flto HAVE_CC_FLAG_FLTO) @@ -95,7 +95,7 @@ endif () if (CMAKE_C_COMPILER_ID MATCHES Intel) ## make sure intel libs are linked statically - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-intel") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-intel") ## disable some intel-specific warnings set(intel_warnings @@ -111,7 +111,7 @@ if (CMAKE_C_COMPILER_ID MATCHES Intel) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -diag-disable ${intel_warning_string}") ## icc does -g differently - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -debug all") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -debug all") ## set icc warnings set(CMAKE_C_FLAGS "-Wcheck ${CMAKE_C_FLAGS}") -- 2.30.9