From a708cebadbe1e8b97c00bf69f7eedae908ff7d91 Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Mon, 26 May 2025 15:19:59 +0300 Subject: [PATCH] - fix Windows build --- CMakeLists.txt | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ef39e5..35ea343 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,4 @@ -# 3.5 is actually available almost everywhere, but this a good minimum -cmake_minimum_required(VERSION 3.4) +cmake_minimum_required(VERSION 3.20) # enable MSVC_RUNTIME_LIBRARY target property # see https://cmake.org/cmake/help/latest/policy/CMP0091.html @@ -17,19 +16,13 @@ include(CTest) find_program(YAML_CPP_CLANG_FORMAT_EXE NAMES clang-format) -option(YAML_CPP_BUILD_CONTRIB "Enable yaml-cpp contrib in library" ON) -option(YAML_CPP_BUILD_TOOLS "Enable parse tools" ON) -option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ${BUILD_SHARED_LIBS}) +option(YAML_CPP_BUILD_CONTRIB "Enable yaml-cpp contrib in library" OFF) +option(YAML_CPP_BUILD_TOOLS "Enable parse tools" OFF) +option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" OFF) -cmake_dependent_option(YAML_CPP_BUILD_TESTS - "Enable yaml-cpp tests" ON - "BUILD_TESTING;CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR" OFF) -cmake_dependent_option(YAML_CPP_INSTALL - "Enable generation of yaml-cpp install targets" ON - "CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR" OFF) -cmake_dependent_option(YAML_MSVC_SHARED_RT - "MSVC: Build yaml-cpp with shared runtime libs (/MD)" ON - "MSVC" OFF) +option(YAML_CPP_BUILD_TESTS "Enable yaml-cpp tests" OFF) +option(YAML_CPP_INSTALL "Enable generation of yaml-cpp install targets" OFF) +option(YAML_MSVC_SHARED_RT "MSVC: Build yaml-cpp with shared runtime libs (/MD)" OFF) set(yaml-cpp-type STATIC) set(yaml-cpp-label-postfix "static") @@ -158,13 +151,13 @@ if (YAML_CPP_INSTALL) DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) endif() -if(YAML_CPP_BUILD_TESTS) - add_subdirectory(test) -endif() - -if(YAML_CPP_BUILD_TOOLS) - add_subdirectory(util) -endif() +#if(YAML_CPP_BUILD_TESTS) +# add_subdirectory(test) +#endif() +# +#if(YAML_CPP_BUILD_TOOLS) +# add_subdirectory(util) +#endif() if (YAML_CPP_CLANG_FORMAT_EXE) add_custom_target(format @@ -173,3 +166,6 @@ if (YAML_CPP_CLANG_FORMAT_EXE) COMMENT "Running clang-format" VERBATIM) endif() + +set_property(TARGET yaml-cpp PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +