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

Correct a syntax error in previous packaging fix. #3097

Merged
merged 2 commits into from
Feb 19, 2025
Merged

Correct a syntax error in previous packaging fix. #3097

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ead5a2
Correct a syntax error.
WardF Feb 18, 2025
be2ec87
Additional Path Munging.
WardF Feb 19, 2025
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
30 changes: 20 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,20 +1563,30 @@ if(MSVC)
endif()

foreach(CPP ${CMAKE_PREFIX_PATH})

CMAKE_PATH(CONVERT ${CPP} TO_CMAKE_PATH_LIST CPP)

file(GLOB COPY_FILES ${CPP}/*.lib ${CPP}/lib/*.lib)
if(COPY_FILES)
install(FILES ${COPY_FILES}
DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT dependencies)
endif()
endforeach()
install(FILES ${COPY_FILES}
DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT dependencies)


foreach(CPP ${CMAKE_PREFIX_PATH})
file(GLOB COPY_FILES ${CPP}/*.dll)
endforeach()
string(REGEX REPLACE "msv[.*].dll" "" COPY_FILES "${COPY_FILES}")
install(FILES ${COPY_FILES}
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT dependencies)

CMAKE_PATH(CONVERT ${CPP} TO_CMAKE_PATH_LIST CPP)

file(GLOB COPY_FILES ${CPP}/*.dll ${CPP}/bin/*.dll)
if(COPY_FILES)
string(REGEX REPLACE "msv[.*].dll" "" COPY_FILES "${COPY_FILES}")
install(FILES ${COPY_FILES}
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT dependencies)
endif()
endforeach()

endif()

# Subdirectory CMakeLists.txt files should specify their own
Expand Down
Loading