updated to new copasi, sbml, and antimony

builds in: MS Visual Studio, MinGW (win32), linux g++

antimony/CMakeLists.txt

@@ -36,7 +36,6 @@ SET(CPACK_PACKAGE_VERSION_PATCH "${LIBANTIMONY_VERSION_PATCH}")
 SET(CPACK_PACKAGE_VERSION_RELEASE "${LIBANTIMONY_VERSION_RELEASE}")
 INCLUDE(CPack)
 
-option(BUILD_SHARED_LIBS  "Build shared library (Set to OFF to build static libraries)" ON)
 set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: None (CMAKE_CXX_FLAGS or CMAKE_C_FLAGS are used), Debug, Release, RelWithDebInfo, MinSizeRel" )
 
 
@@ -230,7 +229,7 @@ file(GLOB LIBANTIMONY_HEADERS
         ${ANTIMONY_SRC_DIR}variable.h
         )
 
-add_library(${LIBANTIMONY_LIBRARY} ${LIBANTIMONY_HEADERS} ${LIBANTIMONY_SOURCES} ${LIBANTIMONY_TRANSLATORS})
+add_library(${LIBANTIMONY_LIBRARY} SHARED ${LIBANTIMONY_SOURCES} ${LIBANTIMONY_TRANSLATORS})
 target_link_libraries(${LIBANTIMONY_LIBRARY} ${LIBANTIMONY_LIBRARY} ${LIBANTIMONY_LIBS})
 add_definitions(-DLIB_EXPORTS)
 #install(TARGETS ${LIBANTIMONY_LIBRARY} DESTINATION bin)

copasi/CMakeLists.txt

@@ -63,6 +63,10 @@ IF (WIN32)
 	IF (MINGW)
 		ADD_DEFINITIONS(-DCYGWIN)
 		ADD_DEFINITIONS(-D__CYGWIN__)
+		ADD_DEFINITIONS(-DDBL_EPSILON=2.22045e-16)
+		ADD_DEFINITIONS(-DDBL_MIN=1e-999)
+		ADD_DEFINITIONS(-DDBL_MIN_EXP=-999)
+		ADD_DEFINITIONS(-DDBL_MAX=1.79769e+308)
 		IF (USE_STDCALL)
 			ADD_DEFINITIONS(-DUSE_STDCALL)
 		 ENDIF(USE_STDCALL)
@@ -164,7 +168,7 @@ INSTALL(TARGETS copasi
 #  COPASI api
 #----------------------------------
 
-OPTION( TEST_COPASI_API "test copasi api" OFF )
+OPTION( TEST_COPASI_API "test copasi api" ON )
 
 IF (TEST_COPASI_API)
   ADD_EXECUTABLE(copasi_api_test test_copasi.c)

raptor/CMakeLists.txt

@@ -17,6 +17,7 @@ IF(WIN32)
 	ADD_DEFINITIONS(-DWIN32)
 	IF (MINGW)
 		ADD_DEFINITIONS(-D__MINGW32__)
+		ADD_DEFINITIONS(-DDBL_EPSILON=2.22045e-16)
 	ELSE(MINGW)
 		ADD_DEFINITIONS(-Dstrcasecmp=_stricmp)
 		ADD_DEFINITIONS(-Dstrncasecmp=_strnicmp)