From 0f323589f9cd179b3902865e8d5476d84825b416 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Wed, 28 Feb 2018 07:10:35 +0100 Subject: [PATCH] New redist cmake stuff for MSVC --- CMakeLists.txt | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 79f59ce..b570b82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,20 @@ configure_file( "${PROJECT_BINARY_DIR}/config.h" ) +IF ( WIN32 ) + MESSAGE ( STATUS "Setting MSVC MT switches") + SET ( + CMAKE_C_FLAGS_DEBUG + "${CMAKE_CXX_FLAGS_DEBUG} /MTd" + CACHE STRING "MSVC MT flags " FORCE + ) + SET ( + CMAKE_C_FLAGS_RELEASE + "${CMAKE_CXX_FLAGS_RELEASE} /MT" + CACHE STRING "MSVC MT flags " FORCE + ) + ENDIF ( WIN32 ) + if (NOT PHYSFS_FOUND) add_subdirectory(physfs-3.0.1) include_directories( @@ -173,11 +187,9 @@ if (NOT CMAKE_BUILD_TYPE MATCHES Debug) ) endif (NOT CMAKE_BUILD_TYPE MATCHES Debug) -SET(CMAKE_INSTALL_OPENMP_LIBRARIES TRUE) -SET(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE) SET(CMAKE_INSTALL_UCRT_LIBRARIES TRUE) -SET(CMAKE_INSTALL_MFC_LIBRARIES TRUE) -SET(CMAKE_INSTALL_OPENMP_LIBRARIES TRUE) +SET(CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT "Release") +SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ".") SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${CMAKE_SOURCE_DIR}/bin/libFLAC-8.dll ${CMAKE_SOURCE_DIR}/bin/libfreetype-6.dll @@ -192,9 +204,7 @@ SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${CMAKE_SOURCE_DIR}/bin/SDL2_image.dll ${CMAKE_SOURCE_DIR}/bin/SDL2_mixer.dll ${CMAKE_SOURCE_DIR}/bin/SDL2_ttf.dll - ${CMAKE_SOURCE_DIR}/bin/ucrtbased.dll ${CMAKE_SOURCE_DIR}/bin/zlib1.dll - ${CMAKE_SOURCE_DIR}/bin/vcruntime140d.dll ) include(InstallRequiredSystemLibraries)