test

Kataglyphis · Nov 6, 2024 · 2051fae · 2051fae
1 parent f8fa0ae
commit 2051fae
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/Test/commit/CMakeLists.txt b/Test/commit/CMakeLists.txt
@@ -71,16 +71,15 @@ target_link_libraries(
          tinyobjloader
          vma
          ktx
-         PRIVATE
+  PRIVATE
+         gtest
+         gtest_main
+         GSL
          # enable compiler warnings
          myproject_warnings
          # enable sanitizers
          myproject_options)
 
-target_link_libraries(${COMMIT_TEST_SUITE} PRIVATE gtest
-                                                   gtest_main
-                                                   GSL)
-
 if(NOT WINDOWS_CI)
   message(STATUS "WINDOWS_CI is OFF or not defined.")
   gtest_discover_tests(${COMMIT_TEST_SUITE} DISCOVERY_TIMEOUT 300)

diff --git a/Test/compile/CMakeLists.txt b/Test/compile/CMakeLists.txt
@@ -70,16 +70,15 @@ target_link_libraries(
          tinyobjloader
          vma
          ktx
-         PRIVATE
          # enable compiler warnings
          myproject_warnings
+  PRIVATE
+         gtest_main
+         gtest
+         GSL
          # enable sanitizers
          myproject_options)
 
-target_link_libraries(${COMPILE_TEST_SUITE} PRIVATE gtest_main
-                                                    gtest
-                                                    GSL)
-
 if(NOT WINDOWS_CI)
   message(STATUS "WINDOWS_CI is OFF or not defined.")
   gtest_discover_tests(${COMPILE_TEST_SUITE} DISCOVERY_TIMEOUT 300)

diff --git a/Test/perf/CMakeLists.txt b/Test/perf/CMakeLists.txt
@@ -65,11 +65,12 @@ target_link_libraries( ${PERF_TEST_SUITE}  PUBLIC       ${CMAKE_DL_LIBS}
                                                         tinyobjloader
                                                         vma
                                                         ktx
+                                            PRIVATE benchmark::benchmark
+                                                    benchmark::benchmark_main
+                                                    GSL
 )
 
-target_link_libraries(${PERF_TEST_SUITE}   PRIVATE benchmark::benchmark
-                                                   benchmark::benchmark_main
-                                                   GSL)
+target_link_libraries(${PERF_TEST_SUITE}   )
 
 # disable all warnings for our test suite
 if(MSVC)

diff --git a/cmake/ProjectOptions.cmake b/cmake/ProjectOptions.cmake
@@ -100,8 +100,8 @@ macro(myproject_global_options)
     set(CMAKE_CXX_FLAGS_RELEASE "{CMAKE_CXX_FLAGS_RELEASE} /O2 -DNDEBUG -fcolor-diagnostics")
     # https://clang.llvm.org/docs/ClangCommandLineReference.html
   elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -ggdb -std=c++2a -fcolor-diagnostics")
-    set(CMAKE_CXX_FLAGS_RELEASE "{CMAKE_CXX_FLAGS_RELEASE} -O3 -DNDEBUG -std=c++2a -fcolor-diagnostics")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -ggdb -std=c++23 -fcolor-diagnostics") # -std=c++2a
+    set(CMAKE_CXX_FLAGS_RELEASE "{CMAKE_CXX_FLAGS_RELEASE} -O3 -DNDEBUG -std=c++23 -fcolor-diagnostics") # -std=c++2a
   endif()
 
   # control where the static and shared libraries are built so that on windows
@@ -110,7 +110,7 @@ macro(myproject_global_options)
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 
-  #set(CMAKE_LINK_WHAT_YOU_USE TRUE)
+  set(CMAKE_LINK_WHAT_YOU_USE TRUE)
 
   if(myproject_ENABLE_IPO)
     include(cmake/InterproceduralOptimization.cmake)