-
Notifications
You must be signed in to change notification settings - Fork 159
Fix shared lib symlink installation path #556
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -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}\")") | ||||||
|
||||||
| 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}\")") |
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -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}\")") | ||||||
|
||||||
| 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}\")") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After switching
INSTALL_DESTINATIONtoCMAKE_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.