diff --git a/CMakeLists.txt b/CMakeLists.txt index 9754d35..2b53eb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,6 +112,8 @@ set_cache(BUILD "" STRING if (BUILD) if (BUILD STREQUAL all) set(MP_MODULES all) + elseif (BUILD STREQUAL no) + set(MP_MODULES) else () string(REGEX MATCHALL "[^,]+" MP_MODULES "${BUILD}") endif () @@ -268,7 +270,7 @@ function (add_mp_library name) add_dependencies(${name} ${add_mp_library_DEPENDS}) endif () # Add library linked with dynamic runtime. - if (MSVC) + if (0) add_library(${name}-dynrt ${libtype} EXCLUDE_FROM_ALL ${add_mp_library_UNPARSED_ARGUMENTS} ${dynrt-objects}) target_compile_options(${name}-dynrt PUBLIC /MD$<$:d>) diff --git a/include/mp/format.h b/include/mp/format.h index 8320f8a..0314973 100644 --- a/include/mp/format.h +++ b/include/mp/format.h @@ -40,7 +40,7 @@ #include #include -#ifdef _SECURE_SCL +#if defined(_SECURE_SCL) && defined(_MSC_VER) && _MSC_VER < 1951 # define FMT_SECURE_SCL _SECURE_SCL #else # define FMT_SECURE_SCL 0