From 308bc3934dc1ed1132a5d1885acd939cd4918d04 Mon Sep 17 00:00:00 2001 From: AndrewQuijano Date: Tue, 9 Jul 2024 01:06:23 -0400 Subject: [PATCH] I am applying Andrew Fasano's CMake update from omg.cpp to the other binaries, and got new LLVM issues. Progress! --- tools/lavaTool/src/CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/lavaTool/src/CMakeLists.txt b/tools/lavaTool/src/CMakeLists.txt index e9175c0f..33b4cdd9 100644 --- a/tools/lavaTool/src/CMakeLists.txt +++ b/tools/lavaTool/src/CMakeLists.txt @@ -46,6 +46,7 @@ include_directories(${CMAKE_SOURCE_DIR}/include) message(STATUS "PROJECT_SOURCE_DIR: ${PROJECT_SOURCE_DIR}") message(STATUS "CMAKE_SOURCE_DIR: ${CMAKE_SOURCE_DIR}") +message(STATUS "LLVM_CLANG_LINK_LIBRARIES: ${LLVM_CLANG_LINK_LIBRARIES}") if(NOT EXISTS "${CMAKE_SOURCE_DIR}/include/lava_version.h") message(FATAL_ERROR "Missing lava_version.h") @@ -59,40 +60,43 @@ target_link_libraries(omg PRIVATE ${LLVM_CLANG_LINK_LIBRARIES}) # Create lavaTool executable add_executable(lavaTool lavaTool.cpp) -target_compile_features(lavaTool PRIVATE cxx_std_14) -target_compile_options(lavaTool PRIVATE -D_GLIBCXX_USE_CXX11_ABI=0 -fno-omit-frame-pointer -O3 -fexceptions -frtti) +target_compile_features(lavaTool PRIVATE cxx_std_17) target_include_directories(lavaTool PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../lavaDB/include ${CMAKE_CURRENT_SOURCE_DIR}/../../lavaODB/generated ${CMAKE_CURRENT_SOURCE_DIR}/../../lavaODB/include ${CMAKE_CURRENT_SOURCE_DIR}/../../include ${CMAKE_CURRENT_SOURCE_DIR}/../include + ${LLVM_INCLUDE_DIRS} + ${CLANG_INCLUDE_DIRS} ) target_link_libraries(lavaTool PRIVATE lavaDB_x64 omg odb odb-pgsql lava-odb_x64 ${LLVM_CLANG_LINK_LIBRARIES}) set_target_properties(lavaTool PROPERTIES LINK_FLAGS "-flto -fuse-ld=gold") # Create lavaFnTool executable add_executable(lavaFnTool lavaFnTool.cpp) -target_compile_features(lavaFnTool PRIVATE cxx_std_14) -target_compile_options(lavaFnTool PRIVATE -D_GLIBCXX_USE_CXX11_ABI=0 -fno-omit-frame-pointer -O3 -fexceptions -frtti) +target_compile_features(lavaFnTool PRIVATE cxx_std_17) target_include_directories(lavaFnTool PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../lavaDB/include ${CMAKE_CURRENT_SOURCE_DIR}/../../lavaODB/generated ${CMAKE_CURRENT_SOURCE_DIR}/../../lavaODB/include ${CMAKE_CURRENT_SOURCE_DIR}/../../include ${CMAKE_CURRENT_SOURCE_DIR}/../include + ${LLVM_INCLUDE_DIRS} + ${CLANG_INCLUDE_DIRS} ) target_link_libraries(lavaFnTool PRIVATE lavaDB_x64 omg odb odb-pgsql lava-odb_x64 ${LLVM_CLANG_LINK_LIBRARIES}) set_target_properties(lavaFnTool PROPERTIES LINK_FLAGS "-flto -fuse-ld=gold") # Create lavaInitTool executable add_executable(lavaInitTool lavaInitTool.cpp) -target_compile_features(lavaInitTool PRIVATE cxx_std_14) -target_compile_options(lavaInitTool PRIVATE -D_GLIBCXX_USE_CXX11_ABI=0 -fno-omit-frame-pointer -O3 -fexceptions -frtti) +target_compile_features(lavaInitTool PRIVATE cxx_std_17) target_include_directories(lavaInitTool PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../lavaODB/include ${CMAKE_CURRENT_SOURCE_DIR}/../../include ${CMAKE_CURRENT_SOURCE_DIR}/../include + ${LLVM_INCLUDE_DIRS} + ${CLANG_INCLUDE_DIRS} ) target_link_libraries(lavaInitTool PRIVATE ${LLVM_CLANG_LINK_LIBRARIES}) set_target_properties(lavaInitTool PROPERTIES LINK_FLAGS "-flto -fuse-ld=gold")