Add all compile options to CMakeLists

They will now show up in ccmake.
ipconfigme · Dec 31, 2017 · 11080cc · 11080cc
1 parent e4b7e35
commit 11080cc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,6 @@ set(libcuckoo_VERSION_PATCH 0)
 
 # put these in the cache so they show up in ccmake
 option (BUILD_EXAMPLES "build example libcuckoo programs")
-option (BUILD_TESTS "build libcuckoo test programs")
 
 # Add the libcuckoo interface target
 add_subdirectory(libcuckoo)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -4,6 +4,12 @@ target_include_directories(test_util INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
 
+# put these in the cache so they show up in ccmake
+option (BUILD_TESTS "build all libcuckoo tests")
+option (BUILD_STRESS_TESTS "build the stress tests")
+option (BUILD_UNIT_TESTS "build the unit tests")
+option (BUILD_UNIVERSAL_BENCHMARK "build the universal benchmark and associated tests")
+
 # Add pcg if we're doing stress tests or universal benchmark
 if (BUILD_TESTS OR
     BUILD_STRESS_TESTS OR

diff --git a/tests/universal-benchmark/CMakeLists.txt b/tests/universal-benchmark/CMakeLists.txt
@@ -1,23 +1,17 @@
 add_executable(universal_benchmark universal_benchmark.cc)
 
+# put these in the cache so they show up in ccmake
+set (UNIVERSAL_KEY uint64_t CACHE STRING "set the key type used by the universal benchmark")
+set (UNIVERSAL_VALUE uint64_t CACHE STRING "set the value type used by the universal benchmark")
+set (UNIVERSAL_TABLE LIBCUCKOO CACHE STRING "set the table type used by the universal benchmark")
+option (UNIVERSAL_TRACKING_ALLOCATOR "if on, also sample memory usage in the universal benchmark")
+
 target_link_libraries(universal_benchmark
     PRIVATE test_util
     PRIVATE libcuckoo
     PRIVATE pcg
 )
 
-if(NOT DEFINED UNIVERSAL_KEY)
-    set(UNIVERSAL_KEY uint64_t)
-endif()
-
-if(NOT DEFINED UNIVERSAL_VALUE)
-    set(UNIVERSAL_VALUE uint64_t)
-endif()
-
-if(NOT DEFINED UNIVERSAL_TABLE)
-    set(UNIVERSAL_TABLE LIBCUCKOO)
-endif()
-
 target_compile_options(universal_benchmark
     PRIVATE -DKEY=${UNIVERSAL_KEY}
     PRIVATE -DVALUE=${UNIVERSAL_VALUE}

diff --git a/tests/universal-benchmark/README.md b/tests/universal-benchmark/README.md
@@ -41,7 +41,7 @@ new keys can be added in `universal_gen.hh`
 `LIBCUCKOO`).  Support for new maps can be added in
 `universal_table_wrapper.hh`
 
-`-DTRACKING_ALLOCATOR`
+`-DUNIVERSAL_TRACKING_ALLOCATOR`
 : enables memory usage sampling
 
 These flags control the mixture of operations that will be run in the