Converted more hidden options to proper options.

cmake/options.cmake

@@ -10,6 +10,9 @@ option (BUILD_RTLIB_32 "Build 32-bit runtime library on mixed 32/64 systems" OFF
 option(BUILD_RTLIB "Building runtime library (can be disabled safely for component-level builds)" ON)
 option(BUILD_DOCS "Build manuals from LaTeX sources" ON)
 option(USE_COTIRE "Enable Cotire precompiled headers")
+option(USE_GNU_DEMANGLER "Use cxa_demangle (ON) or binutils demangle (OFF)" ON)
+
+option (ENABLE_LTO "Enable Link-Time Optimization" OFF)
 
 # Some global on/off switches
 if (LIGHTWEIGHT_SYMTAB)

cmake/packages.cmake

@@ -127,7 +127,6 @@ endif()
 
 
 find_package (Boost ${BOOST_MIN_VERSION} COMPONENTS thread system date_time timer filesystem)
-find_library(PROFILER_LIBRARIES profiler /p/paradyn/packages/gperftools/lib)
 
 if(NOT Boost_FOUND)
   set (BOOST_ARGS

cmake/shared.cmake

@@ -83,9 +83,6 @@ endfunction()
 
 
 #Change to switch between libiberty/libstdc++ demangler
-#set(USE_GNU_DEMANGLER 1)
-
-set (ENABLE_LTO FALSE CACHE BOOL "Enable Link-Time Optimization")
 
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${DYNINST_ROOT}/cmake/Modules")
 include (${DYNINST_ROOT}/cmake/platform.cmake)
@@ -99,30 +96,29 @@ include (${DYNINST_ROOT}/cmake/options.cmake)
 include (${DYNINST_ROOT}/cmake/optimization.cmake)
 
 # Check for cotire-gcc compatibility
-set(USE_COTIRE false)
 IF(CMAKE_COMPILER_IS_GNUCC)
     execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
     string(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${GCC_VERSION})
     IF(GCC_VERSION VERSION_LESS 4.5)
-        SET(USE_COTIRE false)
+        SET(USE_COTIRE OFF)
     ENDIF()
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 # If we're compiling for unix, cotire only supports Intel, GCC and Clang.
 IF (UNIX AND NOT ((${CMAKE_CXX_COMPILER_ID} MATCHES Clang) OR (${CMAKE_CXX_COMPILER_ID} MATCHES GNU) OR (${CMAKE_CXX_COMPILER_ID} MATCHES Intel)))
-	set(USE_COTIRE false)
+	set(USE_COTIRE OFF)
 ENDIF()
 
 # Make sure our CMake version is actually supported by cotire
 IF(CMAKE_VERSION VERSION_LESS 2.8.12)
-    SET(USE_COTIRE false)
+    SET(USE_COTIRE OFF)
 ENDIF()
 
 if (USE_COTIRE)
     include (${DYNINST_ROOT}/cmake/cotire.cmake)
+    set_directory_properties(PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
 endif()
 
-set_directory_properties(PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
 
 set (BUILD_SHARED_LIBS ON)