Skip to content

Add DESTDIR to cmake symlinks #5419

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

Merged
merged 3 commits into from
Jul 23, 2020
Merged

Add DESTDIR to cmake symlinks #5419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35b8bae
Add DESTDIR to cmake symlinks
Jul 11, 2020
7d1e074
Create install symlinks with '\$ENV{DESTDIR}' in place of '$ENV{DESTD…
Jul 15, 2020
56b4d28
Remove *.bak files added when fixing cmake symlinks.
Jul 21, 2020
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
2 changes: 1 addition & 1 deletion jbmc/src/janalyzer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ install(TARGETS janalyzer DESTINATION ${CMAKE_INSTALL_BINDIR})
install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \
cbmc.1 \
${CMAKE_INSTALL_FULL_MANDIR}/man1/janalyzer.1 \
\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/janalyzer.1 \
)"
)
2 changes: 1 addition & 1 deletion jbmc/src/jbmc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ install(TARGETS jbmc DESTINATION ${CMAKE_INSTALL_BINDIR})
install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \
cbmc.1 \
${CMAKE_INSTALL_FULL_MANDIR}/man1/jbmc.1 \
\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/jbmc.1 \
)"
)
2 changes: 1 addition & 1 deletion jbmc/src/jdiff/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ install(TARGETS jdiff DESTINATION ${CMAKE_INSTALL_BINDIR})
install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \
cbmc.1 \
${CMAKE_INSTALL_FULL_MANDIR}/man1/jdiff.1 \
\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/jdiff.1 \
)"
)
2 changes: 1 addition & 1 deletion src/goto-analyzer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ install(TARGETS goto-analyzer DESTINATION ${CMAKE_INSTALL_BINDIR})
install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \
cbmc.1 \
${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-analyzer.1 \
\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-analyzer.1 \
)"
)
10 changes: 5 additions & 5 deletions src/goto-cc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,32 +44,32 @@ else()
install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \
goto-cc \
Copy link
Contributor

Choose a reason for hiding this comment

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

So aside from the whole DESTDIR issue I am learning more about symlinks as well. Didn’t know they worked with relative paths too, though that certainly is very convenient.

${CMAKE_INSTALL_FULL_BINDIR}/goto-gcc \
\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/goto-gcc \
)"
)
install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \
goto-cc \
${CMAKE_INSTALL_FULL_BINDIR}/goto-ld \
\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/goto-ld \
)"
)
# Symlink man page to cbmc man page until a real man page is written
install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \
cbmc.1 \
${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-cc.1 \
\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-cc.1 \
)"
)
install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \
cbmc.1 \
${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-gcc.1 \
\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-gcc.1 \
)"
)
install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \
cbmc.1 \
${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-ld.1 \
\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-ld.1 \
)"
)
endif()
2 changes: 1 addition & 1 deletion src/goto-diff/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ install(TARGETS goto-diff DESTINATION ${CMAKE_INSTALL_BINDIR})
install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \
cbmc.1 \
${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-diff.1 \
\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-diff.1 \
)"
)
2 changes: 1 addition & 1 deletion src/goto-harness/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ install(TARGETS goto-harness DESTINATION ${CMAKE_INSTALL_BINDIR})
install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \
cbmc.1 \
${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-harness.1 \
\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-harness.1 \
)"
)
2 changes: 1 addition & 1 deletion src/goto-instrument/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ install(TARGETS goto-instrument DESTINATION ${CMAKE_INSTALL_BINDIR})
install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \
cbmc.1 \
${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-instrument.1 \
\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-instrument.1 \
)"
)