From 35b8baecc26ee30a3dd8d9571eb8a52e5192b81a Mon Sep 17 00:00:00 2001 From: "Mark R. Tuttle" Date: Sat, 11 Jul 2020 12:26:24 -0400 Subject: [PATCH 1/3] Add DESTDIR to cmake symlinks --- jbmc/src/janalyzer/CMakeLists.txt | 2 +- jbmc/src/jbmc/CMakeLists.txt | 2 +- jbmc/src/jdiff/CMakeLists.txt | 2 +- src/goto-analyzer/CMakeLists.txt | 2 +- src/goto-cc/CMakeLists.txt | 10 +++++----- src/goto-diff/CMakeLists.txt | 2 +- src/goto-harness/CMakeLists.txt | 2 +- src/goto-instrument/CMakeLists.txt | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jbmc/src/janalyzer/CMakeLists.txt b/jbmc/src/janalyzer/CMakeLists.txt index f4b1b73c248..7e733cdc212 100644 --- a/jbmc/src/janalyzer/CMakeLists.txt +++ b/jbmc/src/janalyzer/CMakeLists.txt @@ -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 \ )" ) diff --git a/jbmc/src/jbmc/CMakeLists.txt b/jbmc/src/jbmc/CMakeLists.txt index d5b0a987202..f41c3016dbb 100644 --- a/jbmc/src/jbmc/CMakeLists.txt +++ b/jbmc/src/jbmc/CMakeLists.txt @@ -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 \ )" ) diff --git a/jbmc/src/jdiff/CMakeLists.txt b/jbmc/src/jdiff/CMakeLists.txt index 09f7f21e368..ce4dfc528f1 100644 --- a/jbmc/src/jdiff/CMakeLists.txt +++ b/jbmc/src/jdiff/CMakeLists.txt @@ -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 \ )" ) diff --git a/src/goto-analyzer/CMakeLists.txt b/src/goto-analyzer/CMakeLists.txt index 987d43e2d28..d29f1933c96 100644 --- a/src/goto-analyzer/CMakeLists.txt +++ b/src/goto-analyzer/CMakeLists.txt @@ -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 \ )" ) diff --git a/src/goto-cc/CMakeLists.txt b/src/goto-cc/CMakeLists.txt index ff85f613085..2bb4ddaefb4 100644 --- a/src/goto-cc/CMakeLists.txt +++ b/src/goto-cc/CMakeLists.txt @@ -44,32 +44,32 @@ else() install(CODE "execute_process( \ COMMAND ${CMAKE_COMMAND} -E create_symlink \ goto-cc \ - ${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() diff --git a/src/goto-diff/CMakeLists.txt b/src/goto-diff/CMakeLists.txt index bac85d35d2f..a30892174eb 100644 --- a/src/goto-diff/CMakeLists.txt +++ b/src/goto-diff/CMakeLists.txt @@ -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 \ )" ) diff --git a/src/goto-harness/CMakeLists.txt b/src/goto-harness/CMakeLists.txt index 1fcc1c35df9..c047fed252f 100644 --- a/src/goto-harness/CMakeLists.txt +++ b/src/goto-harness/CMakeLists.txt @@ -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 \ )" ) diff --git a/src/goto-instrument/CMakeLists.txt b/src/goto-instrument/CMakeLists.txt index 57acaba366d..40650901be6 100644 --- a/src/goto-instrument/CMakeLists.txt +++ b/src/goto-instrument/CMakeLists.txt @@ -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 \ )" ) From 7d1e0748b22f4044a7bb2608a88565f5f387b13e Mon Sep 17 00:00:00 2001 From: "Mark R. Tuttle" Date: Wed, 15 Jul 2020 18:51:47 +0000 Subject: [PATCH 2/3] Create install symlinks with '\$ENV{DESTDIR}' in place of '$ENV{DESTDIR}' --- jbmc/src/janalyzer/CMakeLists.txt | 2 +- jbmc/src/janalyzer/CMakeLists.txt.bak | 35 ++++++++++++ jbmc/src/jbmc/CMakeLists.txt | 2 +- jbmc/src/jbmc/CMakeLists.txt.bak | 41 ++++++++++++++ jbmc/src/jdiff/CMakeLists.txt | 2 +- jbmc/src/jdiff/CMakeLists.txt.bak | 36 +++++++++++++ src/goto-analyzer/CMakeLists.txt | 2 +- src/goto-analyzer/CMakeLists.txt.bak | 38 +++++++++++++ src/goto-cc/CMakeLists.txt | 10 ++-- src/goto-cc/CMakeLists.txt.bak | 75 ++++++++++++++++++++++++++ src/goto-diff/CMakeLists.txt | 2 +- src/goto-diff/CMakeLists.txt.bak | 39 ++++++++++++++ src/goto-harness/CMakeLists.txt | 2 +- src/goto-harness/CMakeLists.txt.bak | 20 +++++++ src/goto-instrument/CMakeLists.txt | 2 +- src/goto-instrument/CMakeLists.txt.bak | 40 ++++++++++++++ 16 files changed, 336 insertions(+), 12 deletions(-) create mode 100644 jbmc/src/janalyzer/CMakeLists.txt.bak create mode 100644 jbmc/src/jbmc/CMakeLists.txt.bak create mode 100644 jbmc/src/jdiff/CMakeLists.txt.bak create mode 100644 src/goto-analyzer/CMakeLists.txt.bak create mode 100644 src/goto-cc/CMakeLists.txt.bak create mode 100644 src/goto-diff/CMakeLists.txt.bak create mode 100644 src/goto-harness/CMakeLists.txt.bak create mode 100644 src/goto-instrument/CMakeLists.txt.bak diff --git a/jbmc/src/janalyzer/CMakeLists.txt b/jbmc/src/janalyzer/CMakeLists.txt index 7e733cdc212..afc645d7f1a 100644 --- a/jbmc/src/janalyzer/CMakeLists.txt +++ b/jbmc/src/janalyzer/CMakeLists.txt @@ -30,6 +30,6 @@ install(TARGETS janalyzer DESTINATION ${CMAKE_INSTALL_BINDIR}) install(CODE "execute_process( \ COMMAND ${CMAKE_COMMAND} -E create_symlink \ cbmc.1 \ - $ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/janalyzer.1 \ + \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/janalyzer.1 \ )" ) diff --git a/jbmc/src/janalyzer/CMakeLists.txt.bak b/jbmc/src/janalyzer/CMakeLists.txt.bak new file mode 100644 index 00000000000..b5126481e8e --- /dev/null +++ b/jbmc/src/janalyzer/CMakeLists.txt.bak @@ -0,0 +1,35 @@ +# Library +file(GLOB_RECURSE sources "*.cpp" "*.h") +list(REMOVE_ITEM sources + ${CMAKE_CURRENT_SOURCE_DIR}/janalyzer_main.cpp +) +add_library(janalyzer-lib ${sources}) + +generic_includes(janalyzer-lib) + +target_link_libraries(janalyzer-lib + ansi-c + java_bytecode + linking + big-int + goto-analyzer-lib + goto-programs + analyses + pointer-analysis + langapi + json + util +) + +# Executable +add_executable(janalyzer janalyzer_main.cpp) +target_link_libraries(janalyzer janalyzer-lib) +install(TARGETS janalyzer DESTINATION ${CMAKE_INSTALL_BINDIR}) + +# 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 \ + \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/janalyzer.1 \ + )" +) diff --git a/jbmc/src/jbmc/CMakeLists.txt b/jbmc/src/jbmc/CMakeLists.txt index f41c3016dbb..eb26273f7a6 100644 --- a/jbmc/src/jbmc/CMakeLists.txt +++ b/jbmc/src/jbmc/CMakeLists.txt @@ -36,6 +36,6 @@ install(TARGETS jbmc DESTINATION ${CMAKE_INSTALL_BINDIR}) install(CODE "execute_process( \ COMMAND ${CMAKE_COMMAND} -E create_symlink \ cbmc.1 \ - $ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/jbmc.1 \ + \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/jbmc.1 \ )" ) diff --git a/jbmc/src/jbmc/CMakeLists.txt.bak b/jbmc/src/jbmc/CMakeLists.txt.bak new file mode 100644 index 00000000000..925ae7fdb21 --- /dev/null +++ b/jbmc/src/jbmc/CMakeLists.txt.bak @@ -0,0 +1,41 @@ +# Library +file(GLOB_RECURSE sources "*.cpp" "*.h") +list(REMOVE_ITEM sources + ${CMAKE_CURRENT_SOURCE_DIR}/jbmc_main.cpp +) +add_library(jbmc-lib ${sources}) + +generic_includes(jbmc-lib) + +target_link_libraries(jbmc-lib + analyses + ansi-c + big-int + cbmc-lib + goto-checker + goto-instrument-lib + goto-programs + goto-symex + java_bytecode + json + langapi + linking + miniz + pointer-analysis + solvers + util + xml +) + +# Executable +add_executable(jbmc jbmc_main.cpp) +target_link_libraries(jbmc jbmc-lib) +install(TARGETS jbmc DESTINATION ${CMAKE_INSTALL_BINDIR}) + +# 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 \ + \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/jbmc.1 \ + )" +) diff --git a/jbmc/src/jdiff/CMakeLists.txt b/jbmc/src/jdiff/CMakeLists.txt index ce4dfc528f1..7e6fce63816 100644 --- a/jbmc/src/jdiff/CMakeLists.txt +++ b/jbmc/src/jdiff/CMakeLists.txt @@ -31,6 +31,6 @@ install(TARGETS jdiff DESTINATION ${CMAKE_INSTALL_BINDIR}) install(CODE "execute_process( \ COMMAND ${CMAKE_COMMAND} -E create_symlink \ cbmc.1 \ - $ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/jdiff.1 \ + \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/jdiff.1 \ )" ) diff --git a/jbmc/src/jdiff/CMakeLists.txt.bak b/jbmc/src/jdiff/CMakeLists.txt.bak new file mode 100644 index 00000000000..b107a17075f --- /dev/null +++ b/jbmc/src/jdiff/CMakeLists.txt.bak @@ -0,0 +1,36 @@ +# Library +file(GLOB_RECURSE sources "*.cpp" "*.h") +list(REMOVE_ITEM sources + ${CMAKE_CURRENT_SOURCE_DIR}/jdiff_main.cpp +) +add_library(jdiff-lib ${sources}) + +generic_includes(jdiff-lib) + +target_link_libraries(jdiff-lib + ansi-c + linking + big-int + pointer-analysis + goto-diff-lib + goto-instrument-lib + goto-programs + analyses + java_bytecode + langapi + xml + util +) + +# Executable +add_executable(jdiff jdiff_main.cpp) +target_link_libraries(jdiff jdiff-lib) +install(TARGETS jdiff DESTINATION ${CMAKE_INSTALL_BINDIR}) + +# 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 \ + \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/jdiff.1 \ + )" +) diff --git a/src/goto-analyzer/CMakeLists.txt b/src/goto-analyzer/CMakeLists.txt index d29f1933c96..2e1047e84b2 100644 --- a/src/goto-analyzer/CMakeLists.txt +++ b/src/goto-analyzer/CMakeLists.txt @@ -33,6 +33,6 @@ install(TARGETS goto-analyzer DESTINATION ${CMAKE_INSTALL_BINDIR}) install(CODE "execute_process( \ COMMAND ${CMAKE_COMMAND} -E create_symlink \ cbmc.1 \ - $ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-analyzer.1 \ + \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-analyzer.1 \ )" ) diff --git a/src/goto-analyzer/CMakeLists.txt.bak b/src/goto-analyzer/CMakeLists.txt.bak new file mode 100644 index 00000000000..25389deb02b --- /dev/null +++ b/src/goto-analyzer/CMakeLists.txt.bak @@ -0,0 +1,38 @@ +# Library +file(GLOB_RECURSE sources "*.cpp" "*.h") +list(REMOVE_ITEM sources + ${CMAKE_CURRENT_SOURCE_DIR}/goto_analyzer_main.cpp +) +add_library(goto-analyzer-lib ${sources}) + +generic_includes(goto-analyzer-lib) + +target_link_libraries(goto-analyzer-lib + ansi-c + cpp + linking + big-int + goto-checker + goto-programs + analyses + pointer-analysis + langapi + json + assembler + util +) + +add_if_library(goto-analyzer-lib jsil) + +# Executable +add_executable(goto-analyzer goto_analyzer_main.cpp) +target_link_libraries(goto-analyzer goto-analyzer-lib) +install(TARGETS goto-analyzer DESTINATION ${CMAKE_INSTALL_BINDIR}) + +# 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 \ + \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-analyzer.1 \ + )" +) diff --git a/src/goto-cc/CMakeLists.txt b/src/goto-cc/CMakeLists.txt index 2bb4ddaefb4..924dc4c4174 100644 --- a/src/goto-cc/CMakeLists.txt +++ b/src/goto-cc/CMakeLists.txt @@ -44,32 +44,32 @@ else() install(CODE "execute_process( \ COMMAND ${CMAKE_COMMAND} -E create_symlink \ goto-cc \ - $ENV{DESTDIR}${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 \ - $ENV{DESTDIR}${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 \ - $ENV{DESTDIR}${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 \ - $ENV{DESTDIR}${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 \ - $ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-ld.1 \ + \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-ld.1 \ )" ) endif() diff --git a/src/goto-cc/CMakeLists.txt.bak b/src/goto-cc/CMakeLists.txt.bak new file mode 100644 index 00000000000..584dd916279 --- /dev/null +++ b/src/goto-cc/CMakeLists.txt.bak @@ -0,0 +1,75 @@ +# Library +file(GLOB_RECURSE sources "*.cpp" "*.h") +list(REMOVE_ITEM sources + ${CMAKE_CURRENT_SOURCE_DIR}/goto_cc_main.cpp +) +add_library(goto-cc-lib ${sources}) + +generic_includes(goto-cc-lib) + +target_link_libraries(goto-cc-lib + big-int + goto-programs + util + json + linking + ansi-c + cpp + xml + assembler + langapi +) + +add_if_library(goto-cc-lib jsil) + +# Executable +add_executable(goto-cc goto_cc_main.cpp) +target_link_libraries(goto-cc goto-cc-lib) + +if(WIN32) + set_target_properties(goto-cc PROPERTIES OUTPUT_NAME goto-cl) + install(TARGETS goto-cc DESTINATION ${CMAKE_INSTALL_BINDIR}) +else() + add_custom_command(TARGET goto-cc + POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E create_symlink + goto-cc $/goto-gcc + BYPRODUCTS ${CMAKE_BINARY_DIR}/bin/goto-gcc) + add_custom_command(TARGET goto-cc + POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E create_symlink + goto-cc $/goto-ld + BYPRODUCTS ${CMAKE_BINARY_DIR}/bin/goto-ld) + install(TARGETS goto-cc DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(CODE "execute_process( \ + COMMAND ${CMAKE_COMMAND} -E create_symlink \ + goto-cc \ + \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_BINDIR}/goto-gcc \ + )" + ) + install(CODE "execute_process( \ + COMMAND ${CMAKE_COMMAND} -E create_symlink \ + goto-cc \ + \$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 \ + \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-cc.1 \ + )" + ) + install(CODE "execute_process( \ + COMMAND ${CMAKE_COMMAND} -E create_symlink \ + cbmc.1 \ + \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-gcc.1 \ + )" + ) + install(CODE "execute_process( \ + COMMAND ${CMAKE_COMMAND} -E create_symlink \ + cbmc.1 \ + \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-ld.1 \ + )" + ) +endif() diff --git a/src/goto-diff/CMakeLists.txt b/src/goto-diff/CMakeLists.txt index a30892174eb..5366e5b671b 100644 --- a/src/goto-diff/CMakeLists.txt +++ b/src/goto-diff/CMakeLists.txt @@ -34,6 +34,6 @@ install(TARGETS goto-diff DESTINATION ${CMAKE_INSTALL_BINDIR}) install(CODE "execute_process( \ COMMAND ${CMAKE_COMMAND} -E create_symlink \ cbmc.1 \ - $ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-diff.1 \ + \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-diff.1 \ )" ) diff --git a/src/goto-diff/CMakeLists.txt.bak b/src/goto-diff/CMakeLists.txt.bak new file mode 100644 index 00000000000..8959f26507c --- /dev/null +++ b/src/goto-diff/CMakeLists.txt.bak @@ -0,0 +1,39 @@ +# Library +file(GLOB_RECURSE sources "*.cpp" "*.h") +list(REMOVE_ITEM sources + ${CMAKE_CURRENT_SOURCE_DIR}/goto_diff_main.cpp +) +add_library(goto-diff-lib ${sources}) + +generic_includes(goto-diff-lib) + +target_link_libraries(goto-diff-lib + ansi-c + cpp + linking + big-int + pointer-analysis + goto-instrument-lib + goto-programs + assembler + analyses + langapi + xml + util + solvers +) + +add_if_library(goto-diff-lib jsil) + +# Executable +add_executable(goto-diff goto_diff_main.cpp) +target_link_libraries(goto-diff goto-diff-lib) +install(TARGETS goto-diff DESTINATION ${CMAKE_INSTALL_BINDIR}) + +# 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 \ + \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-diff.1 \ + )" +) diff --git a/src/goto-harness/CMakeLists.txt b/src/goto-harness/CMakeLists.txt index c047fed252f..54c06e9b762 100644 --- a/src/goto-harness/CMakeLists.txt +++ b/src/goto-harness/CMakeLists.txt @@ -15,6 +15,6 @@ install(TARGETS goto-harness DESTINATION ${CMAKE_INSTALL_BINDIR}) install(CODE "execute_process( \ COMMAND ${CMAKE_COMMAND} -E create_symlink \ cbmc.1 \ - $ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-harness.1 \ + \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-harness.1 \ )" ) diff --git a/src/goto-harness/CMakeLists.txt.bak b/src/goto-harness/CMakeLists.txt.bak new file mode 100644 index 00000000000..f008b59de7f --- /dev/null +++ b/src/goto-harness/CMakeLists.txt.bak @@ -0,0 +1,20 @@ +file(GLOB_RECURSE sources "*.cpp" "*.h") +add_executable(goto-harness ${sources}) +generic_includes(goto-harness) + +target_link_libraries(goto-harness + util + goto-programs + goto-instrument-lib + json + json-symtab-language +) +install(TARGETS goto-harness DESTINATION ${CMAKE_INSTALL_BINDIR}) + +# 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 \ + \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-harness.1 \ + )" +) diff --git a/src/goto-instrument/CMakeLists.txt b/src/goto-instrument/CMakeLists.txt index 40650901be6..a960ab7b3b5 100644 --- a/src/goto-instrument/CMakeLists.txt +++ b/src/goto-instrument/CMakeLists.txt @@ -35,6 +35,6 @@ install(TARGETS goto-instrument DESTINATION ${CMAKE_INSTALL_BINDIR}) install(CODE "execute_process( \ COMMAND ${CMAKE_COMMAND} -E create_symlink \ cbmc.1 \ - $ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-instrument.1 \ + \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-instrument.1 \ )" ) diff --git a/src/goto-instrument/CMakeLists.txt.bak b/src/goto-instrument/CMakeLists.txt.bak new file mode 100644 index 00000000000..5f1882e5e99 --- /dev/null +++ b/src/goto-instrument/CMakeLists.txt.bak @@ -0,0 +1,40 @@ +# Library +file(GLOB_RECURSE sources "*.cpp" "*.h") +list(REMOVE_ITEM sources + ${CMAKE_CURRENT_SOURCE_DIR}/goto_instrument_main.cpp +) +add_library(goto-instrument-lib ${sources}) + +generic_includes(goto-instrument-lib) + +target_link_libraries(goto-instrument-lib + ansi-c + cpp + linking + big-int + goto-programs + goto-symex + assembler + pointer-analysis + analyses + langapi + xml + util + json + solvers +) + +add_if_library(goto-instrument-lib glpk) + +# Executable +add_executable(goto-instrument goto_instrument_main.cpp) +target_link_libraries(goto-instrument goto-instrument-lib) +install(TARGETS goto-instrument DESTINATION ${CMAKE_INSTALL_BINDIR}) + +# 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 \ + \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-instrument.1 \ + )" +) From 56b4d28bb690e5a1a3fd5b93c768759642764ebe Mon Sep 17 00:00:00 2001 From: "Mark R. Tuttle" Date: Tue, 21 Jul 2020 16:31:13 -0400 Subject: [PATCH 3/3] Remove *.bak files added when fixing cmake symlinks. --- jbmc/src/janalyzer/CMakeLists.txt.bak | 35 ------------ jbmc/src/jbmc/CMakeLists.txt.bak | 41 -------------- jbmc/src/jdiff/CMakeLists.txt.bak | 36 ------------- src/goto-analyzer/CMakeLists.txt.bak | 38 ------------- src/goto-cc/CMakeLists.txt.bak | 75 -------------------------- src/goto-diff/CMakeLists.txt.bak | 39 -------------- src/goto-harness/CMakeLists.txt.bak | 20 ------- src/goto-instrument/CMakeLists.txt.bak | 40 -------------- 8 files changed, 324 deletions(-) delete mode 100644 jbmc/src/janalyzer/CMakeLists.txt.bak delete mode 100644 jbmc/src/jbmc/CMakeLists.txt.bak delete mode 100644 jbmc/src/jdiff/CMakeLists.txt.bak delete mode 100644 src/goto-analyzer/CMakeLists.txt.bak delete mode 100644 src/goto-cc/CMakeLists.txt.bak delete mode 100644 src/goto-diff/CMakeLists.txt.bak delete mode 100644 src/goto-harness/CMakeLists.txt.bak delete mode 100644 src/goto-instrument/CMakeLists.txt.bak diff --git a/jbmc/src/janalyzer/CMakeLists.txt.bak b/jbmc/src/janalyzer/CMakeLists.txt.bak deleted file mode 100644 index b5126481e8e..00000000000 --- a/jbmc/src/janalyzer/CMakeLists.txt.bak +++ /dev/null @@ -1,35 +0,0 @@ -# Library -file(GLOB_RECURSE sources "*.cpp" "*.h") -list(REMOVE_ITEM sources - ${CMAKE_CURRENT_SOURCE_DIR}/janalyzer_main.cpp -) -add_library(janalyzer-lib ${sources}) - -generic_includes(janalyzer-lib) - -target_link_libraries(janalyzer-lib - ansi-c - java_bytecode - linking - big-int - goto-analyzer-lib - goto-programs - analyses - pointer-analysis - langapi - json - util -) - -# Executable -add_executable(janalyzer janalyzer_main.cpp) -target_link_libraries(janalyzer janalyzer-lib) -install(TARGETS janalyzer DESTINATION ${CMAKE_INSTALL_BINDIR}) - -# 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 \ - \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/janalyzer.1 \ - )" -) diff --git a/jbmc/src/jbmc/CMakeLists.txt.bak b/jbmc/src/jbmc/CMakeLists.txt.bak deleted file mode 100644 index 925ae7fdb21..00000000000 --- a/jbmc/src/jbmc/CMakeLists.txt.bak +++ /dev/null @@ -1,41 +0,0 @@ -# Library -file(GLOB_RECURSE sources "*.cpp" "*.h") -list(REMOVE_ITEM sources - ${CMAKE_CURRENT_SOURCE_DIR}/jbmc_main.cpp -) -add_library(jbmc-lib ${sources}) - -generic_includes(jbmc-lib) - -target_link_libraries(jbmc-lib - analyses - ansi-c - big-int - cbmc-lib - goto-checker - goto-instrument-lib - goto-programs - goto-symex - java_bytecode - json - langapi - linking - miniz - pointer-analysis - solvers - util - xml -) - -# Executable -add_executable(jbmc jbmc_main.cpp) -target_link_libraries(jbmc jbmc-lib) -install(TARGETS jbmc DESTINATION ${CMAKE_INSTALL_BINDIR}) - -# 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 \ - \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/jbmc.1 \ - )" -) diff --git a/jbmc/src/jdiff/CMakeLists.txt.bak b/jbmc/src/jdiff/CMakeLists.txt.bak deleted file mode 100644 index b107a17075f..00000000000 --- a/jbmc/src/jdiff/CMakeLists.txt.bak +++ /dev/null @@ -1,36 +0,0 @@ -# Library -file(GLOB_RECURSE sources "*.cpp" "*.h") -list(REMOVE_ITEM sources - ${CMAKE_CURRENT_SOURCE_DIR}/jdiff_main.cpp -) -add_library(jdiff-lib ${sources}) - -generic_includes(jdiff-lib) - -target_link_libraries(jdiff-lib - ansi-c - linking - big-int - pointer-analysis - goto-diff-lib - goto-instrument-lib - goto-programs - analyses - java_bytecode - langapi - xml - util -) - -# Executable -add_executable(jdiff jdiff_main.cpp) -target_link_libraries(jdiff jdiff-lib) -install(TARGETS jdiff DESTINATION ${CMAKE_INSTALL_BINDIR}) - -# 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 \ - \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/jdiff.1 \ - )" -) diff --git a/src/goto-analyzer/CMakeLists.txt.bak b/src/goto-analyzer/CMakeLists.txt.bak deleted file mode 100644 index 25389deb02b..00000000000 --- a/src/goto-analyzer/CMakeLists.txt.bak +++ /dev/null @@ -1,38 +0,0 @@ -# Library -file(GLOB_RECURSE sources "*.cpp" "*.h") -list(REMOVE_ITEM sources - ${CMAKE_CURRENT_SOURCE_DIR}/goto_analyzer_main.cpp -) -add_library(goto-analyzer-lib ${sources}) - -generic_includes(goto-analyzer-lib) - -target_link_libraries(goto-analyzer-lib - ansi-c - cpp - linking - big-int - goto-checker - goto-programs - analyses - pointer-analysis - langapi - json - assembler - util -) - -add_if_library(goto-analyzer-lib jsil) - -# Executable -add_executable(goto-analyzer goto_analyzer_main.cpp) -target_link_libraries(goto-analyzer goto-analyzer-lib) -install(TARGETS goto-analyzer DESTINATION ${CMAKE_INSTALL_BINDIR}) - -# 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 \ - \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-analyzer.1 \ - )" -) diff --git a/src/goto-cc/CMakeLists.txt.bak b/src/goto-cc/CMakeLists.txt.bak deleted file mode 100644 index 584dd916279..00000000000 --- a/src/goto-cc/CMakeLists.txt.bak +++ /dev/null @@ -1,75 +0,0 @@ -# Library -file(GLOB_RECURSE sources "*.cpp" "*.h") -list(REMOVE_ITEM sources - ${CMAKE_CURRENT_SOURCE_DIR}/goto_cc_main.cpp -) -add_library(goto-cc-lib ${sources}) - -generic_includes(goto-cc-lib) - -target_link_libraries(goto-cc-lib - big-int - goto-programs - util - json - linking - ansi-c - cpp - xml - assembler - langapi -) - -add_if_library(goto-cc-lib jsil) - -# Executable -add_executable(goto-cc goto_cc_main.cpp) -target_link_libraries(goto-cc goto-cc-lib) - -if(WIN32) - set_target_properties(goto-cc PROPERTIES OUTPUT_NAME goto-cl) - install(TARGETS goto-cc DESTINATION ${CMAKE_INSTALL_BINDIR}) -else() - add_custom_command(TARGET goto-cc - POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E create_symlink - goto-cc $/goto-gcc - BYPRODUCTS ${CMAKE_BINARY_DIR}/bin/goto-gcc) - add_custom_command(TARGET goto-cc - POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E create_symlink - goto-cc $/goto-ld - BYPRODUCTS ${CMAKE_BINARY_DIR}/bin/goto-ld) - install(TARGETS goto-cc DESTINATION ${CMAKE_INSTALL_BINDIR}) - install(CODE "execute_process( \ - COMMAND ${CMAKE_COMMAND} -E create_symlink \ - goto-cc \ - \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_BINDIR}/goto-gcc \ - )" - ) - install(CODE "execute_process( \ - COMMAND ${CMAKE_COMMAND} -E create_symlink \ - goto-cc \ - \$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 \ - \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-cc.1 \ - )" - ) - install(CODE "execute_process( \ - COMMAND ${CMAKE_COMMAND} -E create_symlink \ - cbmc.1 \ - \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-gcc.1 \ - )" - ) - install(CODE "execute_process( \ - COMMAND ${CMAKE_COMMAND} -E create_symlink \ - cbmc.1 \ - \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-ld.1 \ - )" - ) -endif() diff --git a/src/goto-diff/CMakeLists.txt.bak b/src/goto-diff/CMakeLists.txt.bak deleted file mode 100644 index 8959f26507c..00000000000 --- a/src/goto-diff/CMakeLists.txt.bak +++ /dev/null @@ -1,39 +0,0 @@ -# Library -file(GLOB_RECURSE sources "*.cpp" "*.h") -list(REMOVE_ITEM sources - ${CMAKE_CURRENT_SOURCE_DIR}/goto_diff_main.cpp -) -add_library(goto-diff-lib ${sources}) - -generic_includes(goto-diff-lib) - -target_link_libraries(goto-diff-lib - ansi-c - cpp - linking - big-int - pointer-analysis - goto-instrument-lib - goto-programs - assembler - analyses - langapi - xml - util - solvers -) - -add_if_library(goto-diff-lib jsil) - -# Executable -add_executable(goto-diff goto_diff_main.cpp) -target_link_libraries(goto-diff goto-diff-lib) -install(TARGETS goto-diff DESTINATION ${CMAKE_INSTALL_BINDIR}) - -# 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 \ - \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-diff.1 \ - )" -) diff --git a/src/goto-harness/CMakeLists.txt.bak b/src/goto-harness/CMakeLists.txt.bak deleted file mode 100644 index f008b59de7f..00000000000 --- a/src/goto-harness/CMakeLists.txt.bak +++ /dev/null @@ -1,20 +0,0 @@ -file(GLOB_RECURSE sources "*.cpp" "*.h") -add_executable(goto-harness ${sources}) -generic_includes(goto-harness) - -target_link_libraries(goto-harness - util - goto-programs - goto-instrument-lib - json - json-symtab-language -) -install(TARGETS goto-harness DESTINATION ${CMAKE_INSTALL_BINDIR}) - -# 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 \ - \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-harness.1 \ - )" -) diff --git a/src/goto-instrument/CMakeLists.txt.bak b/src/goto-instrument/CMakeLists.txt.bak deleted file mode 100644 index 5f1882e5e99..00000000000 --- a/src/goto-instrument/CMakeLists.txt.bak +++ /dev/null @@ -1,40 +0,0 @@ -# Library -file(GLOB_RECURSE sources "*.cpp" "*.h") -list(REMOVE_ITEM sources - ${CMAKE_CURRENT_SOURCE_DIR}/goto_instrument_main.cpp -) -add_library(goto-instrument-lib ${sources}) - -generic_includes(goto-instrument-lib) - -target_link_libraries(goto-instrument-lib - ansi-c - cpp - linking - big-int - goto-programs - goto-symex - assembler - pointer-analysis - analyses - langapi - xml - util - json - solvers -) - -add_if_library(goto-instrument-lib glpk) - -# Executable -add_executable(goto-instrument goto_instrument_main.cpp) -target_link_libraries(goto-instrument goto-instrument-lib) -install(TARGETS goto-instrument DESTINATION ${CMAKE_INSTALL_BINDIR}) - -# 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 \ - \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_MANDIR}/man1/goto-instrument.1 \ - )" -)