CMake: Remove export_private_library

furkanusta · furkanusta · commit 73d7d704c1a5 · 2020-04-30T02:06:19.000+03:00
Since we are exporting all the targets as part of the main simdjson target we do not need private
exports anymore
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -8,11 +8,9 @@ add_library(simdjson-headers INTERFACE)
 target_compile_features(simdjson-headers INTERFACE cxx_std_11) # headers require at least C++11
 target_include_directories(simdjson-headers INTERFACE
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-  $<INSTALL_INTERFACE:include/>)
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCDIR}>)
 
-install(TARGETS simdjson-headers
-        EXPORT simdjson-config
-        INCLUDES DESTINATION include)
+install(TARGETS simdjson-headers EXPORT simdjson-config INCLUDES DESTINATION include)
 install(DIRECTORY simdjson DESTINATION include FILES_MATCHING PATTERN *.h)
 install(DIRECTORY simdjson DESTINATION include FILES_MATCHING PATTERN *.hpp)
 install(FILES simdjson.h DESTINATION include)
diff --git a/simdjson-flags.cmake b/simdjson-flags.cmake
@@ -80,7 +80,6 @@ endif()
 
 option(SIMDJSON_SANITIZE "Sanitize addresses" OFF)
 if(SIMDJSON_SANITIZE)
-  # Not sure which
   target_compile_options(simdjson-flags INTERFACE -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover=all)
   target_link_libraries(simdjson-flags INTERFACE -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover=all)
 
@@ -105,14 +104,4 @@ if(${CMAKE_C_COMPILER_ID} MATCHES "Intel") # icc / icpc
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-intel")
 endif()
 
-# Workaround for https://gitlab.kitware.com/cmake/cmake/issues/15415#note_633938:
-function(export_private_library NAME)
-  install(TARGETS ${NAME}
-    EXPORT simdjson-config
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  )
-endfunction()
-
-export_private_library(simdjson-flags)
+install(TARGETS simdjson-flags EXPORT simdjson-config)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -8,7 +8,7 @@
 add_library(simdjson-include-source INTERFACE)
 target_link_libraries(simdjson-include-source INTERFACE simdjson-headers)
 target_include_directories(simdjson-include-source INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
-export_private_library(simdjson-include-source)
+install(TARGETS simdjson-include-source EXPORT simdjson-config)
 
 #
 # For callers who intend to compile simdjson.cpp themselves.
@@ -19,7 +19,7 @@ export_private_library(simdjson-include-source)
 add_library(simdjson-source INTERFACE)
 target_sources(simdjson-source INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/simdjson.cpp)
 target_link_libraries(simdjson-source INTERFACE simdjson-include-source)
-export_private_library(simdjson-source)
+install(TARGETS simdjson-source EXPORT simdjson-config)
 
 #
 # simdjson is the distributed library compiled with flags.
