Merge branch 'master' into merge6

Signed-off-by: Martin Bremmer <martin.bremmer@adlinktech.com>

cmake/Modules/CUnit.cmake

@@ -274,7 +274,7 @@ function(add_cunit_executable TARGET)
 
         add_test(
           NAME ${ctest}
-          COMMAND ${TARGET} -a -r "${suite}-${test}" -s ${suite} -t ${test})
+          COMMAND ${TARGET} -s ${suite} -t ${test})
         set_property(TEST ${ctest} PROPERTY TIMEOUT ${timeout})
         set_property(TEST ${ctest} PROPERTY DISABLED ${disabled})
         if(APPLE)

cmake/Modules/CUnit/src/main.c.in

@@ -222,6 +222,7 @@ int main(int argc, char *argv[])
         }
         CU_automated_run_tests();
     } else {
+        CU_set_fail_on_inactive(0);
         CU_basic_set_mode(opts.mode);
         CU_basic_run_tests();
     }

cmake/Modules/Packaging.cmake

@@ -18,20 +18,13 @@ include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 
 set(PACKAGING_MODULE_DIR "${PROJECT_SOURCE_DIR}/cmake/Modules/Packaging")
-set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}")
+set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
 
 # Generates <Package>Config.cmake.
-if(BUILD_IDLC)
-  configure_package_config_file(
-    "${PACKAGING_MODULE_DIR}/PackageConfig.cmake.in"
-    "${PROJECT_NAME}Config.cmake"
-    INSTALL_DESTINATION "${CMAKE_INSTALL_CMAKEDIR}")
-else()
-  configure_package_config_file(
-    "${PACKAGING_MODULE_DIR}/PackageConfigNoIdlc.cmake.in"
-    "${PROJECT_NAME}Config.cmake"
-    INSTALL_DESTINATION "${CMAKE_INSTALL_CMAKEDIR}")
-endif()
+configure_package_config_file(
+  "${PACKAGING_MODULE_DIR}/PackageConfig.cmake.in"
+  "${PROJECT_NAME}Config.cmake"
+  INSTALL_DESTINATION "${CMAKE_INSTALL_CMAKEDIR}")
 
 # Generates <Package>Version.cmake.
 write_basic_package_version_file(
@@ -83,11 +76,13 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/license.txt")
 #       Although that does not make sense from a technical point-of-view, it
 #       does help to clearify which settings are required for a platform.
 
-set(CPACK_COMPONENTS_ALL dev lib)
+set(CPACK_COMPONENTS_ALL dev lib idlc)
 set(CPACK_COMPONENT_LIB_DISPLAY_NAME "${PROJECT_NAME_FULL} library")
 set(CPACK_COMPONENT_LIB_DESCRIPTION  "Library used to run programs with ${PROJECT_NAME_FULL}")
 set(CPACK_COMPONENT_DEV_DISPLAY_NAME "${PROJECT_NAME_FULL} development")
 set(CPACK_COMPONENT_DEV_DESCRIPTION  "Development files for use with ${PROJECT_NAME_FULL}")
+set(CPACK_COMPONENT_IDLC_DISPLAY_NAME "${PROJECT_NAME_FULL} IDL Compiler")
+set(CPACK_COMPONENT_IDLC_DESCRIPTION  "Utility for turning IDL files into C++ source for ${PROJECT_NAME_FULL}")
 
 if(WIN32 AND NOT UNIX)
   if(CMAKE_SIZEOF_VOID_P EQUAL 8)

cmake/Modules/Packaging/PackageConfig.cmake.in

@@ -12,4 +12,27 @@
 @PACKAGE_INIT@
 
 include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/idlc/IdlcGenerate.cmake")
+option("@PROJECT_NAME@_IDLC_ALWAYS" "Should we include idlc even if the user didn't request the idlc component?" ON)
+
+set("@PROJECT_NAME@_idlc_FOUND" FALSE)
+if ("idlc" IN_LIST "@PROJECT_NAME@_FIND_COMPONENTS" OR "@PROJECT_NAME@_IDLC_ALWAYS")
+  include("${CMAKE_CURRENT_LIST_DIR}/idlc/IdlcGenerate.cmake" OPTIONAL RESULT_VARIABLE _IdlcGenerate)
+  if(NOT _IdlcGenerate STREQUAL "NOTFOUND")
+    set("@PROJECT_NAME@_idlc_FOUND" TRUE)
+  endif()
+endif()
+
+if ("${@PROJECT_NAME@_IDLC_ALWAYS}"
+  AND "${@PROJECT_NAME@_idlc_FOUND}"
+  AND (NOT "idlc" IN_LIST "@PROJECT_NAME@_FIND_COMPONENTS")
+)
+  message(AUTHOR_WARNING "\
+The IDL Compiler 'idlc' has not been requested but has been built is automatically included. \
+This will change in a future release. \
+If you need the idlc compiler, please add idlc to the COMPONENTS or OPTIONAL_COMPONENTS list in \
+find_package(@PROJECT_NAME@ ...). \
+If you don't need it, set the @PROJECT_NAME@_IDLC_ALWAYS=OFF to suppress this message .\
+")
+endif()
+
+check_required_components("@PROJECT_NAME@")

cmake/Modules/Packaging/PackageConfigNoIdlc.cmake.in

@@ -1,14 +0,0 @@
-#
-# Copyright(c) 2006 to 2018 ADLINK Technology Limited and others
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License
-# v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-@PACKAGE_INIT@
-
-include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")