From 463c10f29efc6ef583b6eb3ed6117368eab9ccd9 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 1 Jan 2017 06:15:22 +0100 Subject: Revert "cmake: switch to using dynamically-linked CRT" This reverts commit 28d028d26abaaa5c6192624262811e2989de36de. --- CMakeLists.txt | 1 - cmake/msvc.cmake | 2 +- cmake/opentrack-win32-crt.cmake | 8 -------- 3 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 cmake/opentrack-win32-crt.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d7adeba..e3d12828 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,6 @@ include(opentrack-boilerplate) include(opentrack-version) include(opentrack-install) -include(opentrack-win32-crt) if(WIN32) enable_language(RC) diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake index 1c47d20d..e7e0ced3 100644 --- a/cmake/msvc.cmake +++ b/cmake/msvc.cmake @@ -43,7 +43,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "opentrack") set(cc "${cc} /GR-") endif() -set(silly "${warns_} /MD /Zi /Gm") +set(silly "${warns_} /MT /Zi /Gm") set(_CFLAGS "${silly}") set(_CXXFLAGS "${silly}") diff --git a/cmake/opentrack-win32-crt.cmake b/cmake/opentrack-win32-crt.cmake deleted file mode 100644 index 85348e89..00000000 --- a/cmake/opentrack-win32-crt.cmake +++ /dev/null @@ -1,8 +0,0 @@ -if(MSVC) - set(SDK_WIN32_CRT "" CACHE PATH "Path to dynamically linked CRT libraries") - if(SDK_WIN32_CRT) - file(GLOB crt-libs "${SDK_WIN32_CRT}/*.dll") - install(FILES ${crt-libs} DESTINATION . ${opentrack-perms}) - install(FILES "${SDK_WIN32_CRT}/LICENSE.TXT" RENAME "MSVCRT-LICENSE.txt" DESTINATION "./${opentrack-hier-doc}/3rdparty-notices") - endif() -endif() -- cgit v1.2.3