max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Display error message if CLR and MSVC < 2010

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9354 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2015-03-12 22:55:16 +00:00
parent 9d4836d413
commit bae6f83b59
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -234,11 +234,13 @@ include_directories("${PROJECT_SOURCE_DIR}/src/phreeqcpp")
include_directories("${PROJECT_SOURCE_DIR}/src/phreeqcpp/PhreeqcKeywords") include_directories("${PROJECT_SOURCE_DIR}/src/phreeqcpp/PhreeqcKeywords")
OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" OFF) OPTION(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
SET(LIB_TYPE STATIC) SET(LIB_TYPE STATIC)
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
SET(LIB_TYPE SHARED) SET(LIB_TYPE SHARED)
OPTION (BUILD_CLR_LIBS "Build CLR Libraries" OFF) if (MSVC)
OPTION(BUILD_CLR_LIBS "Build CLR Libraries" OFF)
endif()
endif() endif()
add_library(IPhreeqc ${LIB_TYPE} ${IPhreeqc_SOURCES}) add_library(IPhreeqc ${LIB_TYPE} ${IPhreeqc_SOURCES})
set_target_properties(IPhreeqc PROPERTIES DEBUG_POSTFIX "d") set_target_properties(IPhreeqc PROPERTIES DEBUG_POSTFIX "d")
@ -269,6 +271,10 @@ if (MSVC AND BUILD_SHARED_LIBS AND BUILD_CLR_LIBS)
ADD_DEFINITIONS(-DMULTICHART) ADD_DEFINITIONS(-DMULTICHART)
endif() 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) if (MSVC10)
# turn off warnings on VS2010 # turn off warnings on VS2010
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4793 /wd4945") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4793 /wd4945")