Skip to content
Snippets Groups Projects
Unverified Commit 173ae201 authored by Lars Bilke's avatar Lars Bilke Committed by GitHub
Browse files

Merge pull request #2245 from bilke/fix-packaging-dll 

[CMake] Fixed packaging of DLLs.
parents ef089ad9 20f2b611
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
scripts/cmake/packaging/Pack.cmake
+ 6
− 8
View file @ 173ae201
...@@ -104,16 +104,14 @@ cpack_add_component(ogs_docs ...@@ -104,16 +104,14 @@ cpack_add_component(ogs_docs
if(OGS_USE_CONAN) if(OGS_USE_CONAN)
# Install shared libraries, copied to bin-dir # Install shared libraries, copied to bin-dir
foreach(PATTERN "*.dll" "*.dylib*") file(GLOB MATCHED_FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/*.dll")
file(GLOB LIST_DIRECTORIES false MATCHED_FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PATTERN}) install(FILES ${MATCHED_FILES} DESTINATION bin)
install(FILES ${MATCHED_FILES} DESTINATION bin) file(GLOB LIST_DIRECTORIES false MATCHED_FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/*.dylib*")
endforeach() install(FILES ${MATCHED_FILES} DESTINATION bin)
# Install shared libraries, copied to lib-dir # Install shared libraries, copied to lib-dir
foreach(PATTERN "*.so*") file(GLOB MATCHED_FILES "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/*.so*")
file(GLOB MATCHED_FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${PATTERN}) install(FILES ${MATCHED_FILES} DESTINATION lib)
install(FILES ${MATCHED_FILES} DESTINATION lib)
endforeach()
# macOS frameworks are directories, exclude header files # macOS frameworks are directories, exclude header files
file(GLOB MATCHED_DIRECTORIES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/*.framework") file(GLOB MATCHED_DIRECTORIES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/*.framework")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment