mirror of https://github.com/Chlumsky/msdfgen.git
Minor CMake adjustment #191
This commit is contained in:
parent
f12d7ca000
commit
51f6b5b053
|
|
@ -23,16 +23,6 @@ if(NOT MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE)
|
||||||
set(CMAKE_BUILD_TYPE Release)
|
set(CMAKE_BUILD_TYPE Release)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(MSDFGEN_DYNAMIC_RUNTIME)
|
|
||||||
set(MSDFGEN_MSVC_RUNTIME "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
|
|
||||||
else()
|
|
||||||
set(MSDFGEN_MSVC_RUNTIME "MultiThreaded$<$<CONFIG:Debug>:Debug>")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(BUILD_SHARED_LIBS)
|
|
||||||
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(MSDFGEN_USE_VCPKG)
|
if(MSDFGEN_USE_VCPKG)
|
||||||
# Make sure that vcpkg toolchain file is set
|
# Make sure that vcpkg toolchain file is set
|
||||||
if(NOT CMAKE_TOOLCHAIN_FILE)
|
if(NOT CMAKE_TOOLCHAIN_FILE)
|
||||||
|
|
@ -77,6 +67,16 @@ endif()
|
||||||
# Version is specified in vcpkg.json
|
# Version is specified in vcpkg.json
|
||||||
project(msdfgen VERSION ${MSDFGEN_VERSION} LANGUAGES CXX)
|
project(msdfgen VERSION ${MSDFGEN_VERSION} LANGUAGES CXX)
|
||||||
|
|
||||||
|
if(MSDFGEN_DYNAMIC_RUNTIME)
|
||||||
|
set(MSDFGEN_MSVC_RUNTIME "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
|
||||||
|
else()
|
||||||
|
set(MSDFGEN_MSVC_RUNTIME "MultiThreaded$<$<CONFIG:Debug>:Debug>")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(BUILD_SHARED_LIBS)
|
||||||
|
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(MAX_WARNING_LEVEL)
|
if(MAX_WARNING_LEVEL)
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
add_compile_options(/W4)
|
add_compile_options(/W4)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue