summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2017-10-13 15:05:15 +0200
committerStanislaw Halik <sthalik@misaki.pl>2017-10-13 15:09:27 +0200
commit98cb8723dcfbe27b9058cc21605f5a663d743bfe (patch)
treedf70e2e5f46234cd2e2fdb1b1bc3903baaa8af76
parent9a0822c445e56580fb3034224191ec825ea0274a (diff)
cmake/msvc: fix
-rw-r--r--cmake/msvc.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake
index aed0fcd9..c8edd1fd 100644
--- a/cmake/msvc.cmake
+++ b/cmake/msvc.cmake
@@ -19,7 +19,7 @@ set(cc "${cc} -bigobj")
set(warns_ "")
-set(warns-disable 4530 4577 4789 4244 4702 4530 4244 4127 4458 4456 4251)
+set(warns-disable 4530 4577 4789 4244 4702 4530 4244 4127 4458 4456 4251 4100)
foreach(i ${warns-disable})
set(warns_ "${warns_} -wd${i}")
@@ -69,9 +69,9 @@ if(NOT __otr_already_initialized OR "$ENV{OTR_REDO}")
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "" FORCE)
set(CMAKE_BUILD_TYPE "RELEASE" CACHE STRING "" FORCE)
- set(CMAKE_STATIC_LINKER_FLAGS "${_LDFLAGS_STATIC} ${CMAKE_STATIC_LINKER_FLAGS}" CACHE STRING "" FORCE)
- set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${_LDFLAGS_STATIC_RELEASE} ${CMAKE_STATIC_LINKER_FLAGS_RELEASE}" CACHE STRING "" FORCE)
- set(CMAKE_STATIC_LINKER_FLAGS_DEBUG "${_LDFLAGS_STATIC_DEBUG} ${CMAKE_STATIC_LINKER_FLAGS_DEBUG}" CACHE STRING "" FORCE)
+ set(CMAKE_STATIC_LINKER_FLAGS "${_LDFLAGS_STATIC}" CACHE STRING "" FORCE)
+ set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${_LDFLAGS_STATIC_RELEASE}" CACHE STRING "" FORCE)
+ set(CMAKE_STATIC_LINKER_FLAGS_DEBUG "${_LDFLAGS_STATIC_DEBUG}" CACHE STRING "" FORCE)
foreach(j C CXX)
foreach(i "" _DEBUG _RELEASE)