I had to upgrade these to compile with C++ 17 to match with LavaTool.…

… BUT LAVA TOOL IS DONE WITH LLVM 11! I have to do more upgrades to FBI
panda-re · Jul 9, 2024 · 5827568 · 5827568
1 parent 9f7d4d6
commit 5827568
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/tools/lavaDB/src/CMakeLists.txt b/tools/lavaDB/src/CMakeLists.txt
@@ -1,9 +1,6 @@
-cmake_minimum_required(VERSION 3.15)
-
 #add_library (lavaDB_x32 STATIC lavaDB.cpp)
 #set_property(TARGET lavaDB_x32 PROPERTY CXX_STANDARD 11)
 #set_target_properties(lavaDB_x32 PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
 
 add_library (lavaDB_x64 STATIC lavaDB.cpp)
-set_property(TARGET lavaDB_x64 PROPERTY CXX_STANDARD 11)
-target_compile_options(lavaDB_x64 PRIVATE -D_GLIBCXX_USE_CXX11_ABI=0)
+set_property(TARGET lavaDB_x64 PROPERTY CXX_STANDARD 17)
diff --git a/tools/lavaODB/src/CMakeLists.txt b/tools/lavaODB/src/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.15)
-
 set (GENERATED ${CMAKE_CURRENT_SOURCE_DIR}/../generated)
 
 if (NOT EXISTS ${GENERATED})
@@ -40,8 +38,7 @@ add_custom_target (cleanup
 #    ${CMAKE_CURRENT_SOURCE_DIR}/../include)
 
 add_library(lava-odb_x64 STATIC ${GENERATED}/lava-odb.cxx)
-target_compile_options(lava-odb_x64 PRIVATE -D_GLIBCXX_USE_CXX11_ABI=0)
-set_property(TARGET lava-odb_x64 PROPERTY CXX_STANDARD 11)
+set_property(TARGET lava-odb_x64 PROPERTY CXX_STANDARD 17)
 target_link_libraries(lava-odb_x64 odb odb-pgsql)
 add_dependencies(lava-odb_x64 cleanup)
 target_include_directories(lava-odb_x64 BEFORE