Skip to content

Commit

Permalink
Merge 6d546d0 into 59ccb98
Browse files Browse the repository at this point in the history
  • Loading branch information
agarny committed May 31, 2018
2 parents 59ccb98 + 6d546d0 commit 356572c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/plugins/api/SBMLAPI/tests/tests.cpp
Expand Up @@ -42,7 +42,7 @@ void Tests::basicTests()

// Check the version of libSBML

QCOMPARE(libsbml::getLibSBMLDottedVersion(), "5.16.0");
QCOMPARE(libsbml::getLibSBMLDottedVersion(), "5.17.0");

// Check against which libraries libSBML has been compiled

Expand Down
22 changes: 11 additions & 11 deletions src/plugins/api/SEDMLAPI/CMakeLists.txt
Expand Up @@ -63,31 +63,31 @@ if(USE_PREBUILT_SEDMLAPI_PACKAGE)
if(WIN32)
if(RELEASE_MODE)
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} 48929203f6cf3d58c02110f82a61200d03d37f66
${RELATIVE_PROJECT_SOURCE_DIR} ff370cd60079d0cbb1d70151ba1a53980c12ef39
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES a285b5e6532ff2ae8b68c6a47b94d911d5496b8f
6fae4b4587fd0769b4d7885fdf1f59dcd753bd6a)
SHA1_VALUES 26468ec5c1fd9d7016360454b5859329dabbc193
0941d5b8c439045de3e52065fcec355737286358)
else()
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} db406bb2105c73742c759612dc663496d3868838
${RELATIVE_PROJECT_SOURCE_DIR} 9af70876cda63372a50b5f50ad92573e1db7ba3c
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 0e01aa3d70dc38389cf1497759bfa65d4e5d7358
329e30cfc5e8e2f493e6aadf2dbd89c347867ff0)
SHA1_VALUES baf4cf556f5bc84a2a192040966a0f411d9b8ff1
fa8d33829360b5139f4c882950722111691eb0cb)
endif()
elseif(APPLE)
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} e94f678c588380730103eba4067e880340ddf24f
${RELATIVE_PROJECT_SOURCE_DIR} 37e2dd9b120818ff7376fde824115318cc149a66
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 308705d24ebece8decf05bd014c8fe2247dc8206)
SHA1_VALUES d6690e7ac4fd4defd3ad32774e611cdb1b5bd09a)
else()
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} 89509c8698588a23d52c0963a181d68aeae3218f
${RELATIVE_PROJECT_SOURCE_DIR} da409f582fc3c3390c796ec6e54483f8c018fd41
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES e20078453dd48df4be117c4efca7e6b1627a29d4)
SHA1_VALUES 62397d3f1b0fdc1beaa45ef18a07a8bd1bfcfdba)
endif()
else()
# Build libSEDML as an external project
Expand Down Expand Up @@ -145,7 +145,7 @@ else()
${DEFINE_LIBZ_LIBRARY}
-DWITH_CPP_NAMESPACE=ON
-DWITH_SWIG=OFF
-DWITH_ZLIB=ON
-DWITH_ZLIB=OFF
BUILD_BYPRODUCTS
<INSTALL_DIR>/lib/${IMPORT_LIBRARY}
DEPENDS
Expand Down

0 comments on commit 356572c

Please sign in to comment.