update

ling0322 · Nov 19, 2024 · db85ab0 · db85ab0
1 parent b17f265
commit db85ab0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,9 +53,6 @@ if(WITH_MKL)
     endif()
 endif()
 
-
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 #add_compile_options(-fsanitize=address)
@@ -120,19 +117,24 @@ set(benchmark_LIBADD
     ${libllm_LIBADD})
 
 add_library(catch2 STATIC  "../third_party/catch2/catch_amalgamated.cpp")
+target_compile_features(catch2 PRIVATE cxx_std_17)
+
 add_executable(unittest "src/libllm/test_main.cc")
 target_include_directories(unittest PRIVATE "src")
+target_compile_features(unittest PRIVATE cxx_std_17)
 
 target_link_libraries(unittest ${unittest_LIBADD})
 
 add_executable(benchmark "src/libllm/benchmark_main.cc")
 target_include_directories(benchmark PRIVATE "src")
 target_link_libraries(benchmark ${benchmark_LIBADD})
+target_compile_features(benchmark PRIVATE cxx_std_17)
 
 if (WITH_CUDA)
     add_library(llmplugincublas SHARED $<TARGET_OBJECTS:llmplugincublas_static>)
     target_include_directories(llmplugincublas PRIVATE ${libllm_INCDIR})
     target_link_libraries(llmplugincublas lutil CUDA::cublas)
+    target_compile_features(llmplugincublas PRIVATE cxx_std_17)
     if(UNIX AND NOT APPLE)
         target_link_options(llmplugincublas PUBLIC "-Wl,--no-undefined")
     endif()
@@ -149,6 +151,7 @@ if (WITH_FFMPEG)
         "${ffmpeg_ROOT}/libavfilter"
         "${ffmpeg_ROOT}/libavutil"
         "${ffmpeg_ROOT}/libswresample")
+    target_compile_features(llmpluginffmpeg PRIVATE cxx_std_17)
     target_link_libraries(
         llmpluginffmpeg avformat avcodec avfilter avutil swresample ${CMAKE_THREAD_LIBS_INIT}) 
     if(UNIX AND NOT APPLE)

diff --git a/src/libllm/CMakeLists.txt b/src/libllm/CMakeLists.txt
@@ -168,13 +168,16 @@ if (WITH_FFMPEG)
     add_library(llmpluginffmpeg_static OBJECT "read_audio_ffmpeg.cc")
     target_compile_options(llmpluginffmpeg_static PRIVATE "-DLIBLLM_EXPORTS")
     target_include_directories(llmpluginffmpeg_static PRIVATE  ${libllm_INCDIR} "../../third_party/ffmpeg/")
+    target_compile_features(llmpluginffmpeg_static PRIVATE cxx_std_17)
 endif()
 
 add_library(libllm_static OBJECT ${libllm_SOURCES})
 target_compile_options(libllm_static PRIVATE "-DLIBLLM_EXPORTS")
+target_compile_features(libllm_static PRIVATE cxx_std_17)
 set_target_properties(libllm_static PROPERTIES CXX_VISIBILITY_PRESET hidden)
 set_target_properties(libllm_static PROPERTIES CUDA_VISIBILITY_PRESET hidden)
 target_include_directories(libllm_static PRIVATE ${libllm_INCDIR})
 
 add_library(libllm_test OBJECT ${libllm_test_SOURCES})
 target_include_directories(libllm_test PRIVATE ${libllm_INCDIR})
+target_compile_features(libllm_test PRIVATE cxx_std_17)
diff --git a/src/lutil/CMakeLists.txt b/src/lutil/CMakeLists.txt
@@ -41,8 +41,10 @@ if(UNIX AND NOT APPLE)
 endif()
 
 add_library(lutil STATIC ${lutil_SOURCES})
+target_compile_features(lutil PRIVATE cxx_std_17)
 set_target_properties(lutil PROPERTIES CXX_VISIBILITY_PRESET hidden)
 target_include_directories(lutil PRIVATE "..")
 
 add_library(lutil_test OBJECT ${lut_test_SOURCES})
 target_include_directories(lutil_test PRIVATE "..")
+target_compile_features(lutil_test PRIVATE cxx_std_17)