CMake cleanups

Author: PointKernel

CMakeLists.txt

@@ -94,6 +94,30 @@ target_compile_features(cuco INTERFACE cxx_std_17 cuda_std_17)
 option(CUCO_DOWNLOAD_ROARING_TESTDATA "Download RoaringFormatSpec test data" ON)
 include(${CMAKE_CURRENT_LIST_DIR}/cmake/roaring_testdata.cmake)
 
+###################################################################################################
+# - common compile options function ---------------------------------------------------------------
+
+function(cuco_set_common_compile_options target_name)
+    # Parse optional arguments
+    cmake_parse_arguments(CUCO_OPTS "ADD_LINEINFO" "" "" ${ARGN})
+    
+    # Base compile options common to all targets
+    target_compile_options(${target_name} PRIVATE 
+        --compiler-options=-Wall --compiler-options=-Wextra --compiler-options=-Werror 
+        -Wno-deprecated-gpu-targets --expt-extended-lambda -Werror=all-warnings
+    )
+    
+    # Add lineinfo option if requested (typically for benchmarks)
+    if(CUCO_OPTS_ADD_LINEINFO)
+        target_compile_options(${target_name} PRIVATE -lineinfo)
+    endif()
+    
+    # Add GCC-specific warning suppression only for GCC
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        target_compile_options(${target_name} PRIVATE -Xcompiler -Wno-subobject-linkage)
+    endif()
+endfunction()
+
 ###################################################################################################
 # - optionally build tests ------------------------------------------------------------------------
 

benchmarks/CMakeLists.txt

@@ -27,12 +27,7 @@ function(ConfigureBench BENCH_NAME)
                                         RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/benchmarks")
     target_include_directories(${BENCH_NAME} PRIVATE
                                              "${CMAKE_CURRENT_SOURCE_DIR}")
-    target_compile_options(${BENCH_NAME} PRIVATE --compiler-options=-Wall --compiler-options=-Wextra
-      --compiler-options=-Werror -Wno-deprecated-gpu-targets --expt-extended-lambda -lineinfo -Xcudafe --promote_warnings)
-    # Add GCC-specific warning suppression only for GCC
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      target_compile_options(${BENCH_NAME} PRIVATE -Xcompiler -Wno-subobject-linkage)
-    endif()
+    cuco_set_common_compile_options(${BENCH_NAME} ADD_LINEINFO)
     target_link_libraries(${BENCH_NAME} PRIVATE
                                         nvbench::main
                                         pthread

examples/CMakeLists.txt

@@ -24,12 +24,7 @@ function(ConfigureExample EXAMPLE_NAME EXAMPLE_SRC)
                                           RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/examples")
     target_include_directories(${EXAMPLE_NAME} PRIVATE
                                              "${CMAKE_CURRENT_SOURCE_DIR}")
-    target_compile_options(${EXAMPLE_NAME} PRIVATE --compiler-options=-Wall --compiler-options=-Wextra
-      --compiler-options=-Werror -Wno-deprecated-gpu-targets --expt-extended-lambda -Xcudafe --promote_warnings)
-    # Add GCC-specific warning suppression only for GCC
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      target_compile_options(${EXAMPLE_NAME} PRIVATE -Xcompiler -Wno-subobject-linkage)
-    endif()
+    cuco_set_common_compile_options(${EXAMPLE_NAME})
     target_link_libraries(${EXAMPLE_NAME} PRIVATE cuco CUDA::cudart)
 endfunction(ConfigureExample)
 

tests/CMakeLists.txt

@@ -38,12 +38,7 @@ function(ConfigureTest TEST_NAME)
     target_include_directories(${TEST_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
     set_target_properties(${TEST_NAME} PROPERTIES
                                        RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/tests")
-    target_compile_options(${TEST_NAME} PRIVATE --compiler-options=-Wall --compiler-options=-Wextra
-      --compiler-options=-Werror -Wno-deprecated-gpu-targets --expt-extended-lambda -Xcudafe --promote_warnings)
-    # Add GCC-specific warning suppression only for GCC
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      target_compile_options(${TEST_NAME} PRIVATE -Xcompiler -Wno-subobject-linkage)
-    endif()
+    cuco_set_common_compile_options(${TEST_NAME})
     catch_discover_tests(${TEST_NAME} EXTRA_ARGS --allow-running-no-tests)
 endfunction(ConfigureTest)