Merge remote-tracking branch 'upstream/master' into folly_executor

.jenkins/Jenkinsfile

@@ -57,10 +57,10 @@ pipeline {
 
         stage("Compile") {
             steps {
-                sh "conan create ${BUILD_MISSING} -pr debug -o ${PROJECT}:sanitize=True -o ${PROJECT}:testing=full . ${PROJECT}/${TAG} ; \
-                    conan create ${BUILD_MISSING} -pr debug -o ${PROJECT}:testing=full . ${PROJECT}/${TAG} ; \
-                    conan create ${BUILD_MISSING} -pr test -o sisl:malloc_impl=tcmalloc -o ${PROJECT}:testing=full . ${PROJECT}/${TAG} ; \
-                    conan create ${BUILD_MISSING} -pr test -o sisl:prerelease=True -o sisl:malloc_impl=tcmalloc -o ${PROJECT}:testing=full . ${PROJECT}/${TAG} ; \
+                sh "conan create ${BUILD_MISSING} -pr debug -o ${PROJECT}:sanitize=True . ${PROJECT}/${TAG} ; \
+                    conan create ${BUILD_MISSING} -pr debug . ${PROJECT}/${TAG} ; \
+                    conan create ${BUILD_MISSING} -pr test -o sisl:malloc_impl=tcmalloc . ${PROJECT}/${TAG} ; \
+                    conan create ${BUILD_MISSING} -pr test -o sisl:prerelease=True -o sisl:malloc_impl=tcmalloc . ${PROJECT}/${TAG} ; \
                     "
             }
         }

CMakeLists.txt

@@ -12,13 +12,11 @@ else()
     message(WARNING "Conan Build file does not exist, trying to build without!")
 endif()
 
-if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-    include (cmake/debug_flags.cmake)
-else()
-    if((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") OR (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")) 
-        remove_flag("-O[0-4]")
-        add_flags("-O2")
-    endif()
+if (DEFINED BUILD_COVERAGE)
+  if (${BUILD_COVERAGE})
+    include (cmake/CodeCoverage.cmake)
+    APPEND_COVERAGE_COMPILER_FLAGS()
+  endif ()
 endif()
 
 if (DEFINED MEMORY_SANITIZER_ON AND ${MEMORY_SANITIZER_ON})

conanfile.py

@@ -67,7 +67,7 @@ def requirements(self):
         self.requires("pistache/0.0.5")
         self.requires("zmarok-semver/1.1.0")
         self.requires("openssl/3.1.1", override=True)
-        self.requires("libcurl/8.0.1", override=True)
+        self.requires("libcurl/8.2.1", override=True)
 
     def build(self):
         cmake = CMake(self)