Merge remote-tracking branch 'origin/master' into QPR-11788

Author: mgroncki

App/CMakeLists.txt

@@ -40,6 +40,13 @@ if(MSVC AND MSVC_WHOLE_PROGRAM_OPTIMIZATION)
     target_link_options(ore PRIVATE "$<$<CONFIG:RelWithDebInfo>:/LTCG>")
     target_link_options(ore PRIVATE "$<$<CONFIG:RelWithDebInfo>:/OPT:REF>")
     target_link_options(ore PRIVATE "$<$<CONFIG:RelWithDebInfo>:/OPT:ICF>")
+
+    target_compile_options(ore PRIVATE "$<$<CONFIG:Release>:/GL>")
+    target_link_options(ore PRIVATE "$<$<CONFIG:Release>:/INCREMENTAL:NO>")
+    target_link_options(ore PRIVATE "$<$<CONFIG:Release>:/LTCG>")
+    target_link_options(ore PRIVATE "$<$<CONFIG:Release>:/OPT:REF>")
+    target_link_options(ore PRIVATE "$<$<CONFIG:Release>:/OPT:ICF>")
+
 endif()
 
 install(TARGETS ore

CMakePresets.json

@@ -15,7 +15,37 @@
         "QL_BUILD_BENCHMARK": false,
         "MSVC_LINK_DYNAMIC_RUNTIME": true,
         "MSVC_WHOLE_PROGRAM_OPTIMIZATION": false,
-        "ENABLE_SESSIONS": true,
+        "QL_ENABLE_SESSIONS": true,
+        "ORE_BUILD_DOC": false
+      },
+      "architecture": {
+        "value": "x64",
+        "strategy": "external"
+      },
+      "vendor": {
+        "microsoft.com/VisualStudioSettings/CMake/1.0": {
+          "intelliSenseMode": "windows-msvc-x64",
+          "hostOS": [
+            "Windows"
+          ]
+        }
+      }
+    },
+    {
+      "name": "windows-ninja-x64-release",
+      "binaryDir": "${sourceDir}/build",
+      "generator": "Ninja Multi-Config",
+      "cacheVariables": {
+        "CMAKE_CXX_COMPILER": "cl.exe",
+        "CMAKE_BUILD_TYPE": "Release",
+        "BOOST_INCLUDEDIR": "$env{BOOST}",
+        "BOOST_LIBRARYDIR": "$env{BOOST_LIB64}",
+        "QL_BUILD_EXAMPLES": false,
+        "QL_BUILD_TEST_SUITE": false,
+        "QL_BUILD_BENCHMARK": false,
+        "MSVC_LINK_DYNAMIC_RUNTIME": true,
+        "MSVC_WHOLE_PROGRAM_OPTIMIZATION": true,
+        "QL_ENABLE_SESSIONS": true,
         "ORE_BUILD_DOC": false
       },
       "architecture": {
@@ -45,7 +75,7 @@
         "QL_BUILD_BENCHMARK": false,
         "MSVC_LINK_DYNAMIC_RUNTIME": true,
         "MSVC_WHOLE_PROGRAM_OPTIMIZATION": true,
-        "ENABLE_SESSIONS": true,
+        "QL_ENABLE_SESSIONS": true,
         "ORE_BUILD_DOC": false
       },
       "architecture": {
@@ -73,7 +103,7 @@
         "QL_BUILD_BENCHMARK": false,
         "MSVC_LINK_DYNAMIC_RUNTIME": true,
         "MSVC_WHOLE_PROGRAM_OPTIMIZATION": false,
-        "ENABLE_SESSIONS": true,
+        "QL_ENABLE_SESSIONS": true,
         "ORE_BUILD_DOC": false
       },
       "architecture": {
@@ -101,7 +131,7 @@
         "QL_BUILD_BENCHMARK": false,
         "MSVC_LINK_DYNAMIC_RUNTIME": false,
         "MSVC_WHOLE_PROGRAM_OPTIMIZATION": true,
-        "ENABLE_SESSIONS": true,
+        "QL_ENABLE_SESSIONS": true,
         "ORE_BUILD_DOC": false
       },
       "architecture": {
@@ -119,6 +149,11 @@
     }
   ],
   "buildPresets": [
+    {
+      "name": "windows-ninja-x64-release",
+      "configurePreset": "windows-ninja-x64-release",
+      "configuration": "Release"
+    },
     {
       "name": "windows-ninja-x64-relWithDebInfo",
       "configurePreset": "windows-ninja-x64-relWithDebInfo",
@@ -129,6 +164,14 @@
       "configurePreset": "windows-ninja-x64-debug",
       "configuration": "Debug"
     },
+    {
+      "name": "windows-msvc-x64-release",
+      "configurePreset": "windows-msvc-x64",
+      "configuration": "Release",
+      "nativeToolOptions": [
+        "-m"
+      ]
+    },
     {
       "name": "windows-msvc-x64-relWithDebInfo",
       "configurePreset": "windows-msvc-x64",
@@ -145,6 +188,14 @@
         "-m"
       ]
     },
+    {
+      "name": "windows-msvc-x64-static-release",
+      "configurePreset": "windows-msvc-x64-static",
+      "configuration": "Release",
+      "nativeToolOptions": [
+        "-m"
+      ]
+    },
     {
       "name": "windows-msvc-x64-static-relWithDebInfo",
       "configurePreset": "windows-msvc-x64-static",

cmake/commonSettings.cmake

@@ -71,9 +71,6 @@ if(MSVC)
     add_compile_definitions(_SCL_SECURE_NO_DEPRECATE)
     add_compile_definitions(_CRT_SECURE_NO_DEPRECATE)
     add_compile_definitions(BOOST_ENABLE_ASSERT_HANDLER)
-    if(ENABLE_SESSIONS)
-        add_compile_definitions(QL_ENABLE_SESSIONS)
-    endif()
     add_compile_options(/bigobj)
     add_compile_options(/W3)
     #add_compile_options(/we4265) #no-virtual-destructor
@@ -90,6 +87,11 @@ if(MSVC)
 
     add_link_options(/LARGEADDRESSAWARE)
 
+    add_compile_options("$<$<CONFIG:Release>:/GF>")
+    add_compile_options("$<$<CONFIG:Release>:/Gy>")
+    add_compile_options("$<$<CONFIG:Release>:/Ot>")
+    add_compile_options("$<$<CONFIG:Release>:/GT>")
+
     add_compile_options("$<$<CONFIG:RelWithDebInfo>:/GF>")
     add_compile_options("$<$<CONFIG:RelWithDebInfo>:/Gy>")
     add_compile_options("$<$<CONFIG:RelWithDebInfo>:/GT>")