Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/Imath/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@ if (IMATH_INSTALL)

file(CREATE_LINK ${VERSIONED_LIB_FILENAME} ${CMAKE_CURRENT_BINARY_DIR}/${BASE_LIB_FILENAME} SYMBOLIC)
if(WIN32)
set(INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR})
else()
set(INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
set(INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BASE_LIB_FILENAME} DESTINATION ${INSTALL_DESTINATION})
install(CODE "message(STATUS \"Creating symlink ${INSTALL_DESTINATION}/${BASE_LIB_FILENAME} -> ${VERSIONED_LIB_FILENAME}\")")

Copilot AI Mar 26, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After switching INSTALL_DESTINATION to CMAKE_INSTALL_LIBDIR/CMAKE_INSTALL_BINDIR (relative paths), the subsequent status message prints a relative install path. Consider printing the fully resolved install path by including ${CMAKE_INSTALL_PREFIX} (and $ENV{DESTDIR} if set) for clearer install logs.

Suggested change
install(CODE "message(STATUS \"Creating symlink ${INSTALL_DESTINATION}/${BASE_LIB_FILENAME} -> ${VERSIONED_LIB_FILENAME}\")")
install(CODE "message(STATUS \"Creating symlink \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${INSTALL_DESTINATION}/${BASE_LIB_FILENAME} -> ${VERSIONED_LIB_FILENAME}\")")

Copilot uses AI. Check for mistakes.
Expand Down
4 changes: 2 additions & 2 deletions src/pybind11/PyBindImath/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ if (IMATH_INSTALL)

file(CREATE_LINK ${VERSIONED_LIB_FILENAME} ${CMAKE_CURRENT_BINARY_DIR}/${BASE_LIB_FILENAME} SYMBOLIC)
if(WIN32)
set(INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR})
else()
set(INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
set(INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BASE_LIB_FILENAME} DESTINATION ${INSTALL_DESTINATION})
install(CODE "message(STATUS \"Creating symlink ${INSTALL_DESTINATION}/${BASE_LIB_FILENAME} -> ${VERSIONED_LIB_FILENAME}\")")

Copilot AI Mar 26, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The install-time status message now prints a relative path (because INSTALL_DESTINATION is CMAKE_INSTALL_LIBDIR/CMAKE_INSTALL_BINDIR). Consider prepending ${CMAKE_INSTALL_PREFIX} (and accounting for $ENV{DESTDIR}) so the message matches the real install path when cmake --install --prefix is used.

Suggested change
install(CODE "message(STATUS \"Creating symlink ${INSTALL_DESTINATION}/${BASE_LIB_FILENAME} -> ${VERSIONED_LIB_FILENAME}\")")
install(CODE "message(STATUS \"Creating symlink \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${INSTALL_DESTINATION}/${BASE_LIB_FILENAME} -> ${VERSIONED_LIB_FILENAME}\")")

Copilot uses AI. Check for mistakes.
Expand Down
4 changes: 2 additions & 2 deletions src/python/PyImath/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,9 @@ if (IMATH_INSTALL)

file(CREATE_LINK ${VERSIONED_LIB_FILENAME} ${CMAKE_CURRENT_BINARY_DIR}/${BASE_LIB_FILENAME} SYMBOLIC)
if(WIN32)
set(INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR})
else()
set(INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
set(INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BASE_LIB_FILENAME} DESTINATION ${INSTALL_DESTINATION})
install(CODE "message(STATUS \"Creating symlink ${INSTALL_DESTINATION}/${BASE_LIB_FILENAME} -> ${VERSIONED_LIB_FILENAME}\")")

Copilot AI Mar 26, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The install-time status message now prints a relative path (e.g., lib/...) because INSTALL_DESTINATION is set to CMAKE_INSTALL_LIBDIR/CMAKE_INSTALL_BINDIR. Consider including ${CMAKE_INSTALL_PREFIX} (and respecting $ENV{DESTDIR} if applicable) in the message so the output reflects the actual on-disk install location when using cmake --install --prefix.

Suggested change
install(CODE "message(STATUS \"Creating symlink ${INSTALL_DESTINATION}/${BASE_LIB_FILENAME} -> ${VERSIONED_LIB_FILENAME}\")")
install(CODE "message(STATUS \"Creating symlink \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_DESTINATION}/${BASE_LIB_FILENAME} -> ${VERSIONED_LIB_FILENAME}\")")

Copilot uses AI. Check for mistakes.
Expand Down
Loading