From 7153f2169c456c9ff7b4abbf2ad4b2c1583f603f Mon Sep 17 00:00:00 2001 From: Matthew Parkinson Date: Wed, 12 Jun 2019 15:04:25 +0100 Subject: [PATCH] Reverting separate compilation of new.cc. --- CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5e3597..8a5eb4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,8 +147,6 @@ if(NOT DEFINED SNMALLOC_ONLY_HEADER_LIBRARY) enable_testing() - add_library(overide_new STATIC src/override/new.cc) - set(TESTDIR ${CMAKE_CURRENT_SOURCE_DIR}/src/test) subdirlist(TEST_CATEGORIES ${TESTDIR}) list(REVERSE TEST_CATEGORIES) @@ -160,12 +158,12 @@ if(NOT DEFINED SNMALLOC_ONLY_HEADER_LIBRARY) aux_source_directory(${TESTDIR}/${TEST_CATEGORY}/${TEST} SRC) set(TESTNAME "${TEST_CATEGORY}-${TEST}-${SUPER_SLAB_SIZE}") - add_executable(${TESTNAME} ${SRC}) + add_executable(${TESTNAME} ${SRC} src/override/new.cc) if (${SUPER_SLAB_SIZE} EQUAL 1) target_compile_definitions(${TESTNAME} PRIVATE IS_ADDRESS_SPACE_CONSTRAINED) endif() target_include_directories(${TESTNAME} PRIVATE src) - target_link_libraries(${TESTNAME} snmalloc_lib overide_new) + target_link_libraries(${TESTNAME} snmalloc_lib) if (${TEST} MATCHES "release-.*") message(STATUS "Adding test: ${TESTNAME} only for release configs") add_test(NAME ${TESTNAME} COMMAND ${TESTNAME} CONFIGURATIONS "Release")