adjust install targets

Author: pdschubert

CMakeLists.txt

@@ -231,26 +231,28 @@ if (PHASAR_BUILD_IR)
   add_subdirectory(test)
 endif()
 
-# Install Phasar executable and libraries
-# install(TARGETS phasar-llvm
-#         RUNTIME DESTINATION bin
-#         LIBRARY DESTINATION lib
-#         ARCHIVE DESTINATION lib
-# )
+# Install targets of phasar-llvm, other executables, and libraries are to be
+# found in the individual subdirectories of tools/
+
 # Install Phasar include directory
 install(DIRECTORY include/
   DESTINATION include
-  FILES_MATCHING PATTERN "*.h"
+  FILES_MATCHING
+  PATTERN "*.def"
+  PATTERN "*.h"
 )
+
 # Install the header only json container
 install(DIRECTORY external/json/single_include/nlohmann/
   DESTINATION include
   FILES_MATCHING PATTERN "*.hpp"
 )
+
 # Install the gtest header files (TODO this installation dependency should be eliminated)
 install(DIRECTORY external/googletest/googletest/include/gtest/
   DESTINATION include/gtest
 )
+
 # Install Phasar utils helper scripts
 install(DIRECTORY utils/
   DESTINATION bin
@@ -259,6 +261,7 @@ install(DIRECTORY utils/
               GROUP_EXECUTE GROUP_READ
               WORLD_EXECUTE WORLD_READ
 )
+
 # Install the Phasar config files into ~/.config/phasar/
 install(DIRECTORY config/
   DESTINATION $ENV{HOME}/.config/phasar

tools/example-tool/CMakeLists.txt

@@ -38,7 +38,6 @@ target_link_libraries(myphasartool
   ${CMAKE_THREAD_LIBS_INIT}
   ${CLANG_LIBRARIES}
   ${llvm_libs}
-  gtest
 )
 
 if(NOT PHASAR_IN_TREE)
@@ -50,3 +49,9 @@ endif()
 
 set(LLVM_LINK_COMPONENTS
 )
+
+install(TARGETS myphasartool
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)

tools/example-tool/myphasartool.cpp

@@ -32,7 +32,9 @@ int main(int argc, const char **argv) {
   auto &lg = lg::get();
   if (argc < 2 || !boost::filesystem::exists(argv[1]) ||
       boost::filesystem::is_directory(argv[1])) {
-    std::cerr << "usage: <prog> <ir file>\n";
+    std::cerr << "myphasartool\n"
+                 "A small PhASAR-based example program\n\n"
+                 "Usage: myphasartool <LLVM IR file>\n";
     return 1;
   }
   initializeLogger(false);

tools/phasar-llvm/CMakeLists.txt

@@ -52,3 +52,9 @@ endif()
 
 set(LLVM_LINK_COMPONENTS
 )
+
+install(TARGETS phasar-llvm
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)

tools/phasar-llvm/phasar-llvm.cpp

@@ -238,7 +238,8 @@ int main(int argc, const char **argv) {
     Strategy = AnalysisStrategy::WholeProgram;
   }
   if (!PhasarConfig::VariablesMap().count("module")) {
-    std::cout << "At least on LLVM target module is required!\n";
+    std::cout << "At least on LLVM target module is required!\n"
+                 "Specify a LLVM target module or re-run with '--help'\n";
     return 0;
   }
   ProjectIRDB IRDB(