Skip to content

Commit

Permalink
Updated OS list for testing (2)
Browse files Browse the repository at this point in the history
  • Loading branch information
maxirmx committed Jun 15, 2024
1 parent 4c2d765 commit 58787db
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ jobs:
# Build of sexp dll with MSVC is not supported
exclude:
- { os: windows-2019, env: { }, shared: on }
- { os: windows-2022, env: { }, shared: on }

env: ${{ matrix.env }}
steps:
Expand Down
17 changes: 12 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,18 @@ configure_file(
)

if (WIN32 AND BUILD_SHARED_LIBS)
install(TARGETS sexpp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
install(TARGETS sexpp ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
else(WIN32 AND BUILD_SHARED_LIBS)
install(TARGETS sexpp DESTINATION "${CMAKE_INSTALL_LIBDIR}")
endif(WIN32 AND BUILD_SHARED_LIBS)
if (WIN32)
install(TARGETS sexpp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
install(TARGETS sexpp ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
else(WIN32)
install(TARGETS sexpp DESTINATION "${CMAKE_INSTALL_LIBDIR}")
if (APPLE)
# Since cmd line tools version 2397 dyld doesn't look in ../lib
# See and https://developer.apple.com/forums/thread/737920 for the details.
set_target_properties(rnp PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}")
endif(APPLE)
endif(WIN32)
endif(AND BUILD_SHARED_LIBS)

install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
install(FILES "${CONFIGURED_PC}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
Expand Down

0 comments on commit 58787db

Please sign in to comment.