[build] CMake: add some flags from native-utils

wpilibsuite · Jul 12, 2024 · 55a88f3 · 55a88f3
1 parent 9671055
commit 55a88f3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,6 +30,7 @@ include(CPack)
 include(OptionValidation)
 
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${WPILIB_BINARY_DIR}/lib)

diff --git a/apriltag/CMakeLists.txt b/apriltag/CMakeLists.txt
@@ -134,7 +134,11 @@ if(MSVC)
 else()
     target_compile_options(
         apriltag
-        PRIVATE -Wno-sign-compare -Wno-gnu-zero-variadic-macro-arguments -Wno-type-limits
+        PRIVATE
+            -Wno-sign-compare
+            -Wno-gnu-zero-variadic-macro-arguments
+            -Wno-type-limits
+            -Wno-format-nonliteral
     )
 endif()
 

diff --git a/cmake/modules/CompileWarnings.cmake b/cmake/modules/CompileWarnings.cmake
@@ -5,7 +5,7 @@ macro(wpilib_target_warnings target)
             -pedantic
             -Wextra
             -Wno-unused-parameter
-            ${WPILIB_TARGET_WARNINGS}
+            -Wformat=2
         )
         if(NOT NO_WERROR)
             set(WARNING_FLAGS ${WARNING_FLAGS} -Werror)
@@ -15,14 +15,7 @@ macro(wpilib_target_warnings target)
     else()
         target_compile_options(
             ${target}
-            PRIVATE
-                /wd4146
-                /wd4244
-                /wd4251
-                /wd4267
-                /WX
-                /D_CRT_SECURE_NO_WARNINGS
-                ${WPILIB_TARGET_WARNINGS}
+            PRIVATE /wd4146 /wd4244 /wd4251 /wd4267 /WX /D_CRT_SECURE_NO_WARNINGS
         )
     endif()
 

diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
@@ -151,7 +151,7 @@ target_compile_features(wpiutil PUBLIC cxx_std_20)
 if(MSVC)
     target_compile_options(
         wpiutil
-        PUBLIC /permissive- /Zc:preprocessor /Zc:throwingNew /MP /bigobj
+        PUBLIC /permissive- /Zc:preprocessor /Zc:throwingNew /Zc:__cplusplus /MP /bigobj /utf-8 /FS
     )
     target_compile_definitions(wpiutil PRIVATE -D_CRT_SECURE_NO_WARNINGS)
 endif()