Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake: Fix dll install location #475

Merged
merged 3 commits into from
May 17, 2024
Merged

CMake: Fix dll install location #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4767385
CMake: Fix dll install location
jschueller May 14, 2024
f21d80f
Merge branch 'develop' into bindir
balos1 May 15, 2024
57f400b
Merge branch 'develop' into bindir
balos1 May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@

## Changes to SUNDIALS in release X.Y.Z

Fixed conflicting `.lib` files between shared and static libs when using `MSVC` on Windows
Fixed the runtime library installation path for windows systems. This fix changes the
jschueller marked this conversation as resolved.
Show resolved Hide resolved
default library installation path from `CMAKE_INSTALL_PREFIX/CMAKE_INSTALL_LIBDIR` to
`CMAKE_INSTALL_PREFIX/CMAKE_INSTALL_BINDIR`.

Fixed invalid `SUNDIALS_EXPORT` generated macro when building both shared and static libs
Fixed conflicting `.lib` files between shared and static libs when using `MSVC` on Windows.

Fixed invalid `SUNDIALS_EXPORT` generated macro when building both shared and static libs.

Created shared user interface for ARKODE user-callable routines, to allow more
uniform control over time-stepping algorithms, improved extensibility, and
Expand Down
2 changes: 1 addition & 1 deletion cmake/macros/SundialsAddLibrary.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ macro(sundials_add_library target)
endif()

# install phase
install(TARGETS ${_actual_target_name} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT sundials-targets)
install(TARGETS ${_actual_target_name} EXPORT sundials-targets)

endif()

Expand Down
4 changes: 4 additions & 0 deletions doc/shared/RecentChanges.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
**New Features**

Fixed the runtime library installation path for windows systems. This fix changes the
default library installation path from ``CMAKE_INSTALL_PREFIX/CMAKE_INSTALL_LIBDIR`` to
``CMAKE_INSTALL_PREFIX/CMAKE_INSTALL_BINDIR``.

Created shared user interface for ARKODE user-callable routines, to allow more
uniform control over time-stepping algorithms, improved extensibility, and
simplified code maintenance. Marked the corresponding stepper-specific
Expand Down
Loading