From a4653c1b19ae362d9183694c084572d3c12fbf3c Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Fri, 3 Apr 2015 08:43:18 +0000 Subject: [PATCH] working cmake build git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9465 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- CMakeLists.txt | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a13a3af..21d88b4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,12 +38,13 @@ endif() # Disable deprecation warnings for standard C and STL functions in VS2005 # and later -IF(MSVC_VERSION EQUAL 1400 OR MSVC_VERSION GREATER 1400) - ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) - ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS) -ENDIF(MSVC_VERSION EQUAL 1400 OR MSVC_VERSION GREATER 1400) -ADD_DEFINITIONS(-DSWIG_SHARED_OBJ) -ADD_DEFINITIONS(-DUSE_PHRQ_ALLOC) +if(MSVC_VERSION EQUAL 1400 OR MSVC_VERSION GREATER 1400) + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) + add_definitions(-D_SCL_SECURE_NO_WARNINGS) +endif(MSVC_VERSION EQUAL 1400 OR MSVC_VERSION GREATER 1400) + +add_definitions(-DSWIG_SHARED_OBJ) +add_definitions(-DUSE_PHRQ_ALLOC) SET(IPhreeqc_SOURCES @@ -222,13 +223,16 @@ include_directories("${PROJECT_SOURCE_DIR}/src/phreeqcpp") include_directories("${PROJECT_SOURCE_DIR}/src/phreeqcpp/PhreeqcKeywords") -OPTION(BUILD_SHARED_LIBS "Build Shared Libraries" OFF) -SET(LIB_TYPE STATIC) +if (STANDALONE_BUILD EQUAL 1) + option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF) + set(LIB_TYPE STATIC) +endif() + if (BUILD_SHARED_LIBS) - SET(LIB_TYPE SHARED) + set(LIB_TYPE SHARED) if (STANDALONE_BUILD EQUAL 1) if (MSVC) - OPTION(BUILD_CLR_LIBS "Build CLR Libraries" OFF) + option(BUILD_CLR_LIBS "Build CLR Libraries" OFF) endif() endif() endif()