From 9d4836d413fbd83f9a45c53960edbb52a54c469a Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Thu, 12 Mar 2015 22:26:17 +0000 Subject: [PATCH] minor cleanup git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9353 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- CMakeLists.txt | 286 ++----------------------------------------------- 1 file changed, 11 insertions(+), 275 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2271e766..198735e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,5 @@ cmake_minimum_required (VERSION 2.8.11) - ##include(CheckLanguage) ##check_language(Fortran) ##if (CMAKE_Fortran_COMPILER) @@ -51,279 +50,6 @@ ADD_DEFINITIONS(-DSWIG_SHARED_OBJ) ADD_DEFINITIONS(-DUSE_PHRQ_ALLOC) -### Copy Release to openmp -##SET(CMAKE_CXX_FLAGS_OPENMP -## ${CMAKE_CXX_FLAGS_RELEASE} CACHE STRING -## "Flags used by the C++ compiler during openmp builds." -## FORCE) -##SET(CMAKE_C_FLAGS_OPENMP -## ${CMAKE_C_FLAGS_RELEASE} CACHE STRING -## "Flags used by the C compiler during openmp builds." -## FORCE) -##if (PHREEQCRM_BUILD_FORTRAN) -## SET(CMAKE_Fortran_FLAGS_OPENMP -## ${CMAKE_Fortran_FLAGS_RELEASE} CACHE STRING -## "Flags used by the Fortran compiler during openmp builds." -## FORCE) -##endif () -##SET(CMAKE_EXE_LINKER_FLAGS_OPENMP -## ${CMAKE_EXE_LINKER_FLAGS_RELEASE} CACHE STRING -## "Flags used for linking binaries during openmp builds." -## FORCE) -##SET(CMAKE_SHARED_LINKER_FLAGS_OPENMP -## ${CMAKE_SHARED_LINKER_FLAGS_RELEASE} CACHE STRING -## "Flags used by the shared libraries linker during openmp builds." -## FORCE) -##MARK_AS_ADVANCED( -## CMAKE_CXX_FLAGS_OPENMP -## CMAKE_C_FLAGS_OPENMP -## CMAKE_EXE_LINKER_FLAGS_OPENMP -## CMAKE_SHARED_LINKER_FLAGS_OPENMP) -##if (PHREEQCRM_BUILD_FORTRAN) -## MARK_AS_ADVANCED(CMAKE_Fortran_FLAGS_OPENMP) -##endif() - - -### Copy Debug to openmp_debug -##SET(CMAKE_CXX_FLAGS_OPENMP_DEBUG -## ${CMAKE_CXX_FLAGS_DEBUG} CACHE STRING -## "Flags used by the C++ compiler during debug openmp builds." -## FORCE) -##SET(CMAKE_C_FLAGS_OPENMP_DEBUG -## ${CMAKE_C_FLAGS_DEBUG} CACHE STRING -## "Flags used by the C compiler during debug openmp builds." -## FORCE) -##if (PHREEQCRM_BUILD_FORTRAN) -## SET(CMAKE_Fortran_FLAGS_OPENMP_DEBUG -## ${CMAKE_Fortran_FLAGS_DEBUG} CACHE STRING -## "Flags used by the Fortran compiler during debug openmp builds." -## FORCE) -##endif () -##SET(CMAKE_EXE_LINKER_FLAGS_OPENMP_DEBUG -## ${CMAKE_EXE_LINKER_FLAGS_DEBUG} CACHE STRING -## "Flags used for linking binaries during debug openmp builds." -## FORCE) -##SET(CMAKE_SHARED_LINKER_FLAGS_OPENMP_DEBUG -## ${CMAKE_SHARED_LINKER_FLAGS_DEBUG} CACHE STRING -## "Flags used by the shared libraries linker during debug openmp builds." -## FORCE) -##MARK_AS_ADVANCED( -## CMAKE_CXX_FLAGS_OPENMP_DEBUG -## CMAKE_C_FLAGS_OPENMP_DEBUG -## CMAKE_EXE_LINKER_FLAGS_OPENMP_DEBUG -## CMAKE_SHARED_LINKER_FLAGS_OPENMP_DEBUG) -##if (PHREEQCRM_BUILD_FORTRAN) -## MARK_AS_ADVANCED(CMAKE_Fortran_FLAGS_OPENMP_DEBUG) -##endif() - - -### Copy Release to mpi -##SET(CMAKE_CXX_FLAGS_MPI -## ${CMAKE_CXX_FLAGS_RELEASE} CACHE STRING -## "Flags used by the C++ compiler during mpi builds." -## FORCE) -##SET(CMAKE_C_FLAGS_MPI -## ${CMAKE_C_FLAGS_RELEASE} CACHE STRING -## "Flags used by the C compiler during mpi builds." -## FORCE) -##if (PHREEQCRM_BUILD_FORTRAN) -## SET(CMAKE_Fortran_FLAGS_MPI -## ${CMAKE_Fortran_FLAGS_RELEASE} CACHE STRING -## "Flags used by the Fortran compiler during mpi builds." -## FORCE) -##endif () -##SET(CMAKE_EXE_LINKER_FLAGS_MPI -## ${CMAKE_EXE_LINKER_FLAGS_RELEASE} CACHE STRING -## "Flags used for linking binaries during mpi builds." -## FORCE) -##SET(CMAKE_SHARED_LINKER_FLAGS_MPI -## ${CMAKE_SHARED_LINKER_FLAGS_RELEASE} CACHE STRING -## "Flags used by the shared libraries linker during mpi builds." -## FORCE) -##MARK_AS_ADVANCED( -## CMAKE_CXX_FLAGS_MPI -## CMAKE_C_FLAGS_MPI -## CMAKE_EXE_LINKER_FLAGS_MPI -## CMAKE_SHARED_LINKER_FLAGS_MPI) -##if (PHREEQCRM_BUILD_FORTRAN) -## MARK_AS_ADVANCED(CMAKE_Fortran_FLAGS_MPI) -##endif() - - -### Copy Debug to mpi_debug -##SET(CMAKE_CXX_FLAGS_MPI_DEBUG -## ${CMAKE_CXX_FLAGS_DEBUG} CACHE STRING -## "Flags used by the C++ compiler during debug mpi builds." -## FORCE) -##SET(CMAKE_C_FLAGS_MPI_DEBUG -## ${CMAKE_C_FLAGS_DEBUG} CACHE STRING -## "Flags used by the C compiler during debug mpi builds." -## FORCE) -##if (PHREEQCRM_BUILD_FORTRAN) -## SET(CMAKE_Fortran_FLAGS_MPI_DEBUG -## ${CMAKE_Fortran_FLAGS_DEBUG} CACHE STRING -## "Flags used by the Fortran compiler during debug mpi builds." -## FORCE) -##endif () -##SET(CMAKE_EXE_LINKER_FLAGS_MPI_DEBUG -## ${CMAKE_EXE_LINKER_FLAGS_DEBUG} CACHE STRING -## "Flags used for linking binaries during debug mpi builds." -## FORCE) -##SET(CMAKE_SHARED_LINKER_FLAGS_MPI_DEBUG -## ${CMAKE_SHARED_LINKER_FLAGS_DEBUG} CACHE STRING -## "Flags used by the shared libraries linker during debug mpi builds." -## FORCE) -##MARK_AS_ADVANCED( -## CMAKE_CXX_FLAGS_MPI_DEBUG -## CMAKE_C_FLAGS_MPI_DEBUG -## CMAKE_EXE_LINKER_FLAGS_MPI_DEBUG -## CMAKE_SHARED_LINKER_FLAGS_MPI_DEBUG) -##if (PHREEQCRM_BUILD_FORTRAN) -## MARK_AS_ADVANCED(CMAKE_Fortran_FLAGS_MPI_DEBUG) -##endif() - - -### check for openmp -##find_package(OpenMP) -##if (OPENMP_FOUND) -## # openmp release -## SET(CMAKE_C_FLAGS_OPENMP -## "-DUSE_OPENMP ${CMAKE_C_FLAGS_OPENMP} ${OpenMP_C_FLAGS}" CACHE STRING -## "Flags used by the compiler during openmp builds." -## FORCE) -## SET(CMAKE_CXX_FLAGS_OPENMP -## "-DUSE_OPENMP ${CMAKE_CXX_FLAGS_OPENMP} ${OpenMP_CXX_FLAGS}" CACHE STRING -## "Flags used by the compiler during openmp builds." -## FORCE) -## if (PHREEQCRM_BUILD_FORTRAN) -## SET(CMAKE_Fortran_FLAGS_OPENMP -## "-DUSE_OPENMP ${CMAKE_Fortran_FLAGS_OPENMP} ${OpenMP_Fortran_FLAGS}" CACHE STRING -## "Flags used by the compiler during openmp builds." -## FORCE) -## endif () -## -## # openmp debug -## SET(CMAKE_C_FLAGS_OPENMP_DEBUG -## "-DUSE_OPENMP ${CMAKE_C_FLAGS_OPENMP_DEBUG} ${OpenMP_C_FLAGS}" CACHE STRING -## "Flags used by the compiler during debug openmp builds." -## FORCE) -## SET(CMAKE_CXX_FLAGS_OPENMP_DEBUG -## "-DUSE_OPENMP ${CMAKE_CXX_FLAGS_OPENMP_DEBUG} ${OpenMP_CXX_FLAGS}" CACHE STRING -## "Flags used by the compiler during debug openmp builds." -## FORCE) -## if (PHREEQCRM_BUILD_FORTRAN) -## SET(CMAKE_Fortran_FLAGS_OPENMP_DEBUG -## "-DUSE_OPENMP ${CMAKE_Fortran_FLAGS_OPENMP_DEBUG} ${OpenMP_Fortran_FLAGS}" CACHE STRING -## "Flags used by the compiler during debug openmp builds." -## FORCE) -## endif () -##endif (OPENMP_FOUND) - - -### check for MPI -##option(PHREEQCRM_BUILD_MPI "Build MPI configuration" "OFF") -##if (PHREEQCRM_BUILD_MPI) -## cmake_policy(SET CMP0054 OLD) -## find_package(MPI) -## cmake_policy(SET CMP0054 NEW) -## -## if (MPI_CXX_FOUND) -## # mpi release -## SET(CMAKE_C_FLAGS_MPI -## "-DUSE_MPI ${CMAKE_C_FLAGS_MPI} ${MPI_C_COMPILE_FLAGS}" CACHE STRING -## "Flags used by the compiler during mpi builds." -## FORCE) -## SET(CMAKE_CXX_FLAGS_MPI -## "-DUSE_MPI ${CMAKE_CXX_FLAGS_MPI} ${MPI_CXX_COMPILE_FLAGS}" CACHE STRING -## "Flags used by the compiler during mpi builds." -## FORCE) -## if (PHREEQCRM_BUILD_FORTRAN) -## SET(CMAKE_Fortran_FLAGS_MPI -## "-DUSE_MPI ${CMAKE_Fortran_FLAGS_MPI} ${MPI_Fortran_COMPILE_FLAGS}" CACHE STRING -## "Flags used by the Fortran compiler during mpi builds." -## FORCE) -## endif () -## if (MPI_C_INCLUDE_PATH) -## SET(CMAKE_C_FLAGS_MPI -## "-I\"${MPI_C_INCLUDE_PATH}\" ${CMAKE_C_FLAGS_MPI}" CACHE STRING -## "Flags used by the compiler during mpi builds." -## FORCE) -## endif (MPI_C_INCLUDE_PATH) -## if (MPI_CXX_INCLUDE_PATH) -## SET(CMAKE_CXX_FLAGS_MPI -## "-I\"${MPI_CXX_INCLUDE_PATH}\" ${CMAKE_CXX_FLAGS_MPI}" CACHE STRING -## "Flags used by the compiler during mpi builds." -## FORCE) -## endif (MPI_CXX_INCLUDE_PATH) -## if (PHREEQCRM_BUILD_FORTRAN AND MPI_Fortran_INCLUDE_PATH) -## if("${CMAKE_SIZEOF_VOID_P}" EQUAL 8) -## set(MS_MPI_ARCH_DIR amd64) -## else() -## set(MS_MPI_ARCH_DIR i386) -## endif() -## SET(CMAKE_Fortran_FLAGS_MPI -## "-I\"${MPI_Fortran_INCLUDE_PATH}\" -I\"${MPI_Fortran_INCLUDE_PATH}/${MS_MPI_ARCH_DIR}\" ${CMAKE_Fortran_FLAGS_MPI}" CACHE STRING -## "Flags used by the Fortran compiler during mpi builds." -## FORCE) -## endif () -## -## # mpi debug -## SET(CMAKE_C_FLAGS_MPI_DEBUG -## "-DUSE_MPI ${CMAKE_C_FLAGS_MPI_DEBUG} ${MPI_C_COMPILE_FLAGS}" CACHE STRING -## "Flags used by the compiler during debug mpi builds." -## FORCE) -## SET(CMAKE_CXX_FLAGS_MPI_DEBUG -## "-DUSE_MPI ${CMAKE_CXX_FLAGS_MPI_DEBUG} ${MPI_CXX_COMPILE_FLAGS}" CACHE STRING -## "Flags used by the compiler during debug mpi builds." -## FORCE) -## if (PHREEQCRM_BUILD_FORTRAN) -## SET(CMAKE_Fortran_FLAGS_MPI_DEBUG -## "-DUSE_MPI ${CMAKE_Fortran_FLAGS_MPI_DEBUG} ${MPI_Fortran_COMPILE_FLAGS}" CACHE STRING -## "Flags used by the Fortran compiler during debug mpi builds." -## FORCE) -## endif () -## if (MPI_C_INCLUDE_PATH) -## SET(CMAKE_C_FLAGS_MPI_DEBUG -## "-I\"${MPI_C_INCLUDE_PATH}\" ${CMAKE_C_FLAGS_MPI_DEBUG}" CACHE STRING -## "Flags used by the compiler during debug mpi builds." -## FORCE) -## endif (MPI_C_INCLUDE_PATH) -## if (MPI_CXX_INCLUDE_PATH) -## SET(CMAKE_CXX_FLAGS_MPI_DEBUG -## "-I\"${MPI_CXX_INCLUDE_PATH}\" ${CMAKE_CXX_FLAGS_MPI_DEBUG}" CACHE STRING -## "Flags used by the compiler during debug mpi builds." -## FORCE) -## endif (MPI_CXX_INCLUDE_PATH) -## if (PHREEQCRM_BUILD_FORTRAN AND MPI_Fortran_INCLUDE_PATH) -## if("${CMAKE_SIZEOF_VOID_P}" EQUAL 8) -## set(MS_MPI_ARCH_DIR amd64) -## else() -## set(MS_MPI_ARCH_DIR i386) -## endif() -## SET(CMAKE_Fortran_FLAGS_MPI_DEBUG -## "-I\"${MPI_Fortran_INCLUDE_PATH}\" -I\"${MPI_Fortran_INCLUDE_PATH}/${MS_MPI_ARCH_DIR}\" ${CMAKE_Fortran_FLAGS_MPI_DEBUG}" CACHE STRING -## "Flags used by the Fortran compiler during debug mpi builds." -## FORCE) -## endif () -## endif (MPI_CXX_FOUND) -##endif (PHREEQCRM_BUILD_MPI) - - -##if (PHREEQCRM_BUILD_MPI) -## if (CMAKE_CONFIGURATION_TYPES) -## SET(CMAKE_CONFIGURATION_TYPES "openmp_debug;openmp;mpi;mpi_debug" CACHE STRING -## "Semicolon separated list of supported configuration types." -## FORCE) -## endif (CMAKE_CONFIGURATION_TYPES) -##else (PHREEQCRM_BUILD_MPI) -## if (CMAKE_CONFIGURATION_TYPES) -## SET(CMAKE_CONFIGURATION_TYPES "openmp_debug;openmp" CACHE STRING -## "Semicolon separated list of supported configuration types." -## FORCE) -## endif (CMAKE_CONFIGURATION_TYPES) -##endif (PHREEQCRM_BUILD_MPI) - - SET(IPhreeqc_SOURCES src/thread.h src/CSelectedOutput.cpp @@ -474,6 +200,7 @@ src/phreeqcpp/Utils.cxx src/phreeqcpp/Utils.h ) +# compile Var.c as c++ SET_SOURCE_FILES_PROPERTIES(src/Var.c PROPERTIES LANGUAGE CXX) ### maybe always include? @@ -536,12 +263,17 @@ ${PROJECT_SOURCE_DIR}/src/Var.h if (MSVC AND BUILD_SHARED_LIBS AND BUILD_CLR_LIBS) set_target_properties(IPhreeqc PROPERTIES VS_DOTNET_REFERENCES "System;System.Drawing;System.Windows.Forms;${CMAKE_CURRENT_SOURCE_DIR}/src/phreeqcpp/ZedGraph.dll") # Remove /EHsc from CMAKE_CXX_FLAGS - STRING(REPLACE " /EHsc" " /EHa /clr /wd4793 /wd4945" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + 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 (MSVC10) + # turn off warnings on VS2010 + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4793 /wd4945") +endif() + # install if (WIN32) @@ -568,8 +300,12 @@ if (WIN32) endif() endif() +# install install(TARGETS IPhreeqc DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${IPhreeqc_Headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +if (BUILD_CLR_LIBS) + install(FILES "${PROJECT_SOURCE_DIR}/src/phreeqcpp/ZedGraph.dll" DESTINATION ${CMAKE_INSTALL_LIBDIR}) +endif() ##IF(MSVC) ## message("PROJECT_BINARY_DIR = ${PROJECT_BINARY_DIR}")