Skip to content

GitLab

"...composable_kernel.git" did not exist on "ac6d68b3536fe9f7e563e4903733b377aaa9013f"
Commit a8ba6a8d authored by Mike Egger's avatar Mike Egger Committed by Jesse Beder
Browse files

Adapt label postfix to fix build with Visual Studio (#782)

parent 14c87258
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
CMakeLists.txt
View file @ a8ba6a8d
...@@ -25,8 +25,10 @@ cmake_dependent_option(YAML_MSVC_SHARED_RT ...@@ -25,8 +25,10 @@ cmake_dependent_option(YAML_MSVC_SHARED_RT
"MSVC" OFF) "MSVC" OFF)
set(yaml-cpp-type STATIC) set(yaml-cpp-type STATIC)
set(yaml-cpp-label-postfix "static")
if (YAML_BUILD_SHARED_LIBS) if (YAML_BUILD_SHARED_LIBS)
set(yaml-cpp-type SHARED) set(yaml-cpp-type SHARED)
set(yaml-cpp-label-postfix "shared")
endif() endif()
set(build-shared $<BOOL:${YAML_BUILD_SHARED_LIBS}>) set(build-shared $<BOOL:${YAML_BUILD_SHARED_LIBS}>)
...@@ -110,7 +112,7 @@ target_sources(yaml-cpp ...@@ -110,7 +112,7 @@ target_sources(yaml-cpp
set_target_properties(yaml-cpp PROPERTIES set_target_properties(yaml-cpp PROPERTIES
VERSION "${PROJECT_VERSION}" VERSION "${PROJECT_VERSION}"
SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}" SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
PROJECT_LABEL "yaml-cpp $<IF:${build-shared},shared,static>" PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}"
DEBUG_POSTFIX d) DEBUG_POSTFIX d)
configure_package_config_file( configure_package_config_file(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment