Can be installed as CppUnit for drop in replacement (#38)

Author: OlekRaymond

CMakeLists.txt

@@ -8,9 +8,14 @@ project(
 
 option(build_testing "Should we build our examples and tests" OFF)
 option(EnableMainHelperClasses 
-        "Aims to allow for drop in replacement. Users should prefer refactoring the main function"
-       OFF)
-option(InstallAsCppUnit "Install the package as 'cppunit' to allow drop-in replacement" OFF)
+       "Aims to allow for drop in replacement. Users should prefer refactoring the main function"
+       OFF
+    )
+
+option(InstallAsCppUnit 
+       "Install the package as 'cppunit' to allow drop-in replacement"
+       OFF
+    )
 
 if(build_testing)
     enable_testing()
@@ -66,6 +71,36 @@ install(
     DESTINATION "share/cmake/${PROJECT_NAME}"
 )
 
+if (InstallAsCppUnit) 
+    message(STATUS "CppUnit2Gtest will be installed as 'cppunit' to allow drop-in replacement")
+    add_library(cppunit ALIAS CppUnit2Gtest)
+    add_library(CppUnit ALIAS CppUnit2Gtest)
+    install(
+        FILES
+            "${CMAKE_CURRENT_BINARY_DIR}/CppUnitConfig.cmake"
+            "${CMAKE_CURRENT_BINARY_DIR}/CppUnitConfigVersion.cmake"
+        DESTINATION "share/cmake/CppUnit"
+    )
+    install(TARGETS CppUnit2Gtest
+        EXPORT CppUnitTargets
+        INCLUDES DESTINATION include
+    )
+    install(EXPORT CppUnitTargets
+        FILE CppUnitTargets.cmake
+        NAMESPACE CppUnit::
+        DESTINATION "share/cmake/CppUnit"
+    )
+    configure_package_config_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in
+        "${CMAKE_CURRENT_BINARY_DIR}/CppUnitConfig.cmake"
+        INSTALL_DESTINATION "share/cmake/CppUnit"
+    )
+    write_basic_package_version_file(
+        CppUnitConfigVersion.cmake
+        VERSION ${PACKAGE_VERSION}
+        COMPATIBILITY AnyNewerVersion
+    )
+endif() 
 # install the header as expected
 install(
     FILES "${CMAKE_CURRENT_SOURCE_DIR}/CppUnit2Gtest.hpp"
@@ -85,7 +120,7 @@ create_header_alias(\${SOURCE_FILE} \${INSTALL_INCLUDE_DIR}/cppunit/config/Sourc
 create_header_alias(\${SOURCE_FILE} \${INSTALL_INCLUDE_DIR}/cppunit/TestAssert.h)
 ")
 if (EnableMainHelperClasses)
-install(CODE "
+    install(CODE "
 set(INSTALL_INCLUDE_DIR \${CMAKE_INSTALL_PREFIX}/include)
 set(SOURCE_FILE CppUnit2Gtest.hpp)
 include(tests/CreateSymlink.cmake)

tests/CMakeLists.txt

@@ -17,12 +17,25 @@ option(BuildUnityTests
 option(MutationTesting "Experimental, for mutation testing" OFF)
 option(BuildExternalTests "Build and add tests from external libs" OFF)
 
-if (NOT (BuildExamples OR BuildInternalTests OR BuildUnityTests))
+if (NOT (BuildExamples OR BuildInternalTests OR BuildUnityTests OR BuildExternalTests))
     message(FATAL_ERROR "Asked to build tests but no tests were given")
 endif()
 
-set(CMAKE_CXX_STANDARD 17)
+
+if (BuildExternalTests)
+    if(NOT EnableMainHelperClasses)
+        message(FATAL_ERROR "EnableMainHelperClasses must be set for external tests")
+    endif()
+    message(STATUS "Building external tests")
+    if (build_testing)
+        message(WARNING "Building external tests with internal package, not recommended")
+    endif()
+    add_subdirectory(external_tests)
+endif()
+
+
 if (BuildExamples)
+    set(CMAKE_CXX_STANDARD 17)
     list(APPEND CppUnitFiles
         "examples/Money.cpp"
         "examples/Simple.cpp"
@@ -87,7 +100,13 @@ if (BuildUnityTests)
     )
 endif()
 
+# If no files are added (external tests only) skip!
+if (NOT CppUnitFiles)
+    return()
+endif()
+
 include(GetGtest.cmake)
+
 add_executable(${PROJECT_NAME} ${CppUnitFiles})
 target_link_libraries(${PROJECT_NAME} PRIVATE GTest::GTest GTest::Main)
 
@@ -129,17 +148,6 @@ else()
     )
 endif()
 
-if (BuildExternalTests)
-    if(NOT EnableMainHelperClasses)
-        message(FATAL_ERROR "EnableMainHelperClasses must be set for external tests")
-    endif()
-    message(STATUS "Building external tests")
-    if (build_testing)
-        message(WARNING "Building external tests with internal package, not recommended")
-    endif()
-    add_subdirectory(external_tests)
-endif()
-
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
 # The gtest find tests function doesn't work because it relies on regex expressions
 #  We have tests that look like CppUnit so it won't add them.

tests/external_tests/CMakeLists.txt

@@ -13,9 +13,14 @@ if (NOT TARGET CppUnit2Gtest::CppUnit2Gtest)
     find_package(CppUnit2Gtest REQUIRED)
 endif()
 
-# Alias it to have CMake understand
 if (NOT TARGET cppunit)
-    add_library(cppunit ALIAS CppUnit2Gtest::CppUnit2Gtest)
+    set(cppunit_ROOT ${CppUnit2Gtest_ROOT})
+    set(CppUnit_ROOT ${CppUnit2Gtest_ROOT})
+    set(CPPUNIT_ROOT ${CppUnit2Gtest_ROOT})
+    # less likely to help
+    set(cppunit_DIR ${CppUnit2Gtest_DIR})
+    set(CppUnit_DIR ${CppUnit2Gtest_DIR})
+    set(CPPUNIT_DIR ${CppUnit2Gtest_DIR})
 endif()
 
 # Tests