diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index dd5380cf59..fe609645a0 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -18,7 +18,7 @@ concurrency: # This part of Conan configuration is specific to this workflow only; we do not want # to pollute conan/profiles directory with settings which might not work for others env: - #CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/dev + CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/dev CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }} CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }} CONAN_GLOBAL_CONF: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f148fb190b..84c55de8de 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -21,7 +21,7 @@ concurrency: # This part of Conan configuration is specific to this workflow only; we do not want # to pollute conan/profiles directory with settings which might not work for others env: - #CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/dev + CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/dev CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }} CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }} CONAN_GLOBAL_CONF: | diff --git a/cmake/RippledCompiler.cmake b/cmake/RippledCompiler.cmake index 7485605d95..ac631c910f 100644 --- a/cmake/RippledCompiler.cmake +++ b/cmake/RippledCompiler.cmake @@ -69,9 +69,9 @@ if (MSVC) -GS -Zc:forScope > - # static runtime - $<$:-MTd> - $<$>:-MT> + # dynamic runtime + $<$:-MDd> + $<$>:-MD> $<$:-WX> ) target_compile_definitions (common diff --git a/conan/profiles/default b/conan/profiles/default index 3a7bcda1c6..8868b8a57f 100644 --- a/conan/profiles/default +++ b/conan/profiles/default @@ -14,7 +14,7 @@ compiler={{compiler}} compiler.version={{ compiler_version }} compiler.cppstd=20 {% if os == "Windows" %} -compiler.runtime=static +compiler.runtime=dynamic {% else %} compiler.libcxx={{detect_api.detect_libcxx(compiler, version, compiler_exe)}} {% endif %}