Merge pull request #5460 from hannes-steffenhagen-diffblue/fix-cmake-symlink-installation

hannes-steffenhagen-diffblue · web-flow · commit 9565ffa93d68 · 2020-08-17T14:53:12.000+01:00
Fix cmake symlink installation
diff --git a/doc/man/goto-analyzer.1 b/doc/man/goto-analyzer.1
@@ -0,0 +1 @@
+cbmc.1
diff --git a/doc/man/goto-cc.1 b/doc/man/goto-cc.1
@@ -0,0 +1 @@
+cbmc.1
diff --git a/doc/man/goto-diff.1 b/doc/man/goto-diff.1
@@ -0,0 +1 @@
+cbmc.1
diff --git a/doc/man/goto-gcc.1 b/doc/man/goto-gcc.1
@@ -0,0 +1 @@
+cbmc.1
diff --git a/doc/man/goto-harness.1 b/doc/man/goto-harness.1
@@ -0,0 +1 @@
+cbmc.1
diff --git a/doc/man/goto-instrument.1 b/doc/man/goto-instrument.1
@@ -0,0 +1 @@
+cbmc.1
diff --git a/doc/man/goto-ld.1 b/doc/man/goto-ld.1
@@ -0,0 +1 @@
+cbmc.1
diff --git a/doc/man/janalyzer.1 b/doc/man/janalyzer.1
@@ -0,0 +1 @@
+cbmc.1
diff --git a/doc/man/jbmc.1 b/doc/man/jbmc.1
@@ -0,0 +1 @@
+cbmc.1
diff --git a/doc/man/jdiff.1 b/doc/man/jdiff.1
@@ -0,0 +1 @@
+cbmc.1
diff --git a/jbmc/src/janalyzer/CMakeLists.txt b/jbmc/src/janalyzer/CMakeLists.txt
@@ -25,11 +25,3 @@ target_link_libraries(janalyzer-lib
 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
@@ -31,11 +31,3 @@ target_link_libraries(jbmc-lib
 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
@@ -26,11 +26,3 @@ target_link_libraries(jdiff-lib
 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/cbmc/CMakeLists.txt b/src/cbmc/CMakeLists.txt
@@ -38,6 +38,7 @@ install(TARGETS cbmc DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 # Man page
 if(NOT WIN32)
-  install(FILES ${CMAKE_SOURCE_DIR}/doc/man/cbmc.1
-          DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+  install(
+    DIRECTORY ${CMAKE_SOURCE_DIR}/doc/man/
+    DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 endif()
diff --git a/src/goto-analyzer/CMakeLists.txt b/src/goto-analyzer/CMakeLists.txt
@@ -28,11 +28,3 @@ add_if_library(goto-analyzer-lib jsil)
 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
@@ -26,9 +26,10 @@ add_if_library(goto-cc-lib jsil)
 add_executable(goto-cc goto_cc_main.cpp)
 target_link_libraries(goto-cc goto-cc-lib)
 
+install(TARGETS goto-cc DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 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
@@ -40,36 +41,11 @@ else()
     COMMAND "${CMAKE_COMMAND}" -E create_symlink
       goto-cc $<TARGET_FILE_DIR: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 \
-    )"
-  )
+
+  install(
+    FILES
+      ${CMAKE_BINARY_DIR}/bin/goto-ld
+      ${CMAKE_BINARY_DIR}/bin/goto-gcc
+    DESTINATION
+      ${CMAKE_INSTALL_BINDIR})
 endif()
diff --git a/src/goto-diff/CMakeLists.txt b/src/goto-diff/CMakeLists.txt
@@ -29,11 +29,3 @@ add_if_library(goto-diff-lib jsil)
 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
@@ -10,11 +10,3 @@ target_link_libraries(goto-harness
   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
@@ -30,11 +30,3 @@ add_if_library(goto-instrument-lib glpk)
 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 \
-  )"
-)
