kris/pqc
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
Henry Case 2021-06-22 01:14:17 +01:00
parent d9344d6956
commit 2ce8a28e41
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -31,6 +31,7 @@ if(MEMSAN)
set(CMAKE_ARGS_MEMCHECK_INC "-isystem -I${LLVM_PRJ_INC} -I${LLVM_PRJ_INC}/c++/v1") set(CMAKE_ARGS_MEMCHECK_INC "-isystem -I${LLVM_PRJ_INC} -I${LLVM_PRJ_INC}/c++/v1")
set(CMAKE_ARGS_MEMCHECK_FLAGS "-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -Wno-unused-command-line-argument") set(CMAKE_ARGS_MEMCHECK_FLAGS "-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -Wno-unused-command-line-argument")
set(EXTRA_CXX_FLAGS "${CMAKE_ARGS_MEMCHECK_FLAGS} ${CMAKE_ARGS_MEMCHECK_LIB} ${CMAKE_ARGS_MEMCHECK_INC} -DPQC_MEMSAN_BUILD") set(EXTRA_CXX_FLAGS "${CMAKE_ARGS_MEMCHECK_FLAGS} ${CMAKE_ARGS_MEMCHECK_LIB} ${CMAKE_ARGS_MEMCHECK_INC} -DPQC_MEMSAN_BUILD")
set(CXXLIBS_FOR_MEMORY_SANITIZER cxx cxxabi)
endif() endif()
# Dependencies # Dependencies
@ -43,7 +44,9 @@ ExternalProject_Add(
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/3rd/gtest INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/3rd/gtest
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/3rd/gtest -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_CXX_FLAGS=${EXTRA_CXX_FLAGS} -DCMAKE_C_FLAGS=${EXTRA_CXX_FLAGS} -Dgtest_disable_pthreads=ON CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/3rd/gtest -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_CXX_FLAGS=${EXTRA_CXX_FLAGS} -DCMAKE_C_FLAGS=${EXTRA_CXX_FLAGS} -Dgtest_disable_pthreads=ON
) )
add_dependencies(gtest_project cxx cxxabi) if(MEMSAN)
add_dependencies(gtest_project ${CXXLIBS_FOR_MEMORY_SANITIZER})
endif()
FetchContent_Declare( FetchContent_Declare(
gbench gbench
@ -348,11 +351,10 @@ add_executable(
target_link_libraries( target_link_libraries(
ut ut
cxx
cxxabi
gtest gtest
gtest_main gtest_main
pqc_s) pqc_s
${CXXLIBS_FOR_MEMORY_SANITIZER})
ExternalProject_Get_Property(gtest_project INSTALL_DIR) ExternalProject_Get_Property(gtest_project INSTALL_DIR)
target_include_directories( target_include_directories(

4
test/bench/CMakeLists.txt
View File

@ -14,7 +14,5 @@ target_link_libraries(
pqc pqc
benchmark benchmark
benchmark_main benchmark_main
cxx ${CXXLIBS_FOR_MEMORY_SANITIZER})
cxxabi
)