Merge remote-tracking branch 'proplib-template/main' into dev

NTIA · Jan 16, 2025 · 1e0775d · 1e0775d
2 parents 5d10a5c + 7d932a5
commit 1e0775d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -107,11 +107,11 @@ function(configure_proplib_target proplib_target)
         # For GCC-like compilers in 32-bit configurations
         "$<${gcc_like_cxx}:$<BUILD_INTERFACE:$<$<BOOL:${BUILD_32BIT}>:-m32>>>"
         # For MSVC compiler in any configuration
-        "$<${msvc_cxx}:$<BUILD_INTERFACE:/W3;/Gd>>"
+        "$<${msvc_cxx}:$<BUILD_INTERFACE:/Gd>>"
         # For MSVC compiler in Release configurations
-        "$<${msvc_cxx}:$<BUILD_INTERFACE:$<$<CONFIG:Release>:/O2;/DNDEBUG;/MT>>>"
+        "$<${msvc_cxx}:$<BUILD_INTERFACE:$<$<CONFIG:Release>:/W3;/O2;/DNDEBUG>>>"
         # For MSVC compiler in Debug configurations
-        "$<${msvc_cxx}:$<BUILD_INTERFACE:$<$<CONFIG:Debug>:/Od;/Zi;/MTd>>>"
+        "$<${msvc_cxx}:$<BUILD_INTERFACE:$<$<CONFIG:Debug>:/W4;/Od;/Zi>>>"
     )
 endfunction()
 

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -54,7 +54,7 @@
         {
             "name": "debug64",
             "displayName": "Debug, 64-Bit",
-            "description": "Build library and tests with debug options. Skip building driver, driver tests, and docs.",
+            "description": "Build library, driver and tests with debug options. Skip building docs.",
             "inherits": "proplib-config-debug-base"
         },
         {
@@ -66,7 +66,7 @@
         {
             "name": "debug32",
             "displayName": "Debug, 32-bit",
-            "description": "Build 32-bit library and tests with debug options. Skip building driver, driver tests, and docs.",
+            "description": "Build 32-bit library, driver and tests with debug options. Skip building docs.",
             "inherits": "proplib-config-debug-base",
             "cacheVariables": {
                 "BUILD_32BIT": "ON"
@@ -121,28 +121,28 @@
             "name": "debug64",
             "inherits": "proplib-build-debug-base",
             "displayName": "Build Debug, 64-Bit",
-            "description": "Build library and tests with debug options, skip building docs",
+            "description": "Build library, driver and tests with debug options, skip building docs",
             "configurePreset": "debug64"
         },
         {
             "name": "release64",
             "inherits": "proplib-build-release-base",
             "displayName": "Build Release, 64-Bit",
-            "description": "Build library and tests with release options, and build docs",
+            "description": "Build library, driver, docs and tests with release options",
             "configurePreset": "release64"
         },
         {
             "name": "debug32",
             "inherits": "proplib-build-debug-base",
             "displayName": "Build Debug, 32-Bit",
-            "description": "Build library and tests with debug options, skip building docs",
+            "description": "Build library, driver and tests with debug options, skip building docs",
             "configurePreset": "debug32"
         },
         {
             "name": "release32",
             "inherits": "proplib-build-release-base",
             "displayName": "Build Release, 32-Bit",
-            "description": "Build library and tests with release options, and build docs",
+            "description": "Build library, driver, docs and tests with release options",
             "configurePreset": "release32"
         },
         {
@@ -179,28 +179,28 @@
             "name": "debug64",
             "inherits": "proplib-test-debug-base",
             "displayName": "Test Debug, 64-bit",
-            "description": "Build library and tests with debug options, skip building docs",
+            "description": "Build library, driver  and tests with debug options, skip building docs",
             "configurePreset": "debug64"
         },
         {
             "name": "release64",
             "inherits": "proplib-test-release-base",
             "displayName": "Test Release, 64-Bit",
-            "description": "Build library and tests with release options, and build docs",
+            "description": "Build library, driver and tests with release options, and build docs",
             "configurePreset": "release64"
         },
         {
             "name": "debug32",
             "inherits": "proplib-test-debug-base",
             "displayName": "Test Debug, 32-Bit",
-            "description": "Build library and tests with debug options, skip building docs",
+            "description": "Build library, driver and tests with debug options, skip building docs",
             "configurePreset": "debug32"
         },
         {
             "name": "release32",
             "inherits": "proplib-test-release-base",
             "displayName": "Test Release, 32-Bit",
-            "description": "Build library and tests with release options, and build docs",
+            "description": "Build library, driver and tests with release options, and build docs",
             "configurePreset": "release32"
         }
     ]

diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt
@@ -24,6 +24,7 @@ target_include_directories(${DRIVER_NAME} PUBLIC "${DRIVER_HEADERS}")
 # Link the library to the executable
 target_link_libraries(${DRIVER_NAME} ${LIB_NAME})
 
+# Set PropLib compiler option defaults
 configure_proplib_target(${DRIVER_NAME})
 
 # Add definitions to enable version identification inside the driver

diff --git a/app/tests/CMakeLists.txt b/app/tests/CMakeLists.txt
@@ -23,6 +23,9 @@ target_include_directories(
 # Link the library to the executable
 target_link_libraries(${DRIVER_TEST_NAME} ${LIB_NAME})
 
+# Set PropLib compiler option defaults
+configure_proplib_target(${DRIVER_TEST_NAME})
+
 # Make driver executable location available to source
 add_compile_definitions(DRIVER_LOCATION="$<TARGET_FILE:${DRIVER_NAME}>")
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -25,7 +25,7 @@ endif ()
 # Add the include directory
 target_include_directories(${LIB_NAME} PUBLIC "${LIB_HEADERS}")
 
-# Configure compiler options
+# Set PropLib compiler option defaults
 configure_proplib_target(${LIB_NAME})
 
 # Add definition to get the library name and version inside the library

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -14,6 +14,9 @@ add_executable(
     "TestUtils.h"
 )
 
+# Set PropLib compiler option defaults
+configure_proplib_target(${TEST_NAME})
+
 ###########################################
 ## SET UP AND DISCOVER TESTS
 ###########################################