Merge branch 'dev' of https://github.com/7bitcoder/7bitDI into dev

Author: 7bitcoder

CMakeLists.txt

@@ -25,6 +25,9 @@ if(_7BIT_DI_BUILD_DOCS)
 endif()
 
 if(_7BIT_DI_BUILD_TESTS)
+        include(GoogleTest)
+        enable_testing()
+
         add_subdirectory(Tests)
 endif()
 
@@ -58,9 +61,11 @@ if(_7BIT_DI_INSTALL)
                 FILE ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_TARGETS_FILE})
 
         install(
+                EXPORT 7bitDI
                 EXPORT 7bitDI
                 DESTINATION ${EXPORT_DEST_DIR}
                 NAMESPACE 7bitDI::
+                NAMESPACE 7bitDI::
                 FILE ${CONFIG_TARGETS_FILE})
 
         include(CMakePackageConfigHelpers)
@@ -69,9 +74,8 @@ if(_7BIT_DI_INSTALL)
                 INSTALL_DESTINATION ${EXPORT_DEST_DIR})
 
         write_basic_package_version_file(${VERSIONS_CONFIG_FILE} COMPATIBILITY SameMajorVersion)
-        install(FILES ${PROJECT_CONFIG_OUT} ${VERSIONS_CONFIG_FILE} DESTINATION ${EXPORT_DEST_DIR})
 
-        include(7bitDIGeneratePkgConfig)
+        install(FILES ${PROJECT_CONFIG_OUT} ${VERSIONS_CONFIG_FILE} DESTINATION ${EXPORT_DEST_DIR})
 
         export(PACKAGE 7bitDI)
 

Cmake/7bitDI.pc.in

@@ -3,22 +3,28 @@ include(GenerateExportHeader)
 
 if(_7BIT_DI_BUILD_LIBRARY_TYPE STREQUAL "Shared")
   add_library(7bitDI SHARED
+    add_library(7bitDI SHARED
     Source.cpp ${_7BIT_DI_ALL_HEADERS}
-  )
-elseif(_7BIT_DI_BUILD_LIBRARY_TYPE STREQUAL "Static")
-  add_library(7bitDI STATIC
+    )
+    elseif(_7BIT_DI_BUILD_LIBRARY_TYPE STREQUAL "Static")
+    add_library(7bitDI STATIC
+    add_library(7bitDI STATIC
     Source.cpp ${_7BIT_DI_ALL_HEADERS}
-  )
-elseif(_7BIT_DI_BUILD_LIBRARY_TYPE STREQUAL "HeaderOnly")
-  add_library(7bitDI INTERFACE)
-endif()
+    )
+    elseif(_7BIT_DI_BUILD_LIBRARY_TYPE STREQUAL "HeaderOnly")
+    add_library(7bitDI INTERFACE)
+    add_library(7bitDI INTERFACE)
+    endif()
 
-add_library(7bitDI::7bitDI ALIAS 7bitDI)
+    add_library(7bitDI::7bitDI ALIAS 7bitDI)
+    add_library(7bitDI::7bitDI ALIAS 7bitDI)
 
-target_include_directories(
-  7bitDI INTERFACE
-  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Include>
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+    target_include_directories(
+    7bitDI INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Include>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 
-set_target_properties(7bitDI PROPERTIES VERSION ${_7BIT_DI_VERSION})
-set_target_properties(7bitDI PROPERTIES DEBUG_POSTFIX d)
+    set_target_properties(7bitDI PROPERTIES VERSION ${_7BIT_DI_VERSION})
+    set_target_properties(7bitDI PROPERTIES DEBUG_POSTFIX d)
+    set_target_properties(7bitDI PROPERTIES VERSION ${_7BIT_DI_VERSION})
+    set_target_properties(7bitDI PROPERTIES DEBUG_POSTFIX d)

Cmake/7bitDIGeneratePkgConfig.cmake

@@ -1,6 +1,3 @@
-include(GoogleTest)
-enable_testing()
-
 find_package(GTest REQUIRED)
 
 file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS *.cpp)