From 58787db380b859271cf3944c4663fc211d3b5724 Mon Sep 17 00:00:00 2001 From: "Maxim [maxirmx] Samsonov" Date: Sat, 15 Jun 2024 12:07:38 +0300 Subject: [PATCH] Updated OS list for testing (2) --- .github/workflows/build-and-test.yml | 1 + CMakeLists.txt | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index cb4dfaa..6ea333d 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -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: diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c11844..32d0270 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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")