fix valgrind finding algorithm and usage

refs #4871

git-svn-id: file:///svn/toku/tokudb@45046 c7de825b-a66e-492c-adef-691d508d4ae1

CMakeLists.txt

@@ -29,11 +29,8 @@ if (USE_CILK AND (NOT CMAKE_C_COMPILER_ID MATCHES Intel))
   message(FATAL_ERROR "You specified USE_CILK=ON so you need INTEL_CC=ON.")
 endif ()
 
-## default includes and libraries
-include_directories(SYSTEM
-  /usr/local/include
-  ${ZLIB_INCLUDE_DIRS}
-  ${VALGRIND_INCLUDE_DIRS}
+include_directories(
+  ${VALGRIND_INCLUDE_DIR}
   )
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -49,6 +46,12 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/toku_include)
 add_subdirectory(buildheader)
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/buildheader)
 
+## default includes and libraries
+include_directories(SYSTEM
+  /usr/local/include
+  ${ZLIB_INCLUDE_DIRS}
+  )
+
 ## add subdirectories
 add_subdirectory(portability)
 add_subdirectory(ft)
@@ -67,4 +70,4 @@ install(
   )
 
 ## build tags
-include(TokuBuildTagDatabases)
+include(TokuBuildTagDatabases)
\ No newline at end of file

cmake_modules/FindValgrind.cmake

@@ -8,11 +8,11 @@
 # If you have valgrind installed in a non-standard place, you can define
 # VALGRIND_PREFIX to tell cmake where it is.
 
-find_path(VALGRIND_INCLUDE_DIR include/valgrind/memcheck.h ${VALGRIND_PREFIX} /usr/local /usr)
+find_path(VALGRIND_INCLUDE_DIR valgrind/memcheck.h ${VALGRIND_PREFIX}/include /usr/local/include /usr/include)
 find_program(VALGRIND_PROGRAM NAMES valgrind PATH ${VALGRIND_PREFIX}/bin /usr/local/bin /usr/bin)
 
 find_package_handle_standard_args(VALGRIND DEFAULT_MSG
     VALGRIND_INCLUDE_DIR
     VALGRIND_PROGRAM)
 
-mark_as_advanced(VALGRIND_INCLUDE_DIR VALGRIND_PROGRAM)
+mark_as_advanced(VALGRIND_INCLUDE_DIR VALGRIND_PROGRAM)
\ No newline at end of file