-
Notifications
You must be signed in to change notification settings - Fork 129
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/logging-updates
- Loading branch information
Showing
78 changed files
with
908 additions
and
923 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -48,7 +48,7 @@ include(FindPackageHandleStandardArgs) | |
# Set some variables with info on the SUNDIALS project | ||
set(PACKAGE_BUGREPORT "[email protected]") | ||
set(PACKAGE_NAME "SUNDIALS") | ||
set(PACKAGE_STRING "SUNDIALS 7.0.0") | ||
set(PACKAGE_STRING "SUNDIALS 7.1.1") | ||
set(PACKAGE_TARNAME "sundials") | ||
|
||
# Set SUNDIALS version numbers | ||
|
@@ -57,8 +57,8 @@ message(STATUS "SUNDIALS_GIT_VERSION: ${SUNDIALS_GIT_VERSION}") | |
|
||
# (use "" for the version label if none is needed) | ||
set(PACKAGE_VERSION_MAJOR "7") | ||
set(PACKAGE_VERSION_MINOR "0") | ||
set(PACKAGE_VERSION_PATCH "0") | ||
set(PACKAGE_VERSION_MINOR "1") | ||
set(PACKAGE_VERSION_PATCH "1") | ||
set(PACKAGE_VERSION_LABEL "") | ||
|
||
if(PACKAGE_VERSION_LABEL) | ||
|
@@ -73,37 +73,37 @@ endif() | |
|
||
# Specify the VERSION and SOVERSION for shared libraries | ||
|
||
set(arkodelib_VERSION "6.0.0") | ||
set(arkodelib_VERSION "6.1.1") | ||
set(arkodelib_SOVERSION "6") | ||
|
||
set(cvodelib_VERSION "7.0.0") | ||
set(cvodelib_VERSION "7.1.1") | ||
set(cvodelib_SOVERSION "7") | ||
|
||
set(cvodeslib_VERSION "7.0.0") | ||
set(cvodeslib_VERSION "7.1.1") | ||
set(cvodeslib_SOVERSION "7") | ||
|
||
set(idalib_VERSION "7.0.0") | ||
set(idalib_VERSION "7.1.1") | ||
set(idalib_SOVERSION "7") | ||
|
||
set(idaslib_VERSION "6.0.0") | ||
set(idaslib_VERSION "6.1.1") | ||
set(idaslib_SOVERSION "6") | ||
|
||
set(kinsollib_VERSION "7.0.0") | ||
set(kinsollib_VERSION "7.1.1") | ||
set(kinsollib_SOVERSION "7") | ||
|
||
set(cpodeslib_VERSION "0.0.0") | ||
set(cpodeslib_SOVERSION "0") | ||
|
||
set(nveclib_VERSION "7.0.0") | ||
set(nveclib_VERSION "7.1.1") | ||
set(nveclib_SOVERSION "7") | ||
|
||
set(sunmatrixlib_VERSION "5.0.0") | ||
set(sunmatrixlib_VERSION "5.1.1") | ||
set(sunmatrixlib_SOVERSION "5") | ||
|
||
set(sunlinsollib_VERSION "5.0.0") | ||
set(sunlinsollib_VERSION "5.1.1") | ||
set(sunlinsollib_SOVERSION "5") | ||
|
||
set(sunnonlinsollib_VERSION "4.0.0") | ||
set(sunnonlinsollib_VERSION "4.1.1") | ||
set(sunnonlinsollib_SOVERSION "4") | ||
|
||
set(sundialslib_VERSION | ||
|
@@ -117,7 +117,7 @@ set(sundialslib_SOVERSION "${PACKAGE_VERSION_MAJOR}") | |
|
||
# Prohibit in-source build | ||
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") | ||
print_error("In-source build prohibited.") | ||
message(FATAL_ERROR "In-source build prohibited.") | ||
endif() | ||
|
||
# Organize targets into folders when using an IDE | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.