diff --git a/CMakeLists.txt b/CMakeLists.txt index f2874762..f02ec661 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,7 +124,7 @@ if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO) list(APPEND SPDLOG_SRCS src/fmt.cpp) endif() -if(SPDLOG_BUILD_SHARED) +if(SPDLOG_BUILD_SHARED OR BUILD_SHARED_LIBS) if(WIN32) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY) list(APPEND SPDLOG_SRCS ${CMAKE_CURRENT_BINARY_DIR}/version.rc) diff --git a/appveyor.yml b/appveyor.yml index c7b12bae..66ea5639 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,51 +4,51 @@ environment: matrix: - GENERATOR: '"Visual Studio 14 2015"' BUILD_TYPE: Debug + BUILD_SHARED: 'OFF' WCHAR: 'OFF' WCHAR_FILES: 'OFF' - BUILD_SHARED: 'OFF' BUILD_EXAMPLE: 'ON' - GENERATOR: '"Visual Studio 14 2015"' BUILD_TYPE: Release + BUILD_SHARED: 'OFF' WCHAR: 'ON' WCHAR_FILES: 'OFF' - BUILD_SHARED: 'OFF' BUILD_EXAMPLE: 'ON' - GENERATOR: '"Visual Studio 14 2015 Win64"' BUILD_TYPE: Debug + BUILD_SHARED: 'OFF' WCHAR: 'ON' WCHAR_FILES: 'OFF' - BUILD_SHARED: 'OFF' BUILD_EXAMPLE: 'ON' - GENERATOR: '"Visual Studio 14 2015 Win64"' BUILD_TYPE: Release + BUILD_SHARED: 'OFF' WCHAR: 'ON' WCHAR_FILES: 'OFF' - BUILD_SHARED: 'OFF' BUILD_EXAMPLE: 'ON' - GENERATOR: '"Visual Studio 15 2017 Win64"' BUILD_TYPE: Debug + BUILD_SHARED: 'OFF' WCHAR: 'ON' WCHAR_FILES: 'OFF' - BUILD_SHARED: 'OFF' BUILD_EXAMPLE: 'ON' - GENERATOR: '"Visual Studio 15 2017 Win64"' BUILD_TYPE: Release + BUILD_SHARED: 'OFF' WCHAR: 'OFF' WCHAR_FILES: 'OFF' - BUILD_SHARED: 'OFF' BUILD_EXAMPLE: 'ON' - GENERATOR: '"Visual Studio 15 2017 Win64"' BUILD_TYPE: Release - WCHAR: 'OFF' - WCHAR_FILES: 'OFF' BUILD_SHARED: 'ON' + WCHAR: 'OFF' + WCHAR_FILES: 'OFF' BUILD_EXAMPLE: 'ON' - GENERATOR: '"Visual Studio 15 2017 Win64"' BUILD_TYPE: Release + BUILD_SHARED: 'ON' WCHAR: 'ON' WCHAR_FILES: 'ON' - BUILD_SHARED: 'ON' BUILD_EXAMPLE: 'OFF' build_script: - cmd: >- @@ -60,7 +60,7 @@ build_script: set PATH=%PATH%;C:\Program Files\Git\usr\bin - cmake .. -G %GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DSPDLOG_WCHAR_SUPPORT=%WCHAR% -DSPDLOG_WCHAR_FILENAMES=%WCHAR_FILES% -DSPDLOG_BUILD_SHARED=%BUILD_SHARED% -DSPDLOG_BUILD_EXAMPLE=%BUILD_EXAMPLE% -DSPDLOG_BUILD_EXAMPLE_HO=%BUILD_EXAMPLE% -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_TESTS_HO=OFF -DSPDLOG_BUILD_WARNINGS=ON + cmake -G %GENERATOR% -D CMAKE_BUILD_TYPE=%BUILD_TYPE% -D BUILD_SHARED_LIBS=%BUILD_SHARED% -D SPDLOG_WCHAR_SUPPORT=%WCHAR% -D SPDLOG_WCHAR_FILENAMES=%WCHAR_FILES% -D SPDLOG_BUILD_EXAMPLE=%BUILD_EXAMPLE% -D SPDLOG_BUILD_EXAMPLE_HO=%BUILD_EXAMPLE% -D SPDLOG_BUILD_TESTS=ON -D SPDLOG_BUILD_TESTS_HO=OFF -D SPDLOG_BUILD_WARNINGS=ON .. cmake --build . --config %BUILD_TYPE%