Bar: use add_cxx_library

Author: Mizux

Bar/CMakeLists.txt

@@ -1,33 +1,14 @@
-add_library(Bar)
-target_sources(Bar
-  PRIVATE
+add_cxx_library(
+  NAME
+    Bar
+  HEADERS
     include/bar/Bar.hpp
-    src/Bar.cpp)
-target_include_directories(Bar
-  PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>)
-target_compile_features(Bar PUBLIC cxx_std_20)
-set_target_properties(Bar PROPERTIES
-  VERSION ${PROJECT_VERSION}
-  POSITION_INDEPENDENT_CODE ON
-  PUBLIC_HEADER include/bar/Bar.hpp)
-if(APPLE)
-  set_target_properties(Bar PROPERTIES INSTALL_RPATH "@loader_path")
-elseif(UNIX)
-  set_target_properties(Bar PROPERTIES INSTALL_RPATH "$ORIGIN")
-endif()
-target_link_libraries(Bar PRIVATE absl::log)
-add_library(${PROJECT_NAMESPACE}::Bar ALIAS Bar)
+  SOURCES
+    src/Bar.cpp
+  LINK_LIBRARIES
+    absl::log
+  INSTALL_DIR
+    bar
+)
 
 add_subdirectory(tests)
-
-# Install
-include(GNUInstallDirs)
-install(TARGETS Bar
-  EXPORT ${PROJECT_NAME}Targets
-  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bar
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  #RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)

cmake/cpp.cmake

@@ -128,6 +128,8 @@ endfunction()
 # add_cxx_library(
 #   NAME
 #     foo
+#   HEADERS
+#     foo.h
 #   SOURCES
 #     foo.cc
 #     ${PROJECT_SOURCE_DIR}/Foo/foo.cc
@@ -140,9 +142,9 @@ endfunction()
 # )
 function(add_cxx_library)
   set(options "TESTING")
-  set(oneValueArgs "NAME;TYPE")
+  set(oneValueArgs "NAME;TYPE;INSTALL_DIR")
   set(multiValueArgs
-    "SOURCES;COMPILE_DEFINITIONS;COMPILE_OPTIONS;LINK_LIBRARIES;LINK_OPTIONS")
+    "HEADERS;SOURCES;COMPILE_DEFINITIONS;COMPILE_OPTIONS;LINK_LIBRARIES;LINK_OPTIONS")
   cmake_parse_arguments(LIBRARY
     "${options}"
     "${oneValueArgs}"
@@ -163,29 +165,46 @@ function(add_cxx_library)
 
   add_library(${LIBRARY_NAME} ${LIBRARY_TYPE} "")
   if(LIBRARY_TYPE STREQUAL "INTERFACE")
-    target_include_directories(${LIBRARY_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+    target_include_directories(${LIBRARY_NAME} INTERFACE
+      ${CMAKE_CURRENT_SOURCE_DIR}/include)
     target_link_libraries(${LIBRARY_NAME} INTERFACE ${LIBRARY_LINK_LIBRARIES})
+    target_link_options(${LIBRARY_NAME} INTERFACE ${LIBRARY_LINK_OPTIONS})
   else()
-    target_sources(${LIBRARY_NAME} PRIVATE ${LIBRARY_SOURCES})
-    target_include_directories(${LIBRARY_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+    target_include_directories(${LIBRARY_NAME} PUBLIC
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+      $<INSTALL_INTERFACE:include>)
+    )
+    target_sources(${LIBRARY_NAME} PRIVATE
+      ${LIBRARY_HEADERS}
+      ${LIBRARY_SOURCES}
+    )
     target_compile_definitions(${LIBRARY_NAME} PRIVATE ${LIBRARY_COMPILE_DEFINITIONS})
     target_compile_features(${LIBRARY_NAME} PRIVATE cxx_std_20)
     target_compile_options(${LIBRARY_NAME} PRIVATE ${LIBRARY_COMPILE_OPTIONS})
     target_link_libraries(${LIBRARY_NAME} PUBLIC ${LIBRARY_LINK_LIBRARIES})
     target_link_options(${LIBRARY_NAME} PRIVATE ${LIBRARY_LINK_OPTIONS})
   endif()
+  set_target_properties(${LIBRARY_NAME} PROPERTIES
+    VERSION ${PROJECT_VERSION}
+    POSITION_INDEPENDENT_CODE ON
+    PUBLIC_HEADER ${LIBRARY_HEADERS}
+  )
 
-  include(GNUInstallDirs)
   if(APPLE)
-    set_target_properties(${LIBRARY_NAME} PROPERTIES
-      INSTALL_RPATH "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
+    set_target_properties(${LIBRARY_NAME} PROPERTIES INSTALL_RPATH "@loader_path")
   elseif(UNIX)
-    cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR
-      BASE_DIRECTORY ${CMAKE_INSTALL_FULL_BINDIR}
-      OUTPUT_VARIABLE libdir_relative_path)
-    set_target_properties(${LIBRARY_NAME} PROPERTIES
-      INSTALL_RPATH "$ORIGIN/${libdir_relative_path}:$ORIGIN")
+    set_target_properties(${LIBRARY_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN")
   endif()
+
+  # Install
+  include(GNUInstallDirs)
+  install(TARGETS ${LIBRARY_NAME}
+    EXPORT ${PROJECT_NAME}Targets
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${LIBRARY_INSTALL_DIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    #RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  )
   add_library(${PROJECT_NAMESPACE}::${LIBRARY_NAME} ALIAS ${LIBRARY_NAME})
   message(STATUS "Configuring library ${LIBRARY_NAME} ...DONE")
 endfunction()