Remove neopg-tool from export

das-labor · Nov 10, 2018 · ffcb56b · ffcb56b
1 parent 6fdec89
commit ffcb56b
Showing 1 changed file with 6 additions and 27 deletions.
diff --git a/neopg-tool/CMakeLists.txt b/neopg-tool/CMakeLists.txt
@@ -29,25 +29,16 @@ add_library(neopg-tool STATIC
 )
 add_library(neopg::neopg-tool ALIAS neopg-tool)
 target_include_directories(neopg-tool PUBLIC
-  $<INSTALL_INTERFACE:include>
-  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
-  $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
-  $<BUILD_INTERFACE:${SPDLOG_INCLUDE_DIR}>
-  $<BUILD_INTERFACE:${CLI11_INCLUDE_DIR}>
-  $<BUILD_INTERFACE:${RANG_INCLUDE_DIR}>
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${SPDLOG_INCLUDE_DIR}
+  ${CLI11_INCLUDE_DIR}
+  ${RANG_INCLUDE_DIR}
 )
 target_link_libraries(neopg-tool PUBLIC
   neopg::neopg
 )
 
-install(TARGETS neopg-tool
-  EXPORT neopg
-  ARCHIVE
-    DESTINATION lib
-  PUBLIC_HEADER
-    DESTINATION include
-)
-
 # NeoPG tool (binary)
 add_executable(neopg-bin
   ../legacy/gnupg/common/logging.h
@@ -255,11 +246,11 @@ target_compile_definitions(neopg-bin PRIVATE
 
 target_link_libraries(neopg-bin
   PUBLIC
-  neopg::neopg-tool
   Boost::locale
   PkgConfig::libusb-1.0
   Threads::Threads
   PRIVATE
+  neopg::neopg-tool
   neopg::gpg-error
   neopg::assuan
   neopg::gcrypt
@@ -272,18 +263,6 @@ install(TARGETS neopg-bin
   EXPORT neopg
   RUNTIME
     DESTINATION bin
-  PUBLIC_HEADER
-    DESTINATION include
-)
-
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/neopg-tool/cli
-  DESTINATION include/neopg-tool
-  FILES_MATCHING PATTERN *.h
-)
-
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/neopg-tool/io
-  DESTINATION include/neopg-tool
-  FILES_MATCHING PATTERN *.h
 )
 
 # Tests