mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-15 16:18:22 +01:00
updated for CLR on VS2010
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9359 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
parent
21b38a9779
commit
613c643952
@ -268,16 +268,14 @@ if (MSVC AND BUILD_SHARED_LIBS AND BUILD_CLR_LIBS)
|
||||
STRING(REPLACE " /EHsc" " /EHa /clr" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
|
||||
# Remove /RTC1 from CMAKE_CXX_FLAGS_DEBUG
|
||||
STRING(REPLACE " /RTC1" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
|
||||
ADD_DEFINITIONS(-DMULTICHART)
|
||||
endif()
|
||||
|
||||
if (BUILD_CLR_LIBS AND MSVC AND MSVC_VERSION < 1600)
|
||||
message(FATAL_ERROR "CLR options must be set manually for Visual Studio versions prior to 2010")
|
||||
endif()
|
||||
|
||||
if (MSVC10)
|
||||
# turn off warnings on VS2010
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4793 /wd4945")
|
||||
if (MSVC10)
|
||||
# turn off warnings on VS2010
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4793 /wd4945")
|
||||
endif()
|
||||
if (MSVC_VERSION LESS 1600)
|
||||
message(FATAL_ERROR "CLR options must be set manually for versions prior to Visual Studio 2010")
|
||||
endif()
|
||||
ADD_DEFINITIONS(-DMULTICHART)
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user