reverse + reproducibility

Signed-off-by: Martijn Govers <Martijn.Govers@Alliander.com>

Author: mgovers

CMakePresets.json

@@ -17,9 +17,11 @@
         "PLATFORM_LINKER_FLAGS": "",
         "COMPILER_C_FLAGS": "",
         "COMPILER_CXX_FLAGS": "$env{COMPILER_C_FLAGS}",
-        "CFLAGS": "$penv{CFLAGS} $env{PLATFORM_C_FLAGS} $env{COMPILER_C_FLAGS} $env{COVERAGE_FLAGS} $env{SANITIZER_FLAGS}",
-        "CXXFLAGS": "$penv{CXXFLAGS} $env{PLATFORM_CXX_FLAGS} $env{COMPILER_CXX_FLAGS} $env{COVERAGE_FLAGS} $env{SANITIZER_FLAGS}",
-        "LDFLAGS": "$env{PLATFORM_LINKER_FLAGS} $env{SANITIZER_FLAGS}"
+        "REPRODUCIBILITY_COMMON_FLAGS": "",
+        "REPRODUCIBILITY_LINKER_FLAGS": "",
+        "CFLAGS": "$penv{CFLAGS} $env{PLATFORM_C_FLAGS} $env{COMPILER_C_FLAGS} $env{COVERAGE_FLAGS} $env{SANITIZER_FLAGS}`$env{REPRODUCIBILITY_COMMON_FLAGS}",
+        "CXXFLAGS": "$penv{CXXFLAGS} $env{PLATFORM_CXX_FLAGS} $env{COMPILER_CXX_FLAGS} $env{COVERAGE_FLAGS} $env{SANITIZER_FLAGS} $env{REPRODUCIBILITY_COMMON_FLAGS}",
+        "LDFLAGS": "$env{PLATFORM_LINKER_FLAGS} $env{SANITIZER_FLAGS} $env{REPRODUCIBILITY_LINKER_FLAGS} $env{REPRODUCIBILITY_LINKER_FLAGS}"
       },
       "architecture": {
         "value": "x64",
@@ -302,7 +304,7 @@
       "name": "ci-msvc-reproducible",
       "inherits": "msvc-release",
       "environment": {
-        "SANITIZER_FLAGS": "/d1nodatetime /experimental:deterministic"
+        "REPRODUCIBILITY_COMMON_FLAGS": "/d1nodatetime /experimental:deterministic"
       },
       "cacheVariables": {
         "PGM_ENABLE_DEV_BUILD": "OFF",
@@ -321,7 +323,7 @@
       "name": "ci-gcc-reproducible",
       "inherits": "gcc-release",
       "environment": {
-        "SANITIZER_FLAGS": "$penv{SANITIZER_FLAGS} -frandom-seed=0 -Wdate-time"
+        "REPRODUCIBILITY_COMMON_FLAGS": "$penv{REPRODUCIBILITY_COMMON_FLAGS} -frandom-seed=0 -Wdate-time"
       },
       "cacheVariables": {
         "PGM_ENABLE_DEV_BUILD": "OFF"
@@ -331,7 +333,7 @@
       "name": "ci-clang-reproducible",
       "inherits": "clang-release",
       "environment": {
-        "SANITIZER_FLAGS": "$penv{SANITIZER_FLAGS} -frandom-seed=0 -Wdate-time"
+        "REPRODUCIBILITY_COMMON_FLAGS": "$penv{REPRODUCIBILITY_COMMON_FLAGS} -frandom-seed=0 -Wdate-time"
       },
       "cacheVariables": {
         "PGM_ENABLE_DEV_BUILD": "OFF"
@@ -342,10 +344,8 @@
       "inherits": "ci-clang-reproducible",
       "environment": {
         "SOURCE_DATE_EPOCH": "1",
-        "DSYMUTIL": ""
-      },
-      "cacheVariables": {
-        "CMAKE_SHARED_LINKER_FLAGS": "-reproducible -no_uuid -S"
+        "DSYMUTIL": "",
+        "REPRODUCIBILITY_LINKER_FLAGS": "-Wl,-no_uuid -Wl,-S"
       }
     }
   ],