From: Matt Davis Date: Mon, 4 Mar 2019 16:03:10 +0000 (-0800) Subject: Merge pull request #136 from nitzmahone/win_fixes X-Git-Tag: upstream/0.2.2^2~2 X-Git-Url: http://andersk.mit.edu/gitweb/libyaml.git/commitdiff_plain/e7a5f0bc0b4e5b51b90d8a31e7382f6a4479f57d?hp=78e6ebfb20241a11eb9187c0f30b8892fb5e6862 Merge pull request #136 from nitzmahone/win_fixes allow override of Windows static lib name --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 1abdd77..e00193e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,7 @@ set (YAML_VERSION_PATCH 7) set (YAML_VERSION_STRING "${YAML_VERSION_MAJOR}.${YAML_VERSION_MINOR}.${YAML_VERSION_PATCH}") option(BUILD_SHARED_LIBS "Build libyaml as a shared library" OFF) +option(YAML_STATIC_LIB_NAME "base name of static library output" yaml) # # Output directories for a build tree @@ -56,8 +57,8 @@ add_library(yaml ${SRCS}) if(NOT BUILD_SHARED_LIBS) set_target_properties(yaml - PROPERTIES OUTPUT_NAME yaml_static - ) + PROPERTIES OUTPUT_NAME ${YAML_STATIC_LIB_NAME} + ) endif() set_target_properties(yaml