mirror of
https://github.com/gabime/spdlog.git
synced 2025-01-28 00:10:21 +08:00
Fix cmake for msvc
This commit is contained in:
parent
8c3ff3a0c4
commit
306ddde049
@ -34,10 +34,6 @@ elseif(CMAKE_CXX_STANDARD LESS 17)
|
|||||||
endif()
|
endif()
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
|
||||||
# make sure __cplusplus is defined when using msvc and enable parallel build
|
|
||||||
if(MSVC)
|
|
||||||
string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus /MP")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
|
|
||||||
@ -129,14 +125,20 @@ if(SPDLOG_BUILD_SHARED)
|
|||||||
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# place dlls in the same directory as the executables on msvc
|
if(MSVC)
|
||||||
if(BUILD_SHARED_LIBS AND MSVC)
|
# place dlls and libs and executables in the same directory
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/$<CONFIG>)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/$<CONFIG>)
|
||||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/$<CONFIG>)
|
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/$<CONFIG>)
|
||||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/$<CONFIG>)
|
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/$<CONFIG>)
|
||||||
set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/$<CONFIG>)
|
set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/$<CONFIG>)
|
||||||
|
|
||||||
|
# make sure __cplusplus is defined
|
||||||
|
add_compile_options(/Zc:__cplusplus)
|
||||||
|
# enable parallel build for the solution
|
||||||
|
add_compile_options(/MP)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
message(STATUS "spdlog version: ${SPDLOG_VERSION}")
|
message(STATUS "spdlog version: ${SPDLOG_VERSION}")
|
||||||
message(STATUS "spdlog build type: " ${CMAKE_BUILD_TYPE})
|
message(STATUS "spdlog build type: " ${CMAKE_BUILD_TYPE})
|
||||||
message(STATUS "spdlog build shared: " ${BUILD_SHARED_LIBS})
|
message(STATUS "spdlog build shared: " ${BUILD_SHARED_LIBS})
|
||||||
|
Loading…
Reference in New Issue
Block a user