From 808def38451b7b15ec06fc2e22bfa76b46130709 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 12 Dec 2022 19:29:21 -0700 Subject: [PATCH 01/78] Automatic snapshot commit from tribits at 07aeef0f Origin repo remote tracking branch: 'github/master' Origin repo remote repo URL: 'github = git@github.com:TriBITSPub/TriBITS.git' Git describe: Vera4.0-RC1-start-1400-g07aeef0f At commit: commit 07aeef0f9f10d928b614214c1c8b38af0eecc6d4 Author: Roscoe A. Bartlett Date: Mon Dec 12 19:20:48 2022 -0700 Summary: Remove assert of local matches cache export var (#551) --- cmake/tribits/CHANGELOG.md | 51 +- .../ci_support/TribitsDumpDepsXmlScript.cmake | 4 +- .../TribitsWriteXmlDependenciesFiles.cmake | 283 ++- cmake/tribits/common_tpls/FindTPLHDF5.cmake | 141 +- .../FindTPLLAPACKDependencies.cmake | 2 + cmake/tribits/common_tpls/FindTPLNetcdf.cmake | 211 +- .../FindTPLNetcdfDependencies.cmake | 2 + .../TribitsPackageConfigTemplate.cmake.in | 23 +- .../TribitsProjectConfigTemplate.cmake.in | 14 - .../package_arch/TribitsAddAdvancedTest.cmake | 11 +- .../package_arch/TribitsAddExecutable.cmake | 7 +- .../TribitsAddExecutableAndTest.cmake | 17 + .../core/package_arch/TribitsAddLibrary.cmake | 9 +- .../core/package_arch/TribitsAddTest.cmake | 9 +- .../package_arch/TribitsAddTestHelpers.cmake | 4 +- .../TribitsAdjustPackageEnables.cmake | 2251 ++++++----------- ...ribitsExternalPackageWriteConfigFile.cmake | 46 +- .../package_arch/TribitsGeneralMacros.cmake | 200 +- .../TribitsGetEnabledSublists.cmake | 163 ++ .../TribitsGetPackageEnableStatus.cmake | 134 + .../package_arch/TribitsGlobalMacros.cmake | 87 +- .../TribitsIncludeDirectories.cmake | 12 +- .../package_arch/TribitsListHelpers.cmake | 11 +- .../TribitsPackageDependencies.cmake | 17 +- .../package_arch/TribitsPackageMacros.cmake | 5 +- .../TribitsPkgExportCacheVars.cmake | 2 +- .../TribitsPrintDependencyInfo.cmake | 102 +- .../TribitsPrintEnabledPackagesLists.cmake | 33 +- .../TribitsProcessEnabledTpl.cmake | 8 +- .../TribitsProcessPackagesAndDirsLists.cmake | 63 +- .../TribitsProcessTplsLists.cmake | 10 +- .../package_arch/TribitsProjectImpl.cmake | 2 +- ...adAllProjectDepsFilesCreateDepsGraph.cmake | 9 - .../TribitsReadDepsFilesCreateDepsGraph.cmake | 545 ++-- .../TribitsReportInvalidTribitsUsage.cmake | 25 +- .../TribitsSetUpEnabledOnlyDependencies.cmake | 237 ++ ...itsSystemDataStructuresMacrosFunctions.rst | 109 +- .../package_arch/TribitsTestCategories.cmake | 3 +- .../TribitsTplDeclareLibraries.cmake | 7 +- ...ribitsTplFindIncludeDirsAndLibraries.cmake | 7 +- .../TribitsWriteClientExportFiles.cmake | 143 +- .../tribits/core/utils/AppendStringVar.cmake | 3 + .../core/utils/ParseVariableArguments.cmake | 10 +- .../core/utils/TribitsAddEnumCacheVar.cmake | 89 + .../core/utils/TribitsCreateReverseList.cmake | 52 + .../core/utils/TribitsDeprecatedHelpers.cmake | 115 + .../TribitsCTestDriverCoreHelpers.cmake | 4 +- .../build_ref/TribitsBuildReferenceBody.rst | 304 ++- .../EnableAllPackages.txt | 9 +- .../EnableThyraEpetra_EnableTests.txt | 7 +- .../EnableThyra_EnableTests.txt | 7 +- ...EnableThyra_EnableTests_EnableBoost_ST.txt | 45 +- ...nableTests_EnableBoost_ST_RequiredOnly.txt | 42 +- .../ExpectedDependencies.txt | 105 +- .../guides/TribitsCoreDetailedReference.rst | 31 +- .../tribits/doc/guides/TribitsGuidesBody.rst | 97 +- .../TribitsSystemMacroFunctionDocTemplate.rst | 10 +- .../guides/UtilsMacroFunctionDocTemplate.rst | 4 + .../guides/users_guide/TribitsUsersGuide.rst | 2 + .../examples/MockTrilinos/TPLsList.cmake | 1 + .../TPLs/FindTPLLAPACKDependencies.cmake | 2 + .../TPLs/FindTPLParMETISDependencies.cmake | 2 + .../TPLs/FindTPLSuperLUDependencies.cmake | 2 + .../TPLs/FindTPLSuperLUDistDependencies.cmake | 2 + .../packages/zoltan/cmake/Dependencies.cmake | 8 +- .../ReducedMockTrilinos/TPLsList.cmake | 8 +- .../DependsOnLAPACK/PackagesList.cmake | 3 + .../extraRepos/DependsOnLAPACK/TPLsList.cmake | 1 + .../DependsOnLAPACK/cmake/Dependencies.cmake | 3 + .../TribitsExampleApp/AppHelperFuncs.cmake | 3 +- .../TribitsOldSimpleExampleApp/CMakeLists.txt | 5 +- .../TribitsSimpleExampleApp/CMakeLists.txt | 2 +- 72 files changed, 3090 insertions(+), 2907 deletions(-) create mode 100644 cmake/tribits/common_tpls/FindTPLLAPACKDependencies.cmake create mode 100644 cmake/tribits/common_tpls/FindTPLNetcdfDependencies.cmake create mode 100644 cmake/tribits/core/package_arch/TribitsGetEnabledSublists.cmake create mode 100644 cmake/tribits/core/package_arch/TribitsGetPackageEnableStatus.cmake create mode 100644 cmake/tribits/core/package_arch/TribitsSetUpEnabledOnlyDependencies.cmake create mode 100644 cmake/tribits/core/utils/TribitsAddEnumCacheVar.cmake create mode 100644 cmake/tribits/core/utils/TribitsCreateReverseList.cmake create mode 100644 cmake/tribits/core/utils/TribitsDeprecatedHelpers.cmake create mode 100644 cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLLAPACKDependencies.cmake create mode 100644 cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLParMETISDependencies.cmake create mode 100644 cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDependencies.cmake create mode 100644 cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDistDependencies.cmake create mode 100644 cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/PackagesList.cmake create mode 100644 cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/TPLsList.cmake create mode 100644 cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/cmake/Dependencies.cmake diff --git a/cmake/tribits/CHANGELOG.md b/cmake/tribits/CHANGELOG.md index 144bb070dce2..5b1147d3391e 100644 --- a/cmake/tribits/CHANGELOG.md +++ b/cmake/tribits/CHANGELOG.md @@ -2,6 +2,56 @@ ChangeLog for TriBITS ---------------------------------------- +## 2022-10-20: + +* **Changed:** Disabling an external package/TPL will now disable any + downstream external packages/TPLs that list a dependency on that external + package/TPL through its + [`FindTPLDependencies.cmake`](https://tribitspub.github.io/TriBITS/users_guide/index.html#findtpl-tplname-dependencies-cmake) + file. Prior to this, disabling an external package/TPL would not disable + dependent downstream external packages/TPLs (it would only disable + downstream dependent required internal packages). To avoid this, simply + leave the enable status of the upstream external package/TPL empty "" and no + downstream propagation of disables will take place. + +## 2022-10-16: + +* **Removed:** Removed the variables `_LIBRARY_DIRS`, + `_TPL_LIST` and `_TPL_LIBRARIES` from the installed + `Config.cmake` file. These are not needed after the change to + modern CMake targets `::all_libs` (see `::all_libs` + below). To determine if a TPL is enabled, check `if (TARGET + ::all_libs)`. To get the libraries and include dirs for a TPL, + link against the IMPORTED target `::all_libs` (see the updated + TriBITS example APP projects for details). + +* **Removed:** Removed the variables `_PACKAGE_LIST`, + `_TPL_LIST`, `_INCLUDE_DIR`, `_LIBRARY_DIRS`, + `_TPL_INCLUDE_DIRS`, `_TPL_LIBRARIES` and + `_TPL_LIBRARY_DIRS` from the generated `Config.cmake` + files. These are not needed with the move to modern CMake targets (see + `::all_libs` below). + +* **Changed:** Changed `_LIBRARIES` in generated + `Config.cmake` files from the full list of the package's library + targets to just `::all_libs`. (There is no need to list the + individual libraries after the move to modern CMake targets.) + +## 2022-10-11: + +* **Changed:** Added option `_ASSERT_DEFINED_DEPENDENCIES` to + determine if listed external package/TPL and internal package dependencies + are defined within the project or not. The initial default is `FATAL_ERROR` + for development mode and `IGNORE` for release mode. (Previously, undefined + external package/TPL dependencies where ignore.) To set a different + default, set `_ASSERT_DEFINED_DEPENDENCIES_DEFAULT` to `WARNING`, + for example, in the project's `ProjectName.cmake` file. + +* **Removed:** `_ASSERT_MISSING_PACKAGES` has been removed and setting + it will result in a `FATAL_ERROR`. Instead, use + `_ASSERT_DEFINED_DEPENDENCIES` (and make sure all of your project's + listed TPL dependencies are all defined within the project). + ## 2022-10-02: * **Changed:** The TriBITS FindTPLCUDA.cmake module changed @@ -11,7 +61,6 @@ ChangeLog for TriBITS `find_package(CUDAToolkit)` (see [Trilinos #10954](https://github.com/trilinos/Trilinos/issues/10954)). - ## 2022-09-16: * **Changed:** Changed nomenclature for packages and TPLs (see updated diff --git a/cmake/tribits/ci_support/TribitsDumpDepsXmlScript.cmake b/cmake/tribits/ci_support/TribitsDumpDepsXmlScript.cmake index 771c2e6dcd31..5c926e9023f6 100644 --- a/cmake/tribits/ci_support/TribitsDumpDepsXmlScript.cmake +++ b/cmake/tribits/ci_support/TribitsDumpDepsXmlScript.cmake @@ -116,8 +116,8 @@ include(TribitsWriteXmlDependenciesFiles) # Generate the dependencies file -set(${PROJECT_NAME}_ASSERT_MISSING_PACKAGES FALSE) -set(${PROJECT_NAME}_OUTPUT_DEPENDENCY_FILES FALSE) +set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES OFF) +set(${PROJECT_NAME}_OUTPUT_DEPENDENCY_FILES FALSE) if (NOT ${PROJECT_NAME}_PRE_REPOSITORIES) # Make sure is defined! set(${PROJECT_NAME}_PRE_REPOSITORIES "") endif() diff --git a/cmake/tribits/ci_support/TribitsWriteXmlDependenciesFiles.cmake b/cmake/tribits/ci_support/TribitsWriteXmlDependenciesFiles.cmake index 4050ba3e5060..1091008e3c01 100644 --- a/cmake/tribits/ci_support/TribitsWriteXmlDependenciesFiles.cmake +++ b/cmake/tribits/ci_support/TribitsWriteXmlDependenciesFiles.cmake @@ -38,172 +38,215 @@ # @HEADER -# -# This file gets included in the main TriBITS framework. It is put here to -# reduce the size of the tribits/core/ directory. -# - - -function(tribits_write_deps_to_xml_string PACKAGE_NAME LIST_TYPE - XML_VAR - ) - - set(LOC_XML "${${XML_VAR}}") - - set(DEPS_VAR ${PACKAGE_NAME}_${LIST_TYPE}) - assert_defined(DEPS_VAR) - set(DEPS ${${DEPS_VAR}}) - - #print_var(PACKAGE_NAME) - #print_var(DEPS) +################################################################################ +# NOTE: This file gets included in the main TriBITS core framework. It is put +# here to reduce the size of the tribits/core/ directory as this is optional +# behavior. +################################################################################ - if (NOT DEPS) - list(APPEND LOC_XML - " <${LIST_TYPE}/>\n" ) - - else() - - set(VALUE_STR "") - - foreach(DEP ${DEPS}) - - if(VALUE_STR) - set(VALUE_STR "${VALUE_STR},") - endif() +# @MACRO: tribits_write_xml_dependency_files() +# +# Usage:: +# +# tribits_write_xml_dependency_files() +# +# Macro that outputs XML dependency files if asked based in the global project +# package dependency graph previously constructed. +# +macro(tribits_write_xml_dependency_files) - set(VALUE_STR "${VALUE_STR}${DEP}") + tribits_config_code_start_timer(WRITE_DEPENDENCY_FILES_TIME_START_SECONDS) - endforeach() + if (${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE) + if (NOT IS_ABSOLUTE ${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE}) + set(${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE + ${CMAKE_CURRENT_BINARY_DIR}/${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE}) + endif() + message("" ) + message("Dumping the XML dependencies file" + " ${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} ..." ) + tribits_dump_deps_xml_file() + endif() - list(APPEND LOC_XML - " <${LIST_TYPE} value=\"${VALUE_STR}\"/>\n" ) + if (${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE AND ${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE) + if (NOT IS_ABSOLUTE ${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE}) + set(${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE + ${CMAKE_CURRENT_BINARY_DIR}/${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE}) + endif() + message("" ) + message("Dumping the HTML dependencies webpage file" + " ${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE} ..." ) + set(tribitsCiSupportDir "${${PROJECT_NAME}_TRIBITS_DIR}/${TRIBITS_CI_SUPPORT_DIR}") + execute_process( + COMMAND ${PYTHON_EXECUTABLE} + ${tribitsCiSupportDir}/dump-package-dep-table.py + --input-xml-deps-file=${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} + --output-html-deps-file=${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE} ) + endif() + if (${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE AND ${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE) + if (NOT IS_ABSOLUTE ${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE}) + set(${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE + ${CMAKE_CURRENT_BINARY_DIR}/${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE}) + endif() + message("" ) + message("Dumping the CDash XML dependencies file" + " ${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE} ..." ) + set(tribitsCtestDriverDir + "${${PROJECT_NAME}_TRIBITS_DIR}/${TRIBITS_CTEST_DRIVER_DIR}") + if (EXISTS "${tribitsCtestDriverDir}") + execute_process( + COMMAND ${PYTHON_EXECUTABLE} + ${tribitsCtestDriverDir}/dump-cdash-deps-xml-file.py + --input-xml-deps-file=${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} + --output-cdash-deps-xml-file=${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE}) + else() + message(FATAL_ERROR "\nERROR: Can't write" + " ${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE}" + " because '${tribitsCtestDriverDir}' does not exist!") + endif() endif() - if (LOC_XML) - set(${XML_VAR} "${LOC_XML}" PARENT_SCOPE) + if (${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE + OR ${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE + OR ${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE + ) + tribits_config_code_stop_timer(WRITE_DEPENDENCY_FILES_TIME_START_SECONDS + "\nTotal time to write dependency files") endif() -endfunction() +endmacro() +# Function that writes the dependency information for the TriBITS project +# ${PROJECT_NAME} into an XML file for other tools to use. # -# Function that writes the dependency information for ${PROJECT_NAME} into -# an XML file for other tools to use. -# - function(tribits_dump_deps_xml_file) - set(DEPS_XM) + set(depsXml "") get_filename_component(PROJECT_BASE_DIR_NAME "${${PROJECT_NAME}_SOURCE_DIR}" NAME) - list(APPEND DEPS_XML + list(APPEND depsXml "\n" ) - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) + foreach(tribitsPackage ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) - #message("") - #print_var(TRIBITS_PACKAGE) + list(APPEND depsXml + " \n") - list(APPEND DEPS_XML - " \n") + tribits_write_deps_to_xml_string(${tribitsPackage} LIB REQUIRED PACKAGES depsXml) + tribits_write_deps_to_xml_string(${tribitsPackage} LIB OPTIONAL PACKAGES depsXml) + tribits_write_deps_to_xml_string(${tribitsPackage} TEST REQUIRED PACKAGES depsXml) + tribits_write_deps_to_xml_string(${tribitsPackage} TEST OPTIONAL PACKAGES depsXml) + tribits_write_deps_to_xml_string(${tribitsPackage} LIB REQUIRED TPLS depsXml) + tribits_write_deps_to_xml_string(${tribitsPackage} LIB OPTIONAL TPLS depsXml) + tribits_write_deps_to_xml_string(${tribitsPackage} TEST REQUIRED TPLS depsXml) + tribits_write_deps_to_xml_string(${tribitsPackage} TEST OPTIONAL TPLS depsXml) - tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} LIB_REQUIRED_DEP_PACKAGES DEPS_XML) - tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} LIB_OPTIONAL_DEP_PACKAGES DEPS_XML) - tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} TEST_REQUIRED_DEP_PACKAGES DEPS_XML) - tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} TEST_OPTIONAL_DEP_PACKAGES DEPS_XML) - tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} LIB_REQUIRED_DEP_TPLS DEPS_XML) - tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} LIB_OPTIONAL_DEP_TPLS DEPS_XML) - tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} TEST_REQUIRED_DEP_TPLS DEPS_XML) - tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} TEST_OPTIONAL_DEP_TPLS DEPS_XML) - - list(APPEND DEPS_XML + list(APPEND depsXml " \n" - " \n" + " \n" " \n" ) - list(APPEND DEPS_XML - " \n" + list(APPEND depsXml + " \n" ) - list(APPEND DEPS_XML + list(APPEND depsXml " \n" ) endforeach() - list(APPEND DEPS_XML + list(APPEND depsXml "\n" ) - #print_var(DEPS_XML) - string(REPLACE "\n;" "\n" DEPS_XML "${DEPS_XML}") - file(WRITE ${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} "${DEPS_XML}" ) + string(REPLACE "\n;" "\n" depsXml "${depsXml}") + file(WRITE ${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} "${depsXml}" ) endfunction() -# @MACRO: tribits_write_xml_dependency_files() -# -# Usage:: -# -# tribits_write_xml_dependency_files() -# -# Macro that output XML dependency files if asked based in the global project -# package dependency graph previously constructed.. -# -macro(tribits_write_xml_dependency_files) +function(tribits_write_deps_to_xml_string packageName libOrTest requiredOrOptional + packagesOrTpls xmlVarInOut + ) - tribits_config_code_start_timer(WRITE_DEPENDENCY_FILES_TIME_START_SECONDS) + set(localXml "${${xmlVarInOut}}") - #print_var(${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE) - if (${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE) - if (NOT IS_ABSOLUTE ${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE}) - set(${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE - ${CMAKE_CURRENT_BINARY_DIR}/${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE}) - endif() - message("" ) - message("Dumping the XML dependencies file ${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} ..." ) - tribits_dump_deps_xml_file() + set(listType ${libOrTest}_${requiredOrOptional}_DEP_${packagesOrTpls}) + message("") + print_var(listType) + + tribits_get_legacy_package_deps_sublist(${packageName} ${libOrTest} + ${requiredOrOptional} ${packagesOrTpls} legacyPackageDepsList) + + if (NOT legacyPackageDepsList) + list(APPEND localXml + " <${listType}/>\n" ) + else() + set(depsListStr "") + foreach(depPkg IN LISTS legacyPackageDepsList) + tribits_append_dep_to_xml_string(${depPkg} depsListStr) + endforeach() + list(APPEND localXml + " <${listType} value=\"${depsListStr}\"/>\n" ) endif() - #print_var(${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE) - if (${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE AND ${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE) - if (NOT IS_ABSOLUTE ${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE}) - set(${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE - ${CMAKE_CURRENT_BINARY_DIR}/${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE}) - endif() - message("" ) - message("Dumping the HTML dependencies webpage file ${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE} ..." ) - execute_process( - COMMAND ${PYTHON_EXECUTABLE} - ${${PROJECT_NAME}_TRIBITS_DIR}/${TRIBITS_CI_SUPPORT_DIR}/dump-package-dep-table.py - --input-xml-deps-file=${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} - --output-html-deps-file=${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE} ) + if (localXml) + set(${xmlVarInOut} "${localXml}" PARENT_SCOPE) endif() - #print_var(${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE) - if (${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE AND ${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE) - if (NOT IS_ABSOLUTE ${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE}) - set(${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE}) +endfunction() + + +function(tribits_get_legacy_package_deps_sublist packageName libOrTest + requiredOrOptional packagesOrTpls legacyPackageDepsListOut + ) + + set(legacyPackageDepsList "") + + foreach(depPkg IN LISTS ${packageName}_${libOrTest}_DEFINED_DEPENDENCIES) + + set(matchesRequriedOrOptional FALSE) + if (((requiredOrOptional STREQUAL "REQUIRED") + AND ${packageName}_${libOrTest}_DEP_REQUIRED_${depPkg}) + OR + ((requiredOrOptional STREQUAL "OPTIONAL") + AND (NOT ${packageName}_${libOrTest}_DEP_REQUIRED_${depPkg})) + ) + set(matchesRequriedOrOptional TRUE) endif() - message("" ) - message("Dumping the CDash XML dependencies file ${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE} ..." ) - execute_process( - COMMAND ${PYTHON_EXECUTABLE} - ${${PROJECT_NAME}_TRIBITS_DIR}/${TRIBITS_CTEST_DRIVER_DIR}/dump-cdash-deps-xml-file.py - --input-xml-deps-file=${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} - --output-cdash-deps-xml-file=${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE} ) - endif() - if (${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE - OR ${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE - OR ${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE - ) - tribits_config_code_stop_timer(WRITE_DEPENDENCY_FILES_TIME_START_SECONDS - "\nTotal time to write dependency files") - endif() + set(matchesPackagesOrTpls FALSE) + if (((packagesOrTpls STREQUAL "PACKAGES") + AND (${depPkg}_PACKAGE_BUILD_STATUS STREQUAL "INTERNAL")) + OR + ((packagesOrTpls STREQUAL "TPLS") + AND (${depPkg}_PACKAGE_BUILD_STATUS STREQUAL "EXTERNAL")) + ) + set(matchesPackagesOrTpls TRUE) + endif() -endmacro() + if (matchesRequriedOrOptional AND matchesPackagesOrTpls) + list(APPEND legacyPackageDepsList ${depPkg}) + endif() + + endforeach() + + set(${legacyPackageDepsListOut} "${legacyPackageDepsList}" PARENT_SCOPE) + +endfunction() + + + +function(tribits_append_dep_to_xml_string depPkg depsListStrInOut) + set(depsListStr "${${depsListStrInOut}}") + if (depsListStr) + string(APPEND depsListStr ",") + endif() + string(APPEND depsListStr "${depPkg}") + set(${depsListStrInOut} "${depsListStr}" PARENT_SCOPE) +endfunction() diff --git a/cmake/tribits/common_tpls/FindTPLHDF5.cmake b/cmake/tribits/common_tpls/FindTPLHDF5.cmake index 3d1fa9a26cc5..d89e4cd98415 100644 --- a/cmake/tribits/common_tpls/FindTPLHDF5.cmake +++ b/cmake/tribits/common_tpls/FindTPLHDF5.cmake @@ -2,78 +2,103 @@ # See associated tribits/Copyright.txt file for copyright and license! # ######################################################################## -# -# First, set up the variables for the (backward-compatible) TriBITS way of -# finding HDF5. These are used in case find_package(HDF5 ...) is not called -# or does not find HDF5. Also, these variables need to be non-null in order -# to trigger the right behavior in the function -# tribits_tpl_find_include_dirs_and_libraries(). -# - -set(REQUIRED_HEADERS hdf5.h) -set(REQUIRED_LIBS_NAMES hdf5) - -if (HDF5_REQUIRE_FORTRAN) - set(REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} hdf5_fortran) -endif() +set(HDF5_INTERNAL_IS_MODERN FALSE) -if (TPL_ENABLE_MPI) - set(REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} z) -endif() +if (Netcdf_ALLOW_MODERN) + + set(minimum_modern_HDF5_version 1.10.9) + print_var(Netcdf_ALLOW_MODERN) + message("-- Using find_package(HDF5 ${minimum_modern_HDF5_version} CONFIG) ...") + find_package(HDF5 ${minimum_modern_HDF5_version} CONFIG) + if (HDF5_FOUND) + message("-- Found HDF5_CONFIG=${HDF5_CONFIG}") + message("-- Generating Netcdf::all_libs and NetcdfConfig.cmake") + message("-- HDF5_EXPORT_LIBRARIES=${HDF5_EXPORT_LIBRARIES}") + tribits_extpkg_create_imported_all_libs_target_and_config_file( + HDF5 + INNER_FIND_PACKAGE_NAME HDF5 + IMPORTED_TARGETS_FOR_ALL_LIBS ${HDF5_EXPORT_LIBRARIES}) + set(HDF5_INTERNAL_IS_MODERN TRUE) + endif() -if (TPL_ENABLE_Netcdf) - set(REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} hdf5_hl) endif() -# -# Second, search for HDF5 components (if allowed) using the standard -# find_package(HDF5 ...). -# -tribits_tpl_allow_pre_find_package(HDF5 HDF5_ALLOW_PREFIND) -if (HDF5_ALLOW_PREFIND) +set(HDF5_FOUND_MODERN_CONFIG_FILE ${HDF5_INTERNAL_IS_MODERN} CACHE INTERNAL "True if HDF5 was found by the modern method") - message("-- Using find_package(HDF5 ...) ...") +if (NOT TARGET HDF5::all_libs) + + # First, set up the variables for the (backward-compatible) TriBITS way of + # finding HDF5. These are used in case find_package(HDF5 ...) is not called + # or does not find HDF5. Also, these variables need to be non-null in order + # to trigger the right behavior in the function + # tribits_tpl_find_include_dirs_and_libraries(). + + set(REQUIRED_HEADERS hdf5.h) + set(REQUIRED_LIBS_NAMES hdf5) - set(HDF5_COMPONENTS C) if (HDF5_REQUIRE_FORTRAN) - list(APPEND HDF5_COMPONENTS Fortran) + set(REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} hdf5_fortran) endif() if (TPL_ENABLE_MPI) - set(HDF5_PREFER_PARALLEL TRUE) + set(REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} z) endif() - find_package(HDF5 COMPONENTS ${HDF5_COMPONENTS}) - - # Make sure that HDF5 is parallel. - if (TPL_ENABLE_MPI AND NOT HDF5_IS_PARALLEL) - message(FATAL_ERROR "Trilinos is configured for MPI, HDF5 is not. - Did CMake find the correct libraries? - Try setting HDF5_INCLUDE_DIRS and/or HDF5_LIBRARY_DIRS explicitly. - ") + if (TPL_ENABLE_Netcdf) + set(REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} hdf5_hl) endif() - if (HDF5_FOUND) - # Tell TriBITS that we found HDF5 and there no need to look any further! - set(TPL_HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS} CACHE PATH - "HDF5 include dirs") - set(TPL_HDF5_LIBRARIES ${HDF5_LIBRARIES} CACHE FILEPATH - "HDF5 libraries") - set(TPL_HDF5_LIBRARY_DIRS ${HDF5_LIBRARY_DIRS} CACHE PATH - "HDF5 library dirs") + # + # Second, search for HDF5 components (if allowed) using the standard + # find_package(HDF5 ...). + # + tribits_tpl_allow_pre_find_package(HDF5 HDF5_ALLOW_PREFIND) + if (HDF5_ALLOW_PREFIND) + + message("-- Using find_package(HDF5 ...) ...") + + set(HDF5_COMPONENTS C) + if (HDF5_REQUIRE_FORTRAN) + list(APPEND HDF5_COMPONENTS Fortran) + endif() + + if (TPL_ENABLE_MPI) + set(HDF5_PREFER_PARALLEL TRUE) + endif() + + find_package(HDF5 COMPONENTS ${HDF5_COMPONENTS}) + + # Make sure that HDF5 is parallel. + if (TPL_ENABLE_MPI AND NOT HDF5_IS_PARALLEL) + message(FATAL_ERROR "Trilinos is configured for MPI, HDF5 is not. + Did CMake find the correct libraries? + Try setting HDF5_INCLUDE_DIRS and/or HDF5_LIBRARY_DIRS explicitly. + ") + endif() + + if (HDF5_FOUND) + # Tell TriBITS that we found HDF5 and there no need to look any further! + set(TPL_HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS} CACHE PATH + "HDF5 include dirs") + set(TPL_HDF5_LIBRARIES ${HDF5_LIBRARIES} CACHE FILEPATH + "HDF5 libraries") + set(TPL_HDF5_LIBRARY_DIRS ${HDF5_LIBRARY_DIRS} CACHE PATH + "HDF5 library dirs") + endif() + endif() -endif() + # + # Third, call tribits_tpl_find_include_dirs_and_libraries() + # + tribits_tpl_find_include_dirs_and_libraries( HDF5 + REQUIRED_HEADERS ${REQUIRED_HEADERS} + REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} + ) + # NOTE: If find_package(HDF5 ...) was called and successfully found HDF5, then + # tribits_tpl_find_include_dirs_and_libraries() will use the already-set + # variables TPL_HDF5_INCLUDE_DIRS and TPL_HDF5_LIBRARIES and then print them + # out (and set some other standard variables as well). This is the final + # "hook" into the TriBITS TPL system. -# -# Third, call tribits_tpl_find_include_dirs_and_libraries() -# -tribits_tpl_find_include_dirs_and_libraries( HDF5 - REQUIRED_HEADERS ${REQUIRED_HEADERS} - REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} - ) -# NOTE: If find_package(HDF5 ...) was called and successfully found HDF5, then -# tribits_tpl_find_include_dirs_and_libraries() will use the already-set -# variables TPL_HDF5_INCLUDE_DIRS and TPL_HDF5_LIBRARIES and then print them -# out (and set some other standard variables as well). This is the final -# "hook" into the TriBITS TPL system. +endif() diff --git a/cmake/tribits/common_tpls/FindTPLLAPACKDependencies.cmake b/cmake/tribits/common_tpls/FindTPLLAPACKDependencies.cmake new file mode 100644 index 000000000000..0256dbbfd4dd --- /dev/null +++ b/cmake/tribits/common_tpls/FindTPLLAPACKDependencies.cmake @@ -0,0 +1,2 @@ +tribits_extpkg_define_dependencies( LAPACK + DEPENDENCIES BLAS) diff --git a/cmake/tribits/common_tpls/FindTPLNetcdf.cmake b/cmake/tribits/common_tpls/FindTPLNetcdf.cmake index 13730f0457eb..d025130f7d82 100644 --- a/cmake/tribits/common_tpls/FindTPLNetcdf.cmake +++ b/cmake/tribits/common_tpls/FindTPLNetcdf.cmake @@ -37,105 +37,128 @@ # ************************************************************************ # @HEADER -# -# First, set up the variables for the (backward-compatible) TriBITS way of -# finding Netcdf. These are used in case find_package(NetCDF ...) is not -# called or does not find NetCDF. Also, these variables need to be non-null -# in order to trigger the right behavior in the function -# tribits_tpl_find_include_dirs_and_libraries(). -# +cmake_policy(SET CMP0074 NEW) -set(REQUIRED_HEADERS netcdf.h) -set(REQUIRED_LIBS_NAMES netcdf) +set(Netcdf_ALLOW_MODERN FALSE CACHE BOOL "Allow finding Netcdf as a modern CMake config file with exported targets (and only this way)") -if (TPL_ENABLE_MPI) - set(REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} pnetcdf) -endif() +if (Netcdf_ALLOW_MODERN AND HDF5_FOUND_MODERN_CONFIG_FILE) -# -# Second, search for Netcdf components (if allowed) using the standard -# find_package(NetCDF ...). -# -tribits_tpl_allow_pre_find_package(Netcdf Netcdf_ALLOW_PREFIND) -if (Netcdf_ALLOW_PREFIND) - - message("-- Using find_package(Netcdf ...) ...") - - set(CMAKE_MODULE_PATH - "${CMAKE_MODULE_PATH}" - "${CMAKE_CURRENT_LIST_DIR}/find_modules" - "${CMAKE_CURRENT_LIST_DIR}/utils" - ) - - find_package(NetCDF) - - if (NetCDF_FOUND) - set(DOCSTR "List of semi-colon separated paths to look for the TPL Netcdf") - set(TPL_Netcdf_Enables_Netcdf4 ${NetCDF_NEEDS_HDF5} CACHE BOOL - "True if netcdf enables netcdf-4") - set(TPL_Netcdf_Enables_PNetcdf ${NetCDF_NEEDS_PNetCDF} CACHE BOOL - "True if netcdf enables pnetcdf") - set(TPL_Netcdf_PARALLEL ${NetCDF_PARALLEL} CACHE INTERNAL - "True if netcdf compiled with parallel enabled") - set(TPL_Netcdf_LIBRARY_DIRS ${_hdf5_LIBRARY_SEARCH_DIRS} CACHE PATH - "${DOCSTR} library files") - set(TPL_Netcdf_LIBRARIES ${NetCDF_LIBRARIES} CACHE PATH - "List of semi-colon separated library names (not 'lib' or extension).") - set(TPL_Netcdf_INCLUDE_DIRS ${NetCDF_INCLUDE_DIRS} CACHE PATH - "${DOCSTR} header files.") + set(minimum_modern_netCDF_version 4.7.4) + print_var(Netcdf_ALLOW_MODERN) + message("-- Using find_package(netCDF ${minimum_modern_netCDF_version} CONFIG) ...") + find_package(netCDF ${minimum_modern_netCDF_version} CONFIG) + if (netCDF_FOUND) + message("-- Found netCDF_CONFIG=${netCDF_CONFIG}") + message("-- Generating Netcdf::all_libs and NetcdfConfig.cmake") + tribits_extpkg_create_imported_all_libs_target_and_config_file( + Netcdf + INNER_FIND_PACKAGE_NAME netCDF + IMPORTED_TARGETS_FOR_ALL_LIBS netCDF::netcdf) + set(TPL_Netcdf_NOT_FOUND FALSE) endif() -else() - # Curl library is only required if DAP is enabled; should detect inside - # FindNetCDF.cmake, but that is not being called... SEMS has DAP enabled; - # many HPC systems don't, but they override these settings... - find_program(NC_CONFIG "nc-config") - if (NC_CONFIG) - execute_process(COMMAND "nc-config --has-dap2" - OUTPUT_VARIABLE NETCDF_HAS_DAP2) - execute_process(COMMAND "nc-config --has-dap4" - OUTPUT_VARIABLE NETCDF_HAS_DAP4) + +endif() + +if (NOT TARGET Netcdf::all_libs) + + # First, set up the variables for the (backward-compatible) TriBITS way of + # finding Netcdf. These are used in case find_package(Netcdf ...) is not + # called or does not find HDF5. Also, these variables need to be non-null + # in order to trigger the right behavior in the function + # tribits_tpl_find_include_dirs_and_libraries(). + + set(REQUIRED_HEADERS netcdf.h) + set(REQUIRED_LIBS_NAMES netcdf) + + if (TPL_ENABLE_MPI) + set(REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} pnetcdf) endif() - if ((NOT NC_CONFIG) OR NETCDF_HAS_DAP2 OR NETCDF_HAS_DAP4) - set(REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} curl) + + # + # Second, search for Netcdf components (if allowed) using the standard + # find_package(NetCDF ...). + # + tribits_tpl_allow_pre_find_package(Netcdf Netcdf_ALLOW_PREFIND) + if (Netcdf_ALLOW_PREFIND) + + message("-- Using find_package(Netcdf ...) ...") + + set(CMAKE_MODULE_PATH + "${CMAKE_MODULE_PATH}" + "${CMAKE_CURRENT_LIST_DIR}/find_modules" + "${CMAKE_CURRENT_LIST_DIR}/utils" + ) + + find_package(NetCDF) + + if (NetCDF_FOUND) + set(DOCSTR "List of semi-colon separated paths to look for the TPL Netcdf") + set(TPL_Netcdf_Enables_Netcdf4 ${NetCDF_NEEDS_HDF5} CACHE BOOL + "True if netcdf enables netcdf-4") + set(TPL_Netcdf_Enables_PNetcdf ${NetCDF_NEEDS_PNetCDF} CACHE BOOL + "True if netcdf enables pnetcdf") + set(TPL_Netcdf_PARALLEL ${NetCDF_PARALLEL} CACHE INTERNAL + "True if netcdf compiled with parallel enabled") + set(TPL_Netcdf_LIBRARY_DIRS ${_hdf5_LIBRARY_SEARCH_DIRS} CACHE PATH + "${DOCSTR} library files") + set(TPL_Netcdf_LIBRARIES ${NetCDF_LIBRARIES} CACHE PATH + "List of semi-colon separated library names (not 'lib' or extension).") + set(TPL_Netcdf_INCLUDE_DIRS ${NetCDF_INCLUDE_DIRS} CACHE PATH + "${DOCSTR} header files.") + endif() + else() + # Curl library is only required if DAP is enabled; should detect inside + # FindNetCDF.cmake, but that is not being called... SEMS has DAP enabled; + # many HPC systems don't, but they override these settings... + find_program(NC_CONFIG "nc-config") + if (NC_CONFIG) + execute_process(COMMAND "nc-config --has-dap2" + OUTPUT_VARIABLE NETCDF_HAS_DAP2) + execute_process(COMMAND "nc-config --has-dap4" + OUTPUT_VARIABLE NETCDF_HAS_DAP4) + endif() + if ((NOT NC_CONFIG) OR NETCDF_HAS_DAP2 OR NETCDF_HAS_DAP4) + set(REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} curl) + endif() endif() -endif() -# -# Third, call tribits_tpl_find_include_dirs_and_libraries() -# -tribits_tpl_find_include_dirs_and_libraries( Netcdf - REQUIRED_HEADERS ${REQUIRED_HEADERS} - REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} - ) -# NOTE: If find_package(Netcdf ...) was called and successfully found Netcdf, -# then tribits_tpl_find_include_dirs_and_libraries() will use the already-set -# variables TPL_Netcdf_INCLUDE_DIRS and TPL_Netcdf_LIBRARIES and then print -# them out (and set some other standard variables as well). This is the final -# "hook" into the TriBITS TPL system. - -# If the `find_package(NetCDF)` is not run, then this may not be set -# Need to determine how this is set in the library that is being used... - -if ("${TPL_Netcdf_PARALLEL}" STREQUAL "") - assert_defined(TPL_Netcdf_INCLUDE_DIRS) - find_path(meta_path - NAMES "netcdf_meta.h" - HINTS ${TPL_Netcdf_INCLUDE_DIRS} - NO_DEFAULT_PATH) - - if (meta_path) - # Search meta for NC_HAS_PARALLEL setting... - # Note that there is both NC_HAS_PARALLEL and NC_HAS_PARALLEL4, only want first... - file(STRINGS "${meta_path}/netcdf_meta.h" netcdf_par_string REGEX "NC_HAS_PARALLEL ") - string(REGEX MATCH "[01]" netcdf_par_val "${netcdf_par_string}") - if (netcdf_par_val EQUAL 1) - set(TPL_Netcdf_PARALLEL True CACHE INTERNAL - "True if netcdf compiled with parallel enabled") - endif() - endif() - if ("${TPL_Netcdf_PARALLEL}" STREQUAL "") - set(TPL_Netcdf_PARALLEL False CACHE INTERNAL - "True if netcdf compiled with parallel enabled") - endif() + # + # Third, call tribits_tpl_find_include_dirs_and_libraries() + # + tribits_tpl_find_include_dirs_and_libraries( Netcdf + REQUIRED_HEADERS ${REQUIRED_HEADERS} + REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} + ) + # NOTE: If find_package(Netcdf ...) was called and successfully found Netcdf, + # then tribits_tpl_find_include_dirs_and_libraries() will use the already-set + # variables TPL_Netcdf_INCLUDE_DIRS and TPL_Netcdf_LIBRARIES and then print + # them out (and set some other standard variables as well). This is the final + # "hook" into the TriBITS TPL system. + + # If the `find_package(NetCDF)` is not run, then this may not be set + # Need to determine how this is set in the library that is being used... + + if ("${TPL_Netcdf_PARALLEL}" STREQUAL "") + assert_defined(TPL_Netcdf_INCLUDE_DIRS) + find_path(meta_path + NAMES "netcdf_meta.h" + HINTS ${TPL_Netcdf_INCLUDE_DIRS} + NO_DEFAULT_PATH) + + if (meta_path) + # Search meta for NC_HAS_PARALLEL setting... + # Note that there is both NC_HAS_PARALLEL and NC_HAS_PARALLEL4, only want first... + file(STRINGS "${meta_path}/netcdf_meta.h" netcdf_par_string REGEX "NC_HAS_PARALLEL ") + string(REGEX MATCH "[01]" netcdf_par_val "${netcdf_par_string}") + if (netcdf_par_val EQUAL 1) + set(TPL_Netcdf_PARALLEL True CACHE INTERNAL + "True if netcdf compiled with parallel enabled") + endif() + endif() + if ("${TPL_Netcdf_PARALLEL}" STREQUAL "") + set(TPL_Netcdf_PARALLEL False CACHE INTERNAL + "True if netcdf compiled with parallel enabled") + endif() + endif() + message(STATUS "TPL_Netcdf_PARALLEL is ${TPL_Netcdf_PARALLEL}") endif() -message(STATUS "TPL_Netcdf_PARALLEL is ${TPL_Netcdf_PARALLEL}") diff --git a/cmake/tribits/common_tpls/FindTPLNetcdfDependencies.cmake b/cmake/tribits/common_tpls/FindTPLNetcdfDependencies.cmake new file mode 100644 index 000000000000..30efbe45c2ef --- /dev/null +++ b/cmake/tribits/common_tpls/FindTPLNetcdfDependencies.cmake @@ -0,0 +1,2 @@ +tribits_extpkg_define_dependencies( Netcdf + DEPENDENCIES HDF5) diff --git a/cmake/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in b/cmake/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in index 465648d63ac3..499d5352e45f 100644 --- a/cmake/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in +++ b/cmake/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in @@ -101,23 +101,8 @@ set(${EXPORT_FILE_VAR_PREFIX}_AR ${CMAKE_AR}) ## Base install location (if not in the build tree) set(${EXPORT_FILE_VAR_PREFIX}_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@") -## List of package include dirs -set(${EXPORT_FILE_VAR_PREFIX}_INCLUDE_DIRS "") - -## List of package library paths -set(${EXPORT_FILE_VAR_PREFIX}_LIBRARY_DIRS "") - ## List of package libraries -set(${EXPORT_FILE_VAR_PREFIX}_LIBRARIES "${FULL_LIBRARY_SET}") - -## Specification of directories for TPL headers -set(${EXPORT_FILE_VAR_PREFIX}_TPL_INCLUDE_DIRS "") - -## Specification of directories for TPL libraries -set(${EXPORT_FILE_VAR_PREFIX}_TPL_LIBRARY_DIRS "") - -## List of required TPLs -set(${EXPORT_FILE_VAR_PREFIX}_TPL_LIBRARIES "${${PACKAGE_NAME}_TPL_LIBRARIES}") +set(${EXPORT_FILE_VAR_PREFIX}_LIBRARIES ${PACKAGE_NAME}::all_libs) ## --------------------------------------------------------------------------- ## MPI specific variables @@ -136,12 +121,6 @@ set(${EXPORT_FILE_VAR_PREFIX}_MPI_EXEC_NUMPROCS_FLAG "${MPI_EXEC_NUMPROCS_FLAG}" ## Set useful general variables ## --------------------------------------------------------------------------- -## The packages enabled for this project -set(${EXPORT_FILE_VAR_PREFIX}_PACKAGE_LIST "${FULL_PACKAGE_SET}") - -## The TPLs enabled for this project -set(${EXPORT_FILE_VAR_PREFIX}_TPL_LIST "${ORDERED_FULL_TPL_SET}") - ${PACKAGE_CONFIG_CODE} ## ---------------------------------------------------------------------------- diff --git a/cmake/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in b/cmake/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in index 67eb685ed483..09c413821945 100644 --- a/cmake/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in +++ b/cmake/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in @@ -123,7 +123,6 @@ foreach (comp IN ITEMS ${PDOLLAR}{COMPONENTS_LIST}) include(${PDOLLAR}{compPkgConfigFile}) # Add variables to lists. list(APPEND ${PROJECT_NAME}_LIBRARIES ${PDOLLAR}{${PDOLLAR}{comp}_LIBRARIES}) - list(APPEND ${PROJECT_NAME}_TPL_LIBRARIES ${PDOLLAR}{${PDOLLAR}{comp}_TPL_LIBRARIES}) list(APPEND selectedComponentsFound ${PDOLLAR}{comp}) else() set(${PROJECT_NAME}_${PDOLLAR}{comp}_FOUND FALSE) @@ -138,18 +137,8 @@ endforeach() # Deprecated (see #299)! set(${PROJECT_NAME}_INCLUDE_DIRS "${TRIBITS_PROJECT_INSTALL_INCLUDE_DIR}") -# Deprecated (see #299)! -set(${PROJECT_NAME}_LIBRARY_DIRS "") - # Remove duplicates in ${PROJECT_NAME}_LIBRARIES -list(REVERSE ${PROJECT_NAME}_LIBRARIES) list(REMOVE_DUPLICATES ${PROJECT_NAME}_LIBRARIES) -list(REVERSE ${PROJECT_NAME}_LIBRARIES) - -# Remove duplicates in ${PROJECT_NAME}_TPL_LIBRARIES -list(REVERSE ${PROJECT_NAME}_TPL_LIBRARIES) -list(REMOVE_DUPLICATES ${PROJECT_NAME}_TPL_LIBRARIES) -list(REVERSE ${PROJECT_NAME}_TPL_LIBRARIES) ## --------------------------------------------------------------------------- ## MPI specific variables @@ -186,9 +175,6 @@ set(${PROJECT_NAME}_PACKAGE_LIST "${FULL_PACKAGE_SET}") ## The selected packages for this project set(${PROJECT_NAME}_SELECTED_PACKAGE_LIST "${PDOLLAR}{selectedComponentsFound}") -## The TPLs enabled for this project -set(${PROJECT_NAME}_TPL_LIST "${FULL_TPL_SET}") - ## --------------------------------------------------------------------------- ## Modern CMake (IMPORTED) targets ## --------------------------------------------------------------------------- diff --git a/cmake/tribits/core/package_arch/TribitsAddAdvancedTest.cmake b/cmake/tribits/core/package_arch/TribitsAddAdvancedTest.cmake index b7627d603882..0faae73d3a13 100644 --- a/cmake/tribits/core/package_arch/TribitsAddAdvancedTest.cmake +++ b/cmake/tribits/core/package_arch/TribitsAddAdvancedTest.cmake @@ -157,13 +157,10 @@ include(PrintVar) # for the overall test to pass. # # Finally, the test is only added if tests are enabled for the package -# (i.e. `${PACKAGE_NAME}_ENABLE_TESTS`_ ``= ON``) or the parent package (if -# this is a subpackage) (i.e. ``${PARENT_PACKAGE_NAME}_ENABLE_TESTS=ON``) or -# if other criteria are met (see some of the arguments in `Overall Arguments -# (tribits_add_advanced_test())`_ that can trigger a test to not be added). -# (NOTE: A more efficient way to optionally enable tests is to put them in a -# ``test/`` subdir and then include that subdir with -# `tribits_add_test_directories()`_.) +# (i.e. `${PACKAGE_NAME}_ENABLE_TESTS`_ ``= ON``) and if other criteria are +# met (see `Overall Arguments (tribits_add_advanced_test())`_). (NOTE: A more +# efficient way to optionally enable tests is to put them in a ``test/`` +# subdir and then include that subdir with `tribits_add_test_directories()`_.) # # *Sections:* # diff --git a/cmake/tribits/core/package_arch/TribitsAddExecutable.cmake b/cmake/tribits/core/package_arch/TribitsAddExecutable.cmake index f08e7b78bca0..ec989628f82f 100644 --- a/cmake/tribits/core/package_arch/TribitsAddExecutable.cmake +++ b/cmake/tribits/core/package_arch/TribitsAddExecutable.cmake @@ -44,6 +44,7 @@ include(TribitsAddTestHelpers) include(TribitsGeneralMacros) include(TribitsLibIsTestOnly) include(TribitsReportInvalidTribitsUsage) +include(TribitsDeprecatedHelpers) include(PrintVar) include(AppendSet) @@ -374,7 +375,7 @@ function(tribits_add_executable EXE_NAME) endif() if (PARSE_DEFINES) - message(WARNING "WARNING: Passing extra defines through 'DEFINES' ${PARSE_DEFINES}" + tribits_deprecated("Passing extra defines through 'DEFINES' ${PARSE_DEFINES}" " is deprecated. Instead, pass them through 'TARGET_DEFINES'. The 'DEFINES'" " argument was incorrectly implemented by calling add_definitions() which has" " directory scope and not function scope as was documented. This resulted in" @@ -657,12 +658,12 @@ macro(tribits_add_executable_convert_from_deplibs) set(prefixedDepLib "${${PROJECT_NAME}_LIBRARY_NAME_PREFIX}${depLib}") tribits_lib_is_testonly(${prefixedDepLib} depLibIsTestOnlyLib) if (depLibIsTestOnlyLib) - message(WARNING "WARNING: Passing TESTONLY lib '${depLib}' through DEPLIBS" + tribits_deprecated("Passing TESTONLY lib '${depLib}' through DEPLIBS" " is deprecated! Instead, please pass through TESTONLYLIBS instead!" " DEPLIBS is deprecated!") list(APPEND PARSE_TESTONLYLIBS ${depLib}) elseif (TARGET ${prefixedDepLib}) - message(WARNING "WARNING: Passing non-TESTONLY lib '${depLib}' through DEPLIBS" + tribits_deprecated("Passing non-TESTONLY lib '${depLib}' through DEPLIBS" " is deprecated! The library '${depLib}' appears to be a" " library defined in this CMake project." " TriBITS takes care of linking against libraries in dependent upstream" diff --git a/cmake/tribits/core/package_arch/TribitsAddExecutableAndTest.cmake b/cmake/tribits/core/package_arch/TribitsAddExecutableAndTest.cmake index 298f64ac75c7..264c96d534df 100644 --- a/cmake/tribits/core/package_arch/TribitsAddExecutableAndTest.cmake +++ b/cmake/tribits/core/package_arch/TribitsAddExecutableAndTest.cmake @@ -40,6 +40,7 @@ include(TribitsAddExecutable) include(TribitsAddTest) +include(TribitsDeprecatedHelpers) # @@ -146,6 +147,16 @@ endmacro() # through ``ARGS``. For more flexibility, just use # ``tribits_add_executable()`` followed by ``tribits_add_test()``. # +# Finally, the tests are only added if tests are enabled for the package +# (i.e. `${PACKAGE_NAME}_ENABLE_TESTS`_ ``= ON``) and other criteria are met. +# But the test executable will always be added if this function is called, +# regardless of the value of ``${PACKAGE_NAME}_ENABLE_TESTS``. To avoid +# adding the test (or example) executable when +# ``${PACKAGE_NAME}_ENABLE_TESTS=OFF``, put this command in a subdir under +# ``test/`` or ``example/`` and that subdir with +# `tribits_add_test_directories()`_ or `tribits_add_example_directories()`_, +# respectively. +# function(tribits_add_executable_and_test EXE_NAME) # @@ -197,6 +208,10 @@ function(tribits_add_executable_and_test EXE_NAME) # C) tribits_add_executable(...) # + if (PARSE_DEPLIBS) + tribits_deprecated("DEPLIBS argument of tribits_add_executable_and_test() is deprecated.") + endif() + set(CALL_ARGS "") tribits_fwd_parse_arg(CALL_ARGS SOURCES) tribits_fwd_parse_arg(CALL_ARGS DEPLIBS) # Deprecated @@ -257,3 +272,5 @@ function(tribits_add_executable_and_test EXE_NAME) endif() endfunction() + +# LocalWords: executables diff --git a/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake b/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake index 4bac9f943c0b..6f7890a33689 100644 --- a/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake +++ b/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake @@ -48,6 +48,7 @@ include(PrependGlobalSet) include(RemoveGlobalDuplicates) include(TribitsGeneralMacros) include(TribitsReportInvalidTribitsUsage) +include(TribitsDeprecatedHelpers) include(SetAndIncDirs) @@ -670,7 +671,7 @@ function(tribits_add_library_assert_deplibs) # dependency on the upstream package that owns this upstream TESTONLY # library if it comes from an upstream package. elseif (NOT PARSE_TESTONLY AND depLibIsTestOnlyLib) # any depLibAlreadyInPkgLibs - message(WARNING "WARNING: '${depLib}' in DEPLIBS is a TESTONLY lib" + tribits_deprecated("'${depLib}' in DEPLIBS is a TESTONLY lib" " and it is illegal to link to this non-TESTONLY library '${LIBRARY_NAME}'." " Such usage is deprecated (and this warning will soon become an error)!" " If this is a regular library in this package or in an dependent upstream" @@ -680,7 +681,7 @@ function(tribits_add_library_assert_deplibs) " ${${PACKAGE_NAME}_SOURCE_DIR}/cmake/Dependencies.cmake") # ToDo: Turn the above to FATAL_ERROR after dropping deprecated code elseif (NOT depLibAlreadyInPkgLibs AND TARGET ${prefixedDepLib}) # any PARSE_TESTONLY - message(WARNING "WARNING: '${depLib}' in DEPLIBS is not" + tribits_deprecated("'${depLib}' in DEPLIBS is not" " a lib in this package but is a library defined in the current" " cmake project! Such usage is deprecated (and" " will result in a configure error soon). If this is a library in" @@ -691,7 +692,7 @@ function(tribits_add_library_assert_deplibs) " this package's dependencies file" " ${${PACKAGE_NAME}_SOURCE_DIR}/cmake/Dependencies.cmake.") elseif (NOT depLibAlreadyInPkgLibs AND NOT TARGET ${prefixedDepLib} ) - message(WARNING "WARNING: '${depLib}' in DEPLIBS is not" + tribits_deprecated("'${depLib}' in DEPLIBS is not" " a lib defined in the current cmake project! Such usage is deprecated (and" " will result in a configure error soon). If this is an external" " lib you are trying to link in, it should likely be handled as a TriBITS" @@ -725,7 +726,7 @@ function(tribits_add_library_assert_importedlibs) FOUND_IMPORTEDLIB_IN_LIBRARIES_IDX) tribits_lib_is_testonly(${prefixedImportedLib} importedLibIsTestOnlyLib) if (importedLibIsTestOnlyLib) - message(WARNING "WARNING: '${importedLib}' in IMPORTEDLIBS is a TESTONLY lib" + tribits_deprecated("'${importedLib}' in IMPORTEDLIBS is a TESTONLY lib" " and it is illegal to pass in through IMPORTEDLIBS!" " Such usage is deprecated (and this warning will soon become an error)!" " Should '${importedLib}' instead be passed through DEPLIBS?") diff --git a/cmake/tribits/core/package_arch/TribitsAddTest.cmake b/cmake/tribits/core/package_arch/TribitsAddTest.cmake index d9dfa911133a..842bf3b2b94c 100644 --- a/cmake/tribits/core/package_arch/TribitsAddTest.cmake +++ b/cmake/tribits/core/package_arch/TribitsAddTest.cmake @@ -78,10 +78,11 @@ include(TribitsAddTestHelpers) # ) # # The tests are only added if tests are enabled for the package -# (i.e. `${PACKAGE_NAME}_ENABLE_TESTS`_) or the parent package (if this is a -# subpackage) (i.e. ``${PARENT_PACKAGE_NAME}_ENABLE_TESTS``). (NOTE: A more -# efficient way to optionally enable tests is to put them in a ``test/`` -# subdir and then include that subdir with `tribits_add_test_directories()`_.) +# (i.e. `${PACKAGE_NAME}_ENABLE_TESTS`_ ``= ON``). (NOTE: A more efficient +# way to optionally enable tests or examples is to put them in a ``test/`` or +# ``example/`` subdir and then include that subdir with +# `tribits_add_test_directories()`_ or `tribits_add_example_directories()`_, +# respectively.) # # *Sections:* # diff --git a/cmake/tribits/core/package_arch/TribitsAddTestHelpers.cmake b/cmake/tribits/core/package_arch/TribitsAddTestHelpers.cmake index 453de5432672..ba8a6412b67b 100644 --- a/cmake/tribits/core/package_arch/TribitsAddTestHelpers.cmake +++ b/cmake/tribits/core/package_arch/TribitsAddTestHelpers.cmake @@ -211,8 +211,8 @@ function(tribits_add_test_process_enable_tests ADD_THE_TEST_OUT) set(ADD_THE_TEST TRUE) else() message_wrapper( - "-- ${TEST_NAME}: NOT added test because ${PACKAGE_NAME}_ENABLE_TESTS='${${PACKAGE_NAME}_ENABLE_TESTS}'." - ) + "-- ${TEST_NAME}: NOT added test because" + " ${PACKAGE_NAME}_ENABLE_TESTS='${${PACKAGE_NAME}_ENABLE_TESTS}'.") set(ADD_THE_TEST FALSE) endif() set(${ADD_THE_TEST_OUT} ${ADD_THE_TEST} PARENT_SCOPE) diff --git a/cmake/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake b/cmake/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake index 55c83d96af77..53bbb1f2b5d5 100644 --- a/cmake/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake +++ b/cmake/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake @@ -42,7 +42,9 @@ include(TribitsProcessPackagesAndDirsLists) include(TribitsAddOptionAndDefine) include(TribitsGeneralMacros) include(TribitsPrintEnabledPackagesLists) +include(TribitsPrintDependencyInfo) include(TribitsPackageDependencies) +include(TribitsGetPackageEnableStatus) include(AdvancedOption) include(AdvancedSet) @@ -59,258 +61,385 @@ include(SetDefault) include(MessageWrapper) include(DualScopeSet) include(CMakeParseArguments) +include(TribitsCreateReverseList) +# NOTE: A nice way to view and navigate the contents of this file is to use +# the emacs 'occur' string: # -# Private helper macros +# "\(^##########\|^# .*-level\|^function\|^macro\)" + + +# @MACRO: tribits_adjust_package_enables() +# +# Usage: +# +# tribits_adjust_package_enables() +# +# Macro that adjusts all of the package enables from what the user input to +# the final set that will be used to enable packages. # +macro(tribits_adjust_package_enables) + tribits_unenable_enabled_packages() + tribits_sweep_forward_apply_disables() + tribits_sweep_forward_apply_enables() + tribits_disable_and_enable_tests_and_examples() + tribits_sweep_backward_enable_upstream_packages() + tribits_set_cache_vars_for_current_enabled_packages() + tribits_do_final_parent_packages_enables_for_subpackage_enables() + tribits_setup_enabled_lists_and_pkg_idxs() + tribits_setup_direct_packages_dependencies_lists_and_lib_required_enable_vars() + tribits_print_direct_packages_dependencies_lists() +endmacro() -function(tribits_private_print_disable - ENABLE_BEING_DISABLED_VAR_NAME PACKAGE_WITH_SOMETHING_BEING_DISABLED - DEP_TYPE_STR THING_DISALBED_TYPE THING_DISABLED_NAME - ) - #print_var(${ENABLE_BEING_DISABLED_VAR_NAME}) - if (${ENABLE_BEING_DISABLED_VAR_NAME}) - if (${PROJECT_NAME}_DISABLE_ENABLED_FORWARD_DEP_PACKAGES) - message( - " ***\n" - " *** NOTE: Setting ${ENABLE_BEING_DISABLED_VAR_NAME}=OFF" - " which was '${${ENABLE_BEING_DISABLED_VAR_NAME}}' because" - " ${PACKAGE_WITH_SOMETHING_BEING_DISABLED} has" - " a required ${DEP_TYPE_STR} dependence on disabled" - " ${THING_DISALBED_TYPE} ${THING_DISABLED_NAME}" - " but ${PROJECT_NAME}_DISABLE_ENABLED_FORWARD_DEP_PACKAGES=ON!\n" - " ***\n" - ) - else() - message(FATAL_ERROR - " ***\n" - " *** ERROR: Setting ${ENABLE_BEING_DISABLED_VAR_NAME}=OFF" - " which was '${${ENABLE_BEING_DISABLED_VAR_NAME}}' because" - " ${PACKAGE_WITH_SOMETHING_BEING_DISABLED} has" - " a required ${DEP_TYPE_STR} dependence on disabled" - " ${THING_DISALBED_TYPE} ${THING_DISABLED_NAME}!\n" - " ***\n" - ) - endif() - else() - message("-- " - "Setting ${ENABLE_BEING_DISABLED_VAR_NAME}=OFF" - " because ${PACKAGE_WITH_SOMETHING_BEING_DISABLED} has a required ${DEP_TYPE_STR}" - " dependence on disabled ${THING_DISALBED_TYPE} ${THING_DISABLED_NAME}") - endif() -endfunction() + +################################################################################ +# +# First-level macros called directly from ``tribits_adjust_package_enables()`` +# +# NOTE: In the below macros, local variables are prefixed by 'tap1_' in all of +# the macros() which will not clash because they are at the same level in the +# call stack (and are initialized in each macro). +# +################################################################################ -macro(tribits_private_disable_tpl_required_package_enable - TPL_NAME PACKAGE_NAME LIBRARY_DEP - ) +# @MACRO: tribits_unenable_enabled_packages() +# +# Macro to enable all unenabled packages if asked. +# +# See implementation for details. +# +macro(tribits_unenable_enabled_packages) + if (${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES) + message("\nSetting to empty '' all enabled packages because" + " ${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES=" + "'${${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES}'\n") + foreach(tap1_tribitsPkg IN LISTS ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES) + if (${PROJECT_NAME}_ENABLE_${tap1_tribitsPkg}) + message("-- " "Setting ${PROJECT_NAME}_ENABLE_${tap1_tribitsPkg}=''") + set_cache_on_off_empty(${PROJECT_NAME}_ENABLE_${tap1_tribitsPkg} "" + "Forced to empty '' by ${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES=ON" FORCE) + endif() + # NOTE: Above, we don't want to set to empty those packages that have hard + # disables because this will mess up the logic in later invocations. + endforeach() + advanced_set(${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES OFF CACHE BOOL + "Forced to FALSE after use" FORCE) + endif() +endmacro() - #message("TRIBITS_PRIVATE_DISABLE_TPL_REQUIRED_PACKAGE_ENABLE" - # " ${TPL_NAME} ${PACKAGE_NAME} ${LIBRARY_DEP}") - # Only turn off PACKAGE_NAME libraries and test/examples if it - # is currently enabled or could be enabled. +# @MACRO: tribits_sweep_forward_apply_disables() +# +# Sweep forward and apply all disables in order first. +# +# See implementation for details. +# +macro(tribits_sweep_forward_apply_disables) - assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} - OR ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} STREQUAL "" - ) + message("\nDisabling all packages that have a required dependency" + " on disabled TPLs and optional package TPL support based on TPL_ENABLE_=OFF ...\n") - if ("${LIBRARY_DEP}" STREQUAL "TRUE") + message("\nDisabling subpackages for hard disables of parent packages" + " due to ${PROJECT_NAME}_ENABLE_=OFF ...\n") + foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES) + tribits_disable_parents_subpackages(${tad1_tribitsPkg}) + endforeach() - tribits_private_print_disable( - ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} ${PACKAGE_NAME} "library" - "TPL" ${TPL_NAME} - ) + message("\nDisabling forward required packages and optional intra-package" + " support that have a dependency on disabled packages" + " ${PROJECT_NAME}_ENABLE_=OFF (or" + " TPL_ENABLE_=OFF) ...\n") + foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_DEFINED_PACKAGES) + tribits_disable_forward_required_dep_packages(${tad1_tribitsPkg}) + endforeach() - set(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} OFF) +endmacro() - else() - set(DEP_TYPE_STR "test/example") +# @MACRO: tribits_sweep_forward_apply_enables() +# +# Updates the following variables in the local scope: +# +# * ``${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES`` +# * `${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES`_ +# +# See implementation for details. +# +macro(tribits_sweep_forward_apply_enables) - if (${PACKAGE_NAME}_ENABLE_TESTS - OR "${${PACKAGE_NAME}_ENABLE_TESTS}" STREQUAL "" - ) - tribits_private_print_disable( - ${PACKAGE_NAME}_ENABLE_TESTS ${PACKAGE_NAME} "${DEP_TYPE_STR}" - "TPL" ${TPL_NAME} - ) - set(${PACKAGE_NAME}_ENABLE_TESTS OFF) - endif() + tribits_get_sublist_nondisabled( ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES + ${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES "") + tribits_create_reverse_list(${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES + ${PROJECT_NAME}_REVERSE_NOTDISABLED_INTERNAL_PACKAGES) - if (${PACKAGE_NAME}_ENABLE_EXAMPLES - OR "${${PACKAGE_NAME}_ENABLE_EXAMPLES}" STREQUAL "" - ) - tribits_private_print_disable( - ${PACKAGE_NAME}_ENABLE_EXAMPLES ${PACKAGE_NAME} "${DEP_TYPE_STR}" - "TPL" ${TPL_NAME} - ) - set(${PACKAGE_NAME}_ENABLE_EXAMPLES OFF) - endif() + message("\nEnabling subpackages for hard enables of parent packages" + " due to ${PROJECT_NAME}_ENABLE_=ON ...\n") + foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES) + tribits_enable_parents_subpackages(${tad1_tribitsPkg}) + endforeach() - # NOTE: We can't assert that ${PACKAGE_NAME}_ENABLE_TESTS or - # ${PACKAGE_NAME}_ENABLE_EXAMPLES exists yet because - # tribits_set_up_optional_package_enables_and_cache_vars() which defines - # them is not called until after the final package enables are set. + if (${PROJECT_NAME}_ENABLE_ALL_PACKAGES) + message("\nEnabling all packages that are not currently disabled because of" + " ${PROJECT_NAME}_ENABLE_ALL_PACKAGES=ON" + " (${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE=" + "${${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE}) ...\n") + foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES) + tribits_apply_all_package_enables(${tad1_tribitsPkg}) + endforeach() + endif() - endif() + if (${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES) + message("\nSweep forward enabling all forward library dependent packages because" + " ${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES=ON ...\n") + foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES) + tribits_enable_forward_lib_package_enables(${tad1_tribitsPkg}) + endforeach() + tribits_get_sublist_enabled( ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES + ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES "") + tribits_create_reverse_list(${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES + ${PROJECT_NAME}_REVERSE_ENABLED_INTERNAL_PACKAGES) + + message("\nSweep backward enabling all forward test dependent packages because" + " ${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES=ON ...\n") + foreach(tad1_tribitsPkg IN LISTS + ${PROJECT_NAME}_REVERSE_ENABLED_INTERNAL_PACKAGES + ) + tribits_enable_forward_test_package_enables(${tad1_tribitsPkg}) + endforeach() + # NOTE: Above, we want to sweep backward to enable test-dependent packages + # because we don't want to enable package Z just because package Y was enabled + # because it had a test-only dependency on package X. Sweeping backwards through + # the packages makes sure this does not happen. + set(${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES ON) endif() + tribits_get_sublist_enabled( ${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES + ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES "") + endmacro() +# NOTE: Above, we are sweeping over *all* of the not-disabled packages listed +# in ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES, including those package that +# might have _PACKAGE_BUILD_STATUS=EXTERNAL. That makes sense +# because these are TriBITS (or TriBITS compatible) packages so we should +# assume that all of their downstream packages, whether internal or external, +# should be enabled as well. If we find this is not the desirable behavior, +# then we can change this later. -function(tribits_private_print_disable_required_package_enable - PACKAGE_NAME PACKAGE_ENABLE_SOMETHING_VAR_NAME FORWARD_DEP_PACKAGE_NAME - DEP_TYPE_STR - ) - tribits_private_print_disable( - ${PACKAGE_ENABLE_SOMETHING_VAR_NAME} ${FORWARD_DEP_PACKAGE_NAME} - "${DEP_TYPE_STR}" "package" ${PACKAGE_NAME} ) -endfunction() +# @MACRO: tribits_disable_and_enable_tests_and_examples() +# +# Adjust test and example enables based on different criteria. +# +# See implementation for details. +# +macro(tribits_disable_and_enable_tests_and_examples) + message("\nDisabling subpackage tests/examples based on parent package" + " tests/examples disables ...\n") + foreach(tad1_tribitsPkg IN LISTS + ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES + ) + tribits_apply_package_examples_disable(${tad1_tribitsPkg} TESTS) + tribits_apply_subpackage_tests_or_examples_disables(${tad1_tribitsPkg} TESTS) + tribits_apply_subpackage_tests_or_examples_disables(${tad1_tribitsPkg} EXAMPLES) + endforeach() -macro(tribits_private_disable_required_package_enables - FORWARD_DEP_PACKAGE_NAME PACKAGE_NAME LIBRARY_DEP - ) + if (${PROJECT_NAME}_ENABLE_TESTS OR ${PROJECT_NAME}_ENABLE_EXAMPLES) + message("\nEnabling all tests and/or examples that have not been" + " explicitly disabled because ${PROJECT_NAME}_ENABLE_[TESTS,EXAMPLES]=ON ...\n") + foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES) + tribits_apply_test_example_enables(${tad1_tribitsPkg}) + endforeach() + endif() + # NOTE: Above, we enable tests and examples here, before the remaining required + # packages so that we don't enable tests that don't need to be enabled based + # on the use of the option ${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES. - #message("TRIBITS_PRIVATE_DISABLE_REQUIRED_PACKAGE_ENABLES" - # " ${FORWARD_DEP_PACKAGE_NAME} ${LIBRARY_DEP}") + message("\nEnabling subpackage tests/examples based on parent package tests/examples enables ...\n") + foreach(tad1_tribitsPkg IN LISTS + ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES + ) + tribits_apply_subpackage_tests_examples_enables(${tad1_tribitsPkg}) + endforeach() + # NOTE: We want to apply this logic here instead of later after the backward + # sweep of package enables because we don't want to enable the + # tests/examples for a subpackage if it is not needed based on set of + # requested subpackages and packages to be enabled and the optional forward + # sweep of downstream packages. - # Only turn off FORWARD_DEP_PACKAGE libraries and test/examples if it - # is currently enabled or could be enabled +endmacro() - assert_defined(${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME}) - if (${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME} - OR ${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME} STREQUAL "" - ) - if ("${LIBRARY_DEP}" STREQUAL "TRUE") +# @MACRO: tribits_sweep_backward_enable_upstream_packages() +# +# Sweep backwards and enable required and (optionally) optional upstream +# packages. +# +# This sets the final value for: +# +# * `${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES`_ +# +# See implementation for details. +# +macro(tribits_sweep_backward_enable_upstream_packages) - tribits_private_print_disable_required_package_enable( - ${PACKAGE_NAME} ${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME} - ${FORWARD_DEP_PACKAGE_NAME} "library" ) + set(tap1_extraMsgStr "") + if (${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES) + set(tap1_extraMsgStr + " (and optional since ${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES=ON)") + endif() - set(${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME} OFF) + tribits_get_sublist_nondisabled( ${PROJECT_NAME}_DEFINED_PACKAGES + ${PROJECT_NAME}_NOTDISABLED_PACKAGES "") + tribits_create_reverse_list(${PROJECT_NAME}_NOTDISABLED_PACKAGES + ${PROJECT_NAME}_REVERSE_NOTDISABLED_PACKAGES) + + message("\nEnabling all required${tap1_extraMsgStr} upstream packages for current" + " set of enabled packages (${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE=" + "${${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE}) ...\n") + foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_REVERSE_NOTDISABLED_PACKAGES) + tribits_enable_upstream_packages(${tad1_tribitsPkg}) + endforeach() + # NOTE: Above, we have to loop through the packages backward to enable all + # the packages that this package depends on. This has to include *all* + # upstream package enables including required packages, and optional + # packages (when ${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES). - else() + tribits_get_sublist_enabled( ${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES + ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES "") - set(DEP_TYPE_STR "test/example") + message("\nEnabling all optional intra-package enables" + " _ENABLE_ that are not currently disabled" + " if both sets of packages are enabled ...\n") + foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES) + tribits_postprocess_optional_package_enables(${tad1_tribitsPkg}) + endforeach() - if (${FORWARD_DEP_PACKAGE_NAME}_ENABLE_TESTS - OR "${${FORWARD_DEP_PACKAGE_NAME}_ENABLE_TESTS}" STREQUAL "" - ) - tribits_private_print_disable_required_package_enable( - ${PACKAGE_NAME} ${FORWARD_DEP_PACKAGE_NAME}_ENABLE_TESTS - ${FORWARD_DEP_PACKAGE_NAME} "${DEP_TYPE_STR}" ) - set(${FORWARD_DEP_PACKAGE_NAME}_ENABLE_TESTS OFF) - endif() +endmacro() - if (${FORWARD_DEP_PACKAGE_NAME}_ENABLE_EXAMPLES - OR "${${FORWARD_DEP_PACKAGE_NAME}_ENABLE_EXAMPLES}" STREQUAL "" - ) - tribits_private_print_disable_required_package_enable( - ${PACKAGE_NAME} ${FORWARD_DEP_PACKAGE_NAME}_ENABLE_EXAMPLES - ${FORWARD_DEP_PACKAGE_NAME} "${DEP_TYPE_STR}" ) - set(${FORWARD_DEP_PACKAGE_NAME}_ENABLE_EXAMPLES OFF) - endif() - endif() +# @MACRO: tribits_set_cache_vars_for_current_enabled_packages() +# +macro(tribits_set_cache_vars_for_current_enabled_packages) + message("\nSet cache entries for optional packages/TPLs and tests/examples for packages actually enabled ...\n") + foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES) + tribits_setup_optional_package_enables_and_cache_vars(${tad1_tribitsPkg}) + endforeach() +endmacro() - endif() -endmacro() +# @MACRO: tribits_do_final_parent_packages_enables_for_subpackage_enables() +# +macro(tribits_do_final_parent_packages_enables_for_subpackage_enables) + message("\nEnabling the shell of non-enabled parent packages (mostly for show)" + " that have at least one subpackage enabled ...\n") + foreach(tad1_tribitsPkg IN LISTS + ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES + ) + tribits_enable_parent_package_for_subpackage_enables(${tad1_tribitsPkg}) + endforeach() + # NOTE: The above ensures that loops involving the parent package will + # process the parent package. But this has to be done after all of the + # other enable/disable logic to ensure no downstream dependencies will be + # enabled based on this. -macro(tribits_private_disable_optional_package_enables - FORWARD_DEP_PACKAGE_NAME PACKAGE_NAME - ) +endmacro() - #message("TRIBITS_PRIVATE_DISABLE_OPTIONAL_PACKAGE_ENABLES" - # " ${FORWARD_DEP_PACKAGE_NAME} ${PACKAGE_NAME}") - #message("-- " "${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME} = ${${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME}}") - #assert_defined(${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME}) - if (${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME} OR "${${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME}}" STREQUAL "") - # Always disable the conditional enable but only print the message if the package is enabled. - #message("-- Disable ${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME} ...") - if (${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME}) - if (${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME}) # is explicitly try already! - message("-- " - "NOTE: Setting ${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME}=OFF" - " which was ${${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME}}" - " because ${FORWARD_DEP_PACKAGE_NAME} has an optional library dependence" - " on disabled package ${PACKAGE_NAME}") - else() # Not explicitly set - message("-- " - "Setting ${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME}=OFF" - " because ${FORWARD_DEP_PACKAGE_NAME} has an optional library dependence" - " on disabled package ${PACKAGE_NAME}") - endif() - endif() - set(${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME} OFF) - endif() +# Macro that sets up the basic lists of enabled packages and packages. +# +macro(tribits_setup_enabled_lists_and_pkg_idxs) + + # ${PROJECT_NAME}_ENABLED_PACKAGES + tribits_get_sublist_enabled( + ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES + ${PROJECT_NAME}_ENABLED_INTERNAL_TOPLEVEL_PACKAGES + ${PROJECT_NAME}_NUM_ENABLED_INTERNAL_TOPLEVEL_PACKAGES) + + # ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES + tribits_get_sublist_enabled( ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES + ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES + ${PROJECT_NAME}_NUM_ENABLED_INTERNAL_PACKAGES) + + # ${PROJECT_NAME}_REVERSE_ENABLED_INTERNAL_PACKAGES + unset(${PROJECT_NAME}_REVERSE_ENABLED_INTERNAL_PACKAGES) # Wipe out temp value + + # Set ${tribitsPackage}_PKG_IDX for each enabled package + set(pkgIdx 0) + foreach(tribitsPackage ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) + set(${tribitsPackage}_PKG_IDX ${pkgIdx}) + math(EXPR pkgIdx "${pkgIdx} + 1") + endforeach() endmacro() -# Macro that disabled a packages if its required upstream TPL is disabled.. +# @MACRO: tribits_setup_direct_packages_dependencies_lists_and_lib_required_enable_vars() +# +# Set up flat list of direct external and inner package dependencies (even for +# non-enabled packages) and enabled package dependencies for enabled packages. # -macro(tribits_disable_package_if_tpl_disabled TRIBITS_PACKAGE) +macro(tribits_setup_direct_packages_dependencies_lists_and_lib_required_enable_vars) - foreach(TPL_NAME ${${TRIBITS_PACKAGE}_LIB_REQUIRED_DEP_TPLS}) - if ( (NOT TPL_ENABLE_${TPL_NAME}) AND - (NOT "${TPL_ENABLE_${TPL_NAME}}" STREQUAL "") - ) - tribits_private_disable_tpl_required_package_enable( - ${TPL_NAME} ${TRIBITS_PACKAGE} TRUE ) - endif() + foreach(tad1_externalPkgName IN LISTS ${PROJECT_NAME}_DEFINED_TPLS) + tribits_extpkg_setup_enabled_dependencies(${tad1_externalPkgName}) + # ToDo: Assert that all of the listed dependencies in + # ${tad1_externalPkgName}_LIB_ENABLED_DEPENDENCIES exist and are + # upstream from ${tad1_externalPkgName} endforeach() - foreach(TPL_NAME ${${TRIBITS_PACKAGE}_TEST_REQUIRED_DEP_TPLS}) - if ( (NOT TPL_ENABLE_${TPL_NAME}) AND - (NOT "${TPL_ENABLE_${TPL_NAME}}" STREQUAL "") - ) - tribits_private_disable_tpl_required_package_enable( - ${TPL_NAME} ${TRIBITS_PACKAGE} FALSE ) - endif() + foreach(tad1_internalPkgName IN LISTS ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES) + tribits_setup_enabled_dependencies_lists_and_enable_vars(${tad1_internalPkgName}) endforeach() endmacro() -# Macro that disables all of the subpackages of a parent package. +# @MACRO: tribits_print_direct_packages_dependencies_lists() +# +macro(tribits_print_direct_packages_dependencies_lists) + if (${PROJECT_NAME}_DUMP_PACKAGE_DEPENDENCIES) + message("\nDumping direct enabled dependencies for each package ...") + foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_DEFINED_PACKAGES) + tribits_print_direct_package_dependencies_lists(${tad1_tribitsPkg}) + endforeach() + endif() +endmacro() + + + +################################################################################ # -macro(tribits_disable_parents_subpackages PARENT_PACKAGE_NAME) +# Second-level macros called indirectly from ``tribits_adjust_package_enables()`` +# +################################################################################ - #message("TRIBITS_DISABLE_PARENTS_SUBPACKAGES: ${PARENT_PACKAGE_NAME}") - #print_var(${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME}) +# Macro that disables all of the subpackages of a parent package. +# +macro(tribits_disable_parents_subpackages parentPackageName) - if(NOT ${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME} - AND NOT ${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME} STREQUAL "" + if(NOT ${PROJECT_NAME}_ENABLE_${parentPackageName} + AND (NOT ${PROJECT_NAME}_ENABLE_${parentPackageName} STREQUAL "") ) - set(SUBPACKAGE_IDX 0) - foreach(TRIBITS_SUBPACKAGE ${${PARENT_PACKAGE_NAME}_SUBPACKAGES}) + foreach(tap2_subPkgName IN LISTS ${parentPackageName}_SUBPACKAGES) - set(SUBPACKAGE_NAME ${TRIBITS_SUBPACKAGE}) - set(SUBPACKAGE_FULLNAME ${PARENT_PACKAGE_NAME}${TRIBITS_SUBPACKAGE}) + set(subpkgFullName ${parentPackageName}${tap2_subPkgName}) - #print_var(${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}) - if (NOT ${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME} STREQUAL "OFF") - set(ENABLE_BEING_DISABLED_VAR_NAME ${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}) + if (NOT ${PROJECT_NAME}_ENABLE_${subpkgFullName} STREQUAL "OFF") + set(packageBeingDisabledVarName ${PROJECT_NAME}_ENABLE_${subpkgFullName}) message("-- " - "Setting subpackage enable ${ENABLE_BEING_DISABLED_VAR_NAME}=OFF" - " because parent package ${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME}=OFF") - set(${ENABLE_BEING_DISABLED_VAR_NAME} OFF) + "Setting subpackage enable ${packageBeingDisabledVarName}=OFF" + " because parent package ${PROJECT_NAME}_ENABLE_${parentPackageName}=OFF") + set(${packageBeingDisabledVarName} OFF) endif() - math(EXPR SUBPACKAGE_IDX "${SUBPACKAGE_IDX}+1") - endforeach() endif() @@ -318,44 +447,62 @@ macro(tribits_disable_parents_subpackages PARENT_PACKAGE_NAME) endmacro() -# Macro that enables all of the subpackages of a parent package. +# Macro that disables forward package that depends on the passed-in package # -macro(tribits_enable_parents_subpackages PARENT_PACKAGE_NAME) - - #message("TRIBITS_ENABLE_PARENTS_SUBPACKAGES: ${PARENT_PACKAGE_NAME}") +macro(tribits_disable_forward_required_dep_packages packageName) + tribits_get_package_enable_status(${packageName} packageEnable "") + if ((NOT packageEnable) AND (NOT "${packageEnable}" STREQUAL "")) + foreach(fwdDepPkg IN LISTS ${packageName}_FORWARD_LIB_DEFINED_DEPENDENCIES) + if (${fwdDepPkg}_LIB_DEP_REQUIRED_${packageName}) + tribits_private_disable_required_package_enables(${fwdDepPkg} + ${packageName} TRUE) + else() + tribits_private_disable_optional_package_enables(${fwdDepPkg} + ${packageName} TRUE) + endif() + endforeach() + foreach(fwdDepPkg IN LISTS ${packageName}_FORWARD_TEST_DEFINED_DEPENDENCIES) + if (${fwdDepPkg}_TEST_DEP_REQUIRED_${packageName}) + tribits_private_disable_required_package_enables(${fwdDepPkg} + ${packageName} FALSE) + endif() + endforeach() + endif() +endmacro() - #print_var(${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME}) - if(${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME}) +# Macro that enables all of the subpackages of a parent package. +# +macro(tribits_enable_parents_subpackages parentPackageName) - set(SUBPACKAGE_IDX 0) - foreach(TRIBITS_SUBPACKAGE ${${PARENT_PACKAGE_NAME}_SUBPACKAGES}) + if(${PROJECT_NAME}_ENABLE_${parentPackageName}) - set(SUBPACKAGE_NAME ${TRIBITS_SUBPACKAGE}) - set(SUBPACKAGE_FULLNAME ${PARENT_PACKAGE_NAME}${TRIBITS_SUBPACKAGE}) + set(subpkgIdx 0) + foreach(tap2_subPkgName IN LISTS ${parentPackageName}_SUBPACKAGES) - #print_var(${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}) + set(subpkgFullName ${parentPackageName}${tap2_subPkgName}) - if (NOT ${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME} AND - NOT "${${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}}" STREQUAL "" + if (NOT ${PROJECT_NAME}_ENABLE_${subpkgFullName} AND + NOT "${${PROJECT_NAME}_ENABLE_${subpkgFullName}}" STREQUAL "" ) # The subpackage is already disabled and is not just empty! - elseif (${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}) + elseif (${PROJECT_NAME}_ENABLE_${subpkgFullName}) # The subpackage is already enabled so there is no reason to enable it! else() # The subpackage is not hard off or on so turn it on by default - tribits_implicit_package_enable_is_allowed( "" ${SUBPACKAGE_FULLNAME} - SUBPACKAGE_ALLOW_IMPLICIT_ENABLE) - if (SUBPACKAGE_ALLOW_IMPLICIT_ENABLE) - set(ENABLE_BEING_ENABLED_VAR_NAME ${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}) + tribits_implicit_package_enable_is_allowed( "" ${subpkgFullName} + subpkgAllowImplicitEnable) + if (subpkgAllowImplicitEnable) + set(enableVarName ${PROJECT_NAME}_ENABLE_${subpkgFullName}) message("-- " - "Setting subpackage enable ${ENABLE_BEING_ENABLED_VAR_NAME}=ON" - " because parent package ${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME}=ON") - set(${ENABLE_BEING_ENABLED_VAR_NAME} ON) + "Setting subpackage enable ${enableVarName}=ON" + " because parent package ${PROJECT_NAME}_ENABLE_${parentPackageName}=" + "${${PROJECT_NAME}_ENABLE_${parentPackageName}}") + set(${enableVarName} ON) endif() endif() - math(EXPR SUBPACKAGE_IDX "${SUBPACKAGE_IDX}+1") + math(EXPR subpkgIdx "${subpkgIdx}+1") endforeach() @@ -364,129 +511,201 @@ macro(tribits_enable_parents_subpackages PARENT_PACKAGE_NAME) endmacro() -# Macro that disables all forward packages that depend on the given packages +# Macro used to set ${PROJECT_NAME}_ENABLE_ based on +# ${PROJECT_NAME}_ENABLE_ALL_PACKAGES # -macro(tribits_disable_forward_required_dep_packages PACKAGE_NAME) - - #message("TRIBITS_DISABLE_FORWARD_REQUIRED_DEP_PACKAGES: ${PACKAGE_NAME}") - - if ( - (NOT ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - AND - (NOT "${${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}}" STREQUAL "") - ) - - foreach(FWD_DEP_PKG ${${PACKAGE_NAME}_FORWARD_LIB_REQUIRED_DEP_PACKAGES}) - tribits_private_disable_required_package_enables(${FWD_DEP_PKG} ${PACKAGE_NAME} TRUE) - endforeach() +macro(tribits_apply_all_package_enables packageName) + tribits_is_primary_meta_project_package(${packageName} packageIsPmpp) + tribits_implicit_package_enable_is_allowed( "" ${packageName} + processThisPackageEnable ) + if (packageIsPmpp AND processThisPackageEnable) + tribits_set_package_enable_based_on_project_enable( + ${PROJECT_NAME}_ENABLE_ALL_PACKAGES ${PROJECT_NAME}_ENABLE_${packageName} ) + endif() +endmacro() - foreach(FWD_DEP_PKG ${${PACKAGE_NAME}_FORWARD_LIB_OPTIONAL_DEP_PACKAGES}) - tribits_private_disable_optional_package_enables(${FWD_DEP_PKG} ${PACKAGE_NAME}) - endforeach() - foreach(FWD_DEP_PKG ${${PACKAGE_NAME}_FORWARD_TEST_REQUIRED_DEP_PACKAGES}) - tribits_private_disable_required_package_enables(${FWD_DEP_PKG} ${PACKAGE_NAME} FALSE) +# Macro used to set ${PROJECT_NAME}_ENABLE_${FWD_PACKAGE_NAME}=ON for all +# forward required or optional LIB dependency on ${packageName} +# +macro(tribits_enable_forward_lib_package_enables packageName) + if (${PROJECT_NAME}_ENABLE_${packageName}) + foreach(fwdDepPkgName IN LISTS ${packageName}_FORWARD_LIB_DEFINED_DEPENDENCIES) + tribits_private_enable_forward_package(${fwdDepPkgName} ${packageName}) endforeach() - endif() - endmacro() -# Macro that prints out dependencies for a package +# Macro used to set ${PROJECT_NAME}_ENABLE_${FWD_PACKAGE_NAME}=ON for all +# forward required or optional TEST dependency on ${packageName} # -# Does not modify the global state. -# -macro(tribits_print_package_dependencies PACKAGE_NAME) - - set(PRINTED_VAR "") +macro(tribits_enable_forward_test_package_enables packageName) + foreach(fwdDepPkgName IN LISTS ${packageName}_FORWARD_TEST_DEFINED_DEPENDENCIES) + tribits_private_enable_forward_package(${fwdDepPkgName} ${packageName}) + endforeach() +endmacro() +# NOTE: The above macro does not need to check if ${packageName} is enabled +# because it will only be called for packages that are enabled already. This +# not only improves performance but it also aids in testing. - print_nonempty_var_with_spaces(${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES PRINTED_VAR) - print_nonempty_var_with_spaces(${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES PRINTED_VAR) - print_nonempty_var_with_spaces(${PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES PRINTED_VAR) - print_nonempty_var_with_spaces(${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES PRINTED_VAR) - if (${PROJECT_NAME}_DUMP_FORWARD_PACKAGE_DEPENDENCIES) - print_nonempty_var_with_spaces(${PACKAGE_NAME}_FORWARD_LIB_REQUIRED_DEP_PACKAGES - PRINTED_VAR) - print_nonempty_var_with_spaces(${PACKAGE_NAME}_FORWARD_LIB_OPTIONAL_DEP_PACKAGES - PRINTED_VAR) - print_nonempty_var_with_spaces(${PACKAGE_NAME}_FORWARD_TEST_REQUIRED_DEP_PACKAGES - PRINTED_VAR) - print_nonempty_var_with_spaces(${PACKAGE_NAME}_FORWARD_TEST_OPTIONAL_DEP_PACKAGES - PRINTED_VAR) +# Macro to disable ${parentPackageName)_ENABLE_ENABLES by default if +# ${parentPackageName)_ENABLE_TESTS is explicitly disabled. +# +macro(tribits_apply_package_examples_disable parentPackageName) + if ( (NOT ${parentPackageName}_ENABLE_TESTS) + AND (NOT "${${parentPackageName}_ENABLE_TESTS}" STREQUAL "") + AND ("${${parentPackageName}_ENABLE_EXAMPLES}" STREQUAL "") + ) + message("-- " "Setting" + " ${parentPackageName}_ENABLE_EXAMPLES" + "=${${parentPackageName}_ENABLE_TESTS}" + " because" + " ${parentPackageName}_ENABLE_TESTS" + "=${${parentPackageName}_ENABLE_TESTS}" ) + set(${parentPackageName}_ENABLE_EXAMPLES ${${parentPackageName}_ENABLE_TESTS}) endif() +endmacro() +# NOTE: Above, the top-level package ${parentPackageName} may not even be +# enabled yet when this gets called but its subpackages might and we need to +# process this default disable in case their are any enabled subpackages. - print_nonempty_var_with_spaces(${PACKAGE_NAME}_LIB_REQUIRED_DEP_TPLS PRINTED_VAR) - print_nonempty_var_with_spaces(${PACKAGE_NAME}_LIB_OPTIONAL_DEP_TPLS PRINTED_VAR) - print_nonempty_var_with_spaces(${PACKAGE_NAME}_TEST_REQUIRED_DEP_TPLS PRINTED_VAR) - print_nonempty_var_with_spaces(${PACKAGE_NAME}_TEST_OPTIONAL_DEP_TPLS PRINTED_VAR) - if (NOT PRINTED_VAR) - message("-- ${PACKAGE_NAME}: No dependencies!") +# Macro to disable _ENABLE_TESTS and +# _ENABLE_EXAMPLES based on +# _ENABLE_TESTS or _ENABLE_EXAMPLES +# +macro(tribits_apply_subpackage_tests_or_examples_disables parentPackageName + testsOrExamples + ) + set(parentPkgEnableVar ${parentPackageName}_ENABLE_${testsOrExamples}) + if ((NOT ${parentPkgEnableVar}) AND (NOT "${${parentPkgEnableVar}}" STREQUAL "")) + foreach(subpkgName IN LISTS ${parentPackageName}_SUBPACKAGES) + set(fullSpkgName ${parentPackageName}${subpkgName}) + if (${PROJECT_NAME}_ENABLE_${fullSpkgName}) + if ("${${fullSpkgName}_ENABLE_${testsOrExamples}}" STREQUAL "") + message("-- " "Setting" + " ${fullSpkgName}_ENABLE_${testsOrExamples}=${${parentPkgEnableVar}}" + " because parent package" + " ${parentPkgEnableVar}=${${parentPkgEnableVar}}") + set(${fullSpkgName}_ENABLE_${testsOrExamples} ${${parentPkgEnableVar}}) + endif() + endif() + endforeach() endif() - endmacro() +# Macro used to set _ENABLE_TESTS and +# _ENABLE_EXAMPLES based on ${PROJECT_NAME}_ENABLE_TESTS and +# ${PROJECT_NAME}_ENABLE_EXAMPLES # -# Private helper macros -# - +macro(tribits_apply_test_example_enables packageName) + if (${PROJECT_NAME}_ENABLE_${packageName}) + tribits_is_primary_meta_project_package(${packageName} packageIsPmmp) + if (packageIsPmmp) + tribits_set_package_enable_based_on_project_enable_on( + ${PROJECT_NAME}_ENABLE_TESTS ${packageName}_ENABLE_TESTS ) + tribits_set_package_enable_based_on_project_enable_on( + ${PROJECT_NAME}_ENABLE_EXAMPLES ${packageName}_ENABLE_EXAMPLES ) + endif() + endif() +endmacro() -macro(tribits_private_add_optional_package_enable PACKAGE_NAME OPTIONAL_DEP_PACKAGE - TYPE SET_AS_CACHE_IN - ) - #message("\nPACKAGE_ARCH_PRIVATE_ADD_OPTIONAL_PACKAGE_ENABLE: ${PACKAGE_NAME} ${OPTIONAL_DEP_PACKAGE}") +# Macro to enable subpackage tests and examples based on parent package tests +# and examples enables +# +macro(tribits_apply_subpackage_tests_examples_enables parentPackageName) + # Set default for ${parentPackageName}_ENABLE_EXAMPLES=OFF if tests disabled + if ( ("${${parentPackageName}_ENABLE_EXAMPLES}" STREQUAL "") + AND ${parentPackageName}_ENABLE_TESTS + ) + message("-- " "Setting" + " ${parentPackageName}_ENABLE_EXAMPLES=${${parentPackageName}_ENABLE_TESTS}" + " because" + " ${parentPackageName}_ENABLE_TESTS=${${parentPackageName}_ENABLE_TESTS}") + set(${parentPackageName}_ENABLE_EXAMPLES ${${parentPackageName}_ENABLE_TESTS}) + endif() + # Set defaults for _ENABLE_[TESTS|EXAMPLES] + set(parentEnableExamples ${${parentPackageName}_ENABLE_EXAMPLES}) + set(parentEnableTests ${${parentPackageName}_ENABLE_TESTS}) + foreach(subpkgName IN LISTS ${parentPackageName}_SUBPACKAGES) + set(fullSpkgName ${parentPackageName}${subpkgName}) + if (${PROJECT_NAME}_ENABLE_${fullSpkgName}) + if (parentEnableTests AND ("${${fullSpkgName}_ENABLE_TESTS}" STREQUAL "")) + message("-- " "Setting" + " ${fullSpkgName}_ENABLE_TESTS=${parentEnableTests}" + " because parent package" + " ${parentPackageName}_ENABLE_TESTS=${parentEnableTests}") + set(${fullSpkgName}_ENABLE_TESTS ${parentEnableTests}) + endif() + if (parentEnableExamples AND ("${${fullSpkgName}_ENABLE_EXAMPLES}" STREQUAL "")) + message("-- " "Setting" + " ${fullSpkgName}_ENABLE_EXAMPLES=${parentEnableExamples}" + " because parent package" + " ${parentPackageName}_ENABLE_EXAMPLES=${parentEnableExamples}") + set(${fullSpkgName}_ENABLE_EXAMPLES ${parentEnableExamples}) + endif() + endif() + endforeach() +endmacro() +# NOTE: Above, the parent package may not actually be enabled yet +# (i.e. ${PROJECT_NAME}_ENABLE_${parentPackageName} my not be TRUE) if only +# subpackages needed to be enabled in the forward sweep but we want the tests +# and examples for a subpackage to be enabled if the tests and examples for +# the parent package, respectfully, are enabled. - if (SET_AS_CACHE_IN) - multiline_set(DOCSTR - "Enable optional ${TYPE} support in the package ${PACKAGE_NAME}" - " for the package ${OPTIONAL_DEP_PACKAGE}." - " Set to 'ON', 'OFF', or leave empty" - " to allow for other logic to decide." - ) +# Macro that enables upstream (required and optional) packages for a given +# package +# +macro(tribits_enable_upstream_packages packageName) - set_cache_on_off_empty( ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE} "" - ${DOCSTR} ) + if (${PROJECT_NAME}_ENABLE_${packageName}) - else() + foreach(depPkg IN LISTS ${packageName}_LIB_DEFINED_DEPENDENCIES) + tribits_private_enable_dep_package(${packageName} ${depPkg} LIB) + endforeach() - if (NOT DEFINED ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}) - set( ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE} "" ) - endif() + foreach(depPkg IN LISTS ${packageName}_TEST_DEFINED_DEPENDENCIES) + tribits_private_enable_dep_package(${packageName} ${depPkg} TEST) + endforeach() endif() endmacro() +# NOTE: The above macro has a defect. It is enabling upstream test dependent +# packages even if tests nor examples are not enabled (see +# TriBITSPub/TriBITS#56). But fixing this will break backward compatibility +# and therefore require upgrading the packages that currently only work +# correctly because of this defect. -macro(tribits_private_add_optional_tpl_enable PACKAGE_NAME OPTIONAL_DEP_TPL - TYPE SET_AS_CACHE_IN ) - - if (SET_AS_CACHE_IN) - - multiline_set(DOCSTR - "Enable optional ${TYPE} support in the package ${PACKAGE_NAME}" - " for the TPL ${OPTIONAL_DEP_TPL}." - " Set to 'ON', 'OFF', or leave empty" - " to allow for other logic to decide." - ) +# Macro that post-processes optional dependencies after all other +# dependencies have been worked out +# +macro(tribits_postprocess_optional_package_enables packageName) - set_cache_on_off_empty( ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL} "" - ${DOCSTR} ) + if (${PROJECT_NAME}_ENABLE_${packageName}) - else() + foreach(depPkg ${${packageName}_LIB_DEFINED_DEPENDENCIES}) + tribits_private_postprocess_optional_package_enable( + ${packageName} ${depPkg} ) + endforeach() - if (NOT DEFINED ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}) - set( ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL} "" ) - endif() + foreach(depPkg ${${packageName}_TEST_DEFINED_DEPENDENCIES}) + tribits_private_postprocess_optional_package_enable( + ${packageName} ${depPkg} ) + endforeach() endif() endmacro() +# NOTE: Above, it is harmless to process required dependencies as well so we +# leave of the if () statement based on +# ${packageName}_[LIB|TEST]_DEP_REQUIRED_${depPkg}. # Macro that sets cache vars for optional package interdependencies @@ -494,70 +713,89 @@ endmacro() # This also will set ${PACKAGE_NAME}_ENABLE_TESTS and # ${PACKAGE_NAME}_ENABLE_EXAMPLES to empty non-cache vars # -macro(tribits_set_up_optional_package_enables_and_cache_vars PACKAGE_NAME) - - #message("\nPACKAGE_ARCH_ADD_OPTIONAL_PACKAGE_ENABLES: ${PACKAGE_NAME}") +macro(tribits_setup_optional_package_enables_and_cache_vars packageName) - assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - set(SET_AS_CACHE ${${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}}) + assert_defined(${PROJECT_NAME}_ENABLE_${packageName}) + set(setAsCacheVar ${${PROJECT_NAME}_ENABLE_${packageName}}) - if (SET_AS_CACHE) + if (setAsCacheVar) - multiline_set(DOCSTR - "Build tests for the package ${PACKAGE_NAME}. Set to 'ON', 'OFF', or leave empty ''" + multiline_set(docStr + "Build tests for the package ${packageName}. Set to 'ON', 'OFF', or leave empty ''" " to allow for other logic to decide." ) - set_cache_on_off_empty( ${PACKAGE_NAME}_ENABLE_TESTS "" ${DOCSTR} ) + set_cache_on_off_empty( ${packageName}_ENABLE_TESTS "" ${docStr} ) - multiline_set(DOCSTR - "Build examples for the package ${PACKAGE_NAME}. Set to 'ON', 'OFF', or leave empty ''" + multiline_set(docStr + "Build examples for the package ${packageName}. Set to 'ON', 'OFF', or leave empty ''" " to allow for other logic to decide." ) - set_cache_on_off_empty( ${PACKAGE_NAME}_ENABLE_EXAMPLES "" ${DOCSTR} ) + set_cache_on_off_empty( ${packageName}_ENABLE_EXAMPLES "" ${docStr} ) - multiline_set(DOCSTR - "Build examples for the package ${PACKAGE_NAME}. Set to 'ON', 'OFF', or leave empty ''" + multiline_set(docStr + "Build examples for the package ${packageName}. Set to 'ON', 'OFF', or leave empty ''" " to allow for other logic to decide." ) - set( ${PACKAGE_NAME}_SKIP_CTEST_ADD_TEST - "${${PROJECT_NAME}_SKIP_CTEST_ADD_TEST}" CACHE BOOL ${DOCSTR} ) + set( ${packageName}_SKIP_CTEST_ADD_TEST + "${${PROJECT_NAME}_SKIP_CTEST_ADD_TEST}" CACHE BOOL ${docStr} ) else() - if (NOT DEFINED ${PACKAGE_NAME}_ENABLE_TESTS) - set( ${PACKAGE_NAME}_ENABLE_TESTS "" ) + if (NOT DEFINED ${packageName}_ENABLE_TESTS) + set( ${packageName}_ENABLE_TESTS "" ) endif() - if (NOT DEFINED ${PACKAGE_NAME}_ENABLE_EXAMPLES) - set( ${PACKAGE_NAME}_ENABLE_EXAMPLES "" ) + if (NOT DEFINED ${packageName}_ENABLE_EXAMPLES) + set( ${packageName}_ENABLE_EXAMPLES "" ) endif() endif() - foreach(OPTIONAL_DEP_PACKAGE ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES}) + foreach(optDepPkg ${${packageName}_LIB_DEFINED_DEPENDENCIES}) tribits_private_add_optional_package_enable( - ${PACKAGE_NAME} ${OPTIONAL_DEP_PACKAGE} "library" "${SET_AS_CACHE}" ) + ${packageName} ${optDepPkg} "library" "${setAsCacheVar}" ) endforeach() - foreach(OPTIONAL_DEP_PACKAGE ${${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES}) + foreach(optDepPkg ${${packageName}_TEST_DEFINED_DEPENDENCIES}) tribits_private_add_optional_package_enable( - ${PACKAGE_NAME} ${OPTIONAL_DEP_PACKAGE} "test" "${SET_AS_CACHE}" ) - endforeach() - - foreach(OPTIONAL_DEP_TPL ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_TPLS}) - tribits_private_add_optional_tpl_enable( - ${PACKAGE_NAME} ${OPTIONAL_DEP_TPL} "library" "${SET_AS_CACHE}" ) - endforeach() - - foreach(OPTIONAL_DEP_TPL ${${PACKAGE_NAME}_TEST_OPTIONAL_DEP_TPLS}) - tribits_private_add_optional_tpl_enable( - ${PACKAGE_NAME} ${OPTIONAL_DEP_TPL} "test" "${SET_AS_CACHE}" ) + ${packageName} ${optDepPkg} "test" "${setAsCacheVar}" ) endforeach() endmacro() -# Macro that sets up the flat list of direct package dependencies and enabled -# package dependencies and sets ${packageName}_ENABLE_${depPkg} for LIB +# Macro that enables a the top-level parent package enable if any of its +# subpackages are enabled. +# +macro(tribits_enable_parent_package_for_subpackage_enables toplevelPackageName) + foreach(tap2_subPkgName IN LISTS ${toplevelPackageName}_SUBPACKAGES) + set(subpkgFullName ${toplevelPackageName}${tap2_subPkgName}) + if (${PROJECT_NAME}_ENABLE_${subpkgFullName} + AND (NOT ${PROJECT_NAME}_ENABLE_${toplevelPackageName}) + ) + message("-- " + "Setting ${PROJECT_NAME}_ENABLE_${toplevelPackageName}=ON" + " because ${PROJECT_NAME}_ENABLE_${subpkgFullName}=ON") + set(${PROJECT_NAME}_ENABLE_${toplevelPackageName} ON) + tribits_set_parent_package_subpackage_enable_for_enabled_subpackages( + ${toplevelPackageName}) + tribits_set_parent_package_test_example_enable_for_enabled_subpackages( + ${toplevelPackageName} TESTS) + tribits_set_parent_package_test_example_enable_for_enabled_subpackages( + ${toplevelPackageName} EXAMPLES) + # NOTE: Above, we need to enable the parent package even if it was + # disabled by some means before this. (There are use cases where the + # parent package my be disabled but that may not trigger the disable of + # subpackages of that package.) Other logic should ensure that the + # parent package is never explicitly disabled and a subpackage is + # allowed to be enabled. + break() # We only need trigger above code for single enabled subpackage! + endif() + endforeach() +endmacro() + + +# Macro that sets up the flat list of direct package dependencies and enabled +# package dependencies and sets ${packageName}_ENABLE_${depPkg} for LIB # dependencies # # This makes it easy to just loop over all of the direct upstream dependencies @@ -565,17 +803,11 @@ endmacro() # # NOTES: # -# * ${packageName}_LIB_DEFINED_DEPENDENCIES will be set regardless if -# ${packageName} is enabled or not. -# # * ${packageName}_LIB_ENABLED_DEPENDENCIES is only set if ${packageName} is # enabled and will only contain the names of direct library upstream # internal and external packages ${depPkg} that are required or are # optional and ${packageName}_ENABLE_${depPkg} is set to ON. # -# * ${packageName}_TEST_DEFINED_DEPENDENCIES will be set regardless if -# ${packageName} is enabled or not. -# # * ${packageName}_TEST_ENABLED_DEPENDENCIES is only set if ${packageName} is # enabled and will only contain the names of direct test/example upstream # internal and external packages ${depPkg} that are required or are @@ -589,1196 +821,387 @@ endmacro() # packages where only the shell of the parent package is enabled and not # all of its required subpackages are enabled. # -macro(tribits_setup_direct_package_dependencies_lists_and_lib_required_enable_vars - packageName - ) +macro(tribits_setup_enabled_dependencies_lists_and_enable_vars packageName) - # LIB dependencies + tribits_get_package_enable_status(${packageName} packageEnable packageEnableVar) - set(${packageName}_LIB_DEFINED_DEPENDENCIES "") set(${packageName}_LIB_ENABLED_DEPENDENCIES "") - - foreach(depPkg ${${packageName}_LIB_REQUIRED_DEP_PACKAGES}) - list(APPEND ${packageName}_LIB_DEFINED_DEPENDENCIES ${depPkg}) - if (${PROJECT_NAME}_ENABLE_${packageName} AND ${PROJECT_NAME}_ENABLE_${depPkg}) - set(${packageName}_ENABLE_${depPkg} ON) - list(APPEND ${packageName}_LIB_ENABLED_DEPENDENCIES ${depPkg}) - endif() - endforeach() - # See below NOTE about required subpackage dependencies not being enabled in - # some cases! - - foreach(depPkg ${${packageName}_LIB_OPTIONAL_DEP_PACKAGES}) - list(APPEND ${packageName}_LIB_DEFINED_DEPENDENCIES ${depPkg}) - if (${PROJECT_NAME}_ENABLE_${packageName} AND ${packageName}_ENABLE_${depPkg}) - list(APPEND ${packageName}_LIB_ENABLED_DEPENDENCIES ${depPkg}) - endif() - endforeach() - - foreach(depPkg ${${packageName}_LIB_REQUIRED_DEP_TPLS}) - list(APPEND ${packageName}_LIB_DEFINED_DEPENDENCIES ${depPkg}) - if (${PROJECT_NAME}_ENABLE_${packageName}) - set(${packageName}_ENABLE_${depPkg} ON) - list(APPEND ${packageName}_LIB_ENABLED_DEPENDENCIES ${depPkg}) - endif() - endforeach() - - foreach(depPkg ${${packageName}_LIB_OPTIONAL_DEP_TPLS}) - list(APPEND ${packageName}_LIB_DEFINED_DEPENDENCIES ${depPkg}) - if (${PROJECT_NAME}_ENABLE_${packageName} AND ${packageName}_ENABLE_${depPkg}) - list(APPEND ${packageName}_LIB_ENABLED_DEPENDENCIES ${depPkg}) + foreach(depPkg IN LISTS ${packageName}_LIB_DEFINED_DEPENDENCIES) + tribits_get_package_enable_status(${depPkg} depPkgEnable depPkgEnableVar) + if (${packageName}_LIB_DEP_REQUIRED_${depPkg}) + if (packageEnable AND depPkgEnable) + set(${packageName}_ENABLE_${depPkg} ON) + # See below NOTE about required subpackage dependencies not being + # enabled in some cases + list(APPEND ${packageName}_LIB_ENABLED_DEPENDENCIES ${depPkg}) + endif() + else() + if (packageEnable AND ${packageName}_ENABLE_${depPkg}) + list(APPEND ${packageName}_LIB_ENABLED_DEPENDENCIES ${depPkg}) + endif() endif() endforeach() - # TEST dependencies - - set(${packageName}_TEST_DEFINED_DEPENDENCIES "") set(${packageName}_TEST_ENABLED_DEPENDENCIES "") - - if (${PROJECT_NAME}_ENABLE_${packageName} - AND - (${packageName}_ENABLE_TESTS OR ${packageName}_ENABLE_EXAMPLES) - ) - set(enablePkgAndTestsOrExamples ON) - else() - set(enablePkgAndTestsOrExamples OFF) + if (packageEnable AND (${packageName}_ENABLE_TESTS OR ${packageName}_ENABLE_EXAMPLES)) + foreach(depPkg IN LISTS ${packageName}_TEST_DEFINED_DEPENDENCIES) + if (${packageName}_TEST_DEP_REQUIRED_${depPkg}) + list(APPEND ${packageName}_TEST_ENABLED_DEPENDENCIES ${depPkg}) + else() + if (${packageName}_ENABLE_${depPkg}) + list(APPEND ${packageName}_TEST_ENABLED_DEPENDENCIES ${depPkg}) + endif() + endif() + endforeach() endif() - foreach(depPkg ${${packageName}_TEST_REQUIRED_DEP_PACKAGES}) - list(APPEND ${packageName}_TEST_DEFINED_DEPENDENCIES ${depPkg}) - if (enablePkgAndTestsOrExamples) - list(APPEND ${packageName}_TEST_ENABLED_DEPENDENCIES ${depPkg}) - endif() - endforeach() - - foreach(depPkg ${${packageName}_TEST_OPTIONAL_DEP_PACKAGES}) - list(APPEND ${packageName}_TEST_DEFINED_DEPENDENCIES ${depPkg}) - if (enablePkgAndTestsOrExamples AND ${packageName}_ENABLE_${depPkg}) - list(APPEND ${packageName}_TEST_ENABLED_DEPENDENCIES ${depPkg}) - endif() - endforeach() - - foreach(depPkg ${${packageName}_TEST_REQUIRED_DEP_TPLS}) - list(APPEND ${packageName}_TEST_DEFINED_DEPENDENCIES ${depPkg}) - if (enablePkgAndTestsOrExamples) - list(APPEND ${packageName}_TEST_ENABLED_DEPENDENCIES ${depPkg}) - endif() - endforeach() - - foreach(depPkg ${${packageName}_TEST_OPTIONAL_DEP_TPLS}) - list(APPEND ${packageName}_TEST_DEFINED_DEPENDENCIES ${depPkg}) - if (enablePkgAndTestsOrExamples AND ${packageName}_ENABLE_${depPkg}) - list(APPEND ${packageName}_TEST_ENABLED_DEPENDENCIES ${depPkg}) - endif() - endforeach() - endmacro() # NOTE: Above, a required dependency of an enabled package may not actually be -# enabled if it is a required subpackage of a parent package and the parent -# package was not actually enabled due to a dependency but the shell of the -# parent package was only enabled at the very end. This is one of the more -# confusing aspects of the TriBITS dependency system. +# enabled if the upstream depPkg is a required subpackage of a parent package +# and the parent package was not actually enabled due to a dependency, but +# instead, only the shell of the parent package was enabled at the very end +# (in tribits_do_final_parent_packages_enables_for_subpackage_enables()). +# This is one of the more confusing aspects of the TriBITS dependency system. # Function to print the direct package dependency lists # function(tribits_print_direct_package_dependencies_lists packageName) - set(PRINTED_VAR "") message("") - print_nonempty_var_with_spaces(${packageName}_LIB_ENABLED_DEPENDENCIES PRINTED_VAR) - print_var_with_spaces(${packageName}_LIB_DEFINED_DEPENDENCIES PRINTED_VAR) - print_nonempty_var_with_spaces(${packageName}_TEST_ENABLED_DEPENDENCIES PRINTED_VAR) - print_nonempty_var_with_spaces(${packageName}_TEST_DEFINED_DEPENDENCIES PRINTED_VAR) + set(printedVar "") + tribits_print_nonempty_package_deps_list(${packageName} LIB ENABLED printedVar) + tribits_print_nonempty_package_deps_list(${packageName} TEST ENABLED printedVar) + if (NOT printedVar) + message("-- ${packageName}: No enabled dependencies!") + endif() endfunction() + +################################################################################ # -# Private helper macros +# Third and lower-level macros called indirectly from +# ``tribits_adjust_package_enables()`` # +################################################################################ -# Enable optional intra-package support for enabled target package -# ${PACKAGE_NAME} (i.e. ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} is assumed to -# be TRUE before calling this macro. +# Only turn off ${fwdDepPkgName} libraries or test/examples if it is currently +# enabled or could be enabled # -macro(tribits_private_postprocess_optional_package_enable PACKAGE_NAME OPTIONAL_DEP_PACKAGE) - - #message("TRIBITS_PRIVATE_POSTPROCESS_OPTIONAL_PACKAGE_ENABLE: ${PACKAGE_NAME} ${OPTIONAL_DEP_PACKAGE}") - #print_var(${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}) - #print_var(${PROJECT_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}) - - if (${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE} AND ${PROJECT_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}) - message("-- " "NOTE:" - " ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}=${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}}" - " is already set!") - elseif ("${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}}" STREQUAL "") - if (${PROJECT_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}) - message("-- " "Setting ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}=ON" - " since ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}=ON AND" - " ${PROJECT_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}=ON") - set(${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE} ON) +macro(tribits_private_disable_required_package_enables + fwdDepPkgName packageName libraryDep + ) + tribits_get_package_enable_status(${fwdDepPkgName} "" fwdDepPkgEnableVarName) + if (${fwdDepPkgEnableVarName} OR "${${fwdDepPkgEnableVarName}}" STREQUAL "") + if ("${libraryDep}" STREQUAL "TRUE") + tribits_private_print_disable_required_package_enable( + ${packageName} ${fwdDepPkgEnableVarName} + ${fwdDepPkgName} "library" ) + set(${fwdDepPkgEnableVarName} OFF) else() - message("-- " "NOT setting ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}=ON" - " since ${OPTIONAL_DEP_PACKAGE} is NOT enabled at this point!") - endif() - elseif (NOT "${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}}" STREQUAL "" - AND NOT ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE} - AND ${PROJECT_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE} - ) - message("-- " "NOTE: ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}=${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}}" - " is already set so not enabling even though ${PROJECT_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}=${${PROJECT_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}} is set!") - endif() - - string(TOUPPER ${PACKAGE_NAME} PACKAGE_NAME_UPPER) - string(TOUPPER ${OPTIONAL_DEP_PACKAGE} OPTIONAL_DEP_PACKAGE_UPPER) - set(MACRO_DEFINE_NAME HAVE_${PACKAGE_NAME_UPPER}_${OPTIONAL_DEP_PACKAGE_UPPER}) + set(depTypeStr "test/example") + if (${fwdDepPkgName}_ENABLE_TESTS + OR "${${fwdDepPkgName}_ENABLE_TESTS}" STREQUAL "" + ) + tribits_private_print_disable_required_package_enable( + ${packageName} ${fwdDepPkgName}_ENABLE_TESTS + ${fwdDepPkgName} "${depTypeStr}" ) + set(${fwdDepPkgName}_ENABLE_TESTS OFF) + endif() - if(${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}) - set(${MACRO_DEFINE_NAME} ON) - else() - set(${MACRO_DEFINE_NAME} OFF) + if (${fwdDepPkgName}_ENABLE_EXAMPLES + OR "${${fwdDepPkgName}_ENABLE_EXAMPLES}" STREQUAL "" + ) + tribits_private_print_disable_required_package_enable( + ${packageName} ${fwdDepPkgName}_ENABLE_EXAMPLES + ${fwdDepPkgName} "${depTypeStr}" ) + set(${fwdDepPkgName}_ENABLE_EXAMPLES OFF) + endif() + endif() endif() - endmacro() +function(tribits_private_print_disable_required_package_enable + packageName packageEnableSomethingVarName fwdDepPkgName + depTypeStr + ) + tribits_private_print_disable( + ${packageEnableSomethingVarName} ${fwdDepPkgName} + "${depTypeStr}" "package" ${packageName} ) +endfunction() -# Enable optional intra-package support for enabled target package -# ${PACKAGE_NAME} (i.e. ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} is assumed to -# be TRUE before calling this macro. -# -macro(tribits_private_postprocess_optional_tpl_enable PACKAGE_NAME OPTIONAL_DEP_TPL) - - #message("TRIBITS_PRIVATE_POSTPROCESS_OPTIONAL_TPL_ENABLE: ${PACKAGE_NAME} ${OPTIONAL_DEP_TPL}") - - if (${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL} AND TPL_ENABLE_${OPTIONAL_DEP_TPL}) - message("-- " "NOTE:" - " ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}=${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}}" - " is already set!") - elseif ( - (NOT TPL_ENABLE_${OPTIONAL_DEP_TPL}) - AND - (NOT "${TPL_ENABLE_${OPTIONAL_DEP_TPL}}" STREQUAL "") - AND - ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL} - ) - message( - "\n***" - "\n*** NOTE: Setting ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}=OFF" - " which was ON since TPL_ENABLE_${OPTIONAL_DEP_TPL}=OFF" - "\n***\n" - ) - set(${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL} OFF) - elseif ("${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}}" STREQUAL "" - AND TPL_ENABLE_${OPTIONAL_DEP_TPL} - ) - message("-- " "Setting ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}=ON" - " since TPL_ENABLE_${OPTIONAL_DEP_TPL}=ON") - set(${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL} ON) - elseif (NOT "${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}}" STREQUAL "" - AND NOT ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL} - AND TPL_ENABLE_${OPTIONAL_DEP_TPL} - ) - message("-- " "NOTE: ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}=${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}}" - " is already set so not enabling even though TPL_ENABLE_${OPTIONAL_DEP_TPL}=${TPL_ENABLE_${OPTIONAL_DEP_TPL}} is set!") - endif() - - string(TOUPPER ${PACKAGE_NAME} PACKAGE_NAME_UPPER) - string(TOUPPER ${OPTIONAL_DEP_TPL} OPTIONAL_DEP_TPL_UPPER) - set(MACRO_DEFINE_NAME HAVE_${PACKAGE_NAME_UPPER}_${OPTIONAL_DEP_TPL_UPPER}) - if (${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}) - set(${MACRO_DEFINE_NAME} ON) +function(tribits_private_print_disable + packageBeingDisabledVarName packageWithSomethingBeingDisabledName + depTypeStr thingBeingDisabledType thingBeingDisabledName + ) + if (${packageBeingDisabledVarName}) + if (${PROJECT_NAME}_DISABLE_ENABLED_FORWARD_DEP_PACKAGES) + message( + " ***\n" + " *** NOTE: Setting ${packageBeingDisabledVarName}=OFF" + " which was '${${packageBeingDisabledVarName}}' because" + " ${packageWithSomethingBeingDisabledName} has" + " a required ${depTypeStr} dependence on disabled" + " ${thingBeingDisabledType} ${thingBeingDisabledName}" + " but ${PROJECT_NAME}_DISABLE_ENABLED_FORWARD_DEP_PACKAGES=ON!\n" + " ***\n" + ) + else() + message(FATAL_ERROR + " ***\n" + " *** ERROR: Setting ${packageBeingDisabledVarName}=OFF" + " which was '${${packageBeingDisabledVarName}}' because" + " ${packageWithSomethingBeingDisabledName} has" + " a required ${depTypeStr} dependence on disabled" + " ${thingBeingDisabledType} ${thingBeingDisabledName}!\n" + " ***\n" + ) + endif() else() - set(${MACRO_DEFINE_NAME} OFF) - endif() - -endmacro() - - -# Macro that post-processes optional dependencies after all other -# dependencies have been worked out -# -macro(tribits_postprocess_optional_package_enables PACKAGE_NAME) - - #message("\nPACKAGE_ARCH_POSTPROCESS_OPTIONAL_PACKAGE_ENABLES: ${PACKAGE_NAME}") - - assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - - foreach(OPTIONAL_DEP_PACKAGE ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES}) - tribits_private_postprocess_optional_package_enable( - ${PACKAGE_NAME} ${OPTIONAL_DEP_PACKAGE} ) - endforeach() - - foreach(OPTIONAL_DEP_PACKAGE ${${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES}) - tribits_private_postprocess_optional_package_enable( - ${PACKAGE_NAME} ${OPTIONAL_DEP_PACKAGE} ) - endforeach() - + message("-- " + "Setting ${packageBeingDisabledVarName}=OFF" + " because ${packageWithSomethingBeingDisabledName} has a required ${depTypeStr}" + " dependence on disabled ${thingBeingDisabledType} ${thingBeingDisabledName}") endif() +endfunction() -endmacro() - - -# Macro that post-processes final package enables for packages with subpackage -# enables. -# -macro(tribits_postprocess_package_with_subpackages_enables PACKAGE_NAME) - #message("TRIBITS_POSTPROCESS_PACKAGE_WITH_SUBPACKAGES_ENABLES '${PACKAGE_NAME}'") - foreach(TRIBITS_SUBPACKAGE ${${PACKAGE_NAME}_SUBPACKAGES}) - set(SUBPACKAGE_FULLNAME ${PACKAGE_NAME}${TRIBITS_SUBPACKAGE}) - #print_var(${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}) - #print_var(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - #print_var(${SUBPACKAGE_FULLNAME}_ENABLE_TESTS) - #print_var(${PACKAGE_NAME}_ENABLE_TESTS) - #print_var(${SUBPACKAGE_FULLNAME}_ENABLE_EXAMPLES) - #print_var(${PACKAGE_NAME}_ENABLE_EXAMPLES) - if (${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME} - AND NOT ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} - ) - message("-- " - "Setting ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}=ON" - " because ${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}=ON") - set(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} ON) - tribits_postprocess_package_with_subpackages_optional_subpackage_enables( - ${PACKAGE_NAME}) - tribits_postprocess_package_with_subpackages_test_example_enables( - ${PACKAGE_NAME} TESTS) - tribits_postprocess_package_with_subpackages_test_example_enables( - ${PACKAGE_NAME} EXAMPLES) - # NOTE: We need to enable the parent package even if it was disabled by - # some means before this because a subpackage is enabled. But other - # logic should ensure that the parent package is never disabled and a - # subpackage is allowed to be enabled. - endif() - endforeach() -endmacro() +macro(tribits_private_disable_optional_package_enables fwdDepPkgName packageName) -# Set _ENABLE_=ON if not already enabled for all -# subpackages of a parent package. -# -macro(tribits_postprocess_package_with_subpackages_optional_subpackage_enables - PACKAGE_NAME - ) - #message("TRIBITS_POSTPROCESS_PACKAGE_WITH_SUBPACKAGES_TEST_EXAMPLE_ENABLES '${PACKAGE_NAME}'") - foreach(TRIBITS_SUBPACKAGE ${${PACKAGE_NAME}_SUBPACKAGES}) - set(SUBPACKAGE_FULLNAME ${PACKAGE_NAME}${TRIBITS_SUBPACKAGE}) - if (${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME} - AND "${${PACKAGE_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}}" STREQUAL "" - ) - message("-- " - "Setting ${PACKAGE_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}=ON" - " because ${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}=ON") - set(${PACKAGE_NAME}_ENABLE_${SUBPACKAGE_FULLNAME} ON) + if (${fwdDepPkgName}_ENABLE_${packageName} + OR "${${fwdDepPkgName}_ENABLE_${packageName}}" STREQUAL "" + ) + # Always disable the conditional enable but only print the message if the + # package is enabled or if a disable overrides an enable + if (${PROJECT_NAME}_ENABLE_${fwdDepPkgName}) + if (${fwdDepPkgName}_ENABLE_${packageName}) # is explicitly enabled already! + message("-- " + "NOTE: Setting ${fwdDepPkgName}_ENABLE_${packageName}=OFF" + " which was ${${fwdDepPkgName}_ENABLE_${packageName}}" + " because ${fwdDepPkgName} has an optional library dependence" + " on disabled package ${packageName}") + else() # Not explicitly set + message("-- " + "Setting ${fwdDepPkgName}_ENABLE_${packageName}=OFF" + " because ${fwdDepPkgName} has an optional library dependence" + " on disabled package ${packageName}") + endif() endif() - endforeach() -endmacro() - - -# Set the parent package tests/examples enables if one subpackage is enabled -# and has its tests/examples -# -macro(tribits_postprocess_package_with_subpackages_test_example_enables - PACKAGE_NAME TESTS_OR_EXAMPLES - ) - #message("TRIBITS_POSTPROCESS_PACKAGE_WITH_SUBPACKAGES_TEST_EXAMPLE_ENABLES '${PACKAGE_NAME}'") - foreach(TRIBITS_SUBPACKAGE ${${PACKAGE_NAME}_SUBPACKAGES}) - set(SUBPACKAGE_FULLNAME ${PACKAGE_NAME}${TRIBITS_SUBPACKAGE}) - #print_var(${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}) - #print_var(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - #print_var(${SUBPACKAGE_FULLNAME}_ENABLE_${TESTS_OR_EXAMPLES}) - #print_var(${PACKAGE_NAME}_ENABLE_${TESTS_OR_EXAMPLES}) - #print_var(${SUBPACKAGE_FULLNAME}_ENABLE_EXAMPLES) - #print_var(${PACKAGE_NAME}_ENABLE_EXAMPLES) - if (${SUBPACKAGE_FULLNAME}_ENABLE_${TESTS_OR_EXAMPLES} - AND "${${PACKAGE_NAME}_ENABLE_${TESTS_OR_EXAMPLES}}" STREQUAL "" + if (${fwdDepPkgName}_ENABLE_${packageName} + AND (NOT ${PROJECT_NAME}_ENABLE_${packageName}) + AND (NOT "${${PROJECT_NAME}_ENABLE_${packageName}}" STREQUAL "") ) - message("-- " - "Setting ${PACKAGE_NAME}_ENABLE_${TESTS_OR_EXAMPLES}=ON" - " because ${SUBPACKAGE_FULLNAME}_ENABLE_${TESTS_OR_EXAMPLES}=ON") - set(${PACKAGE_NAME}_ENABLE_${TESTS_OR_EXAMPLES} ON) + message("-- " "NOTE: ${fwdDepPkgName}_ENABLE_${packageName}=" + "${${fwdDepPkgName}_ENABLE_${packageName}} but" + " ${PROJECT_NAME}_ENABLE_${packageName}=" + "${${PROJECT_NAME}_ENABLE_${packageName}} is set. Setting" + " ${fwdDepPkgName}_ENABLE_${packageName}=OFF!") endif() - endforeach() -endmacro() - - -# Post-processes optional package TPL based on if the TPL -# has been enabled or not -# -macro(tribits_postprocess_optional_tpl_enables PACKAGE_NAME) - - #message("\nPACKAGE_ARCH_ADD_OPTIONAL_TPL_ENABLES: ${PACKAGE_NAME}") - - if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - - foreach(OPTIONAL_DEP_TPL ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_TPLS}) - tribits_private_postprocess_optional_tpl_enable( - ${PACKAGE_NAME} ${OPTIONAL_DEP_TPL} ) - endforeach() - - foreach(OPTIONAL_DEP_TPL ${${PACKAGE_NAME}_TEST_OPTIONAL_DEP_TPLS}) - tribits_private_postprocess_optional_tpl_enable( - ${PACKAGE_NAME} ${OPTIONAL_DEP_TPL} ) - endforeach() - + set(${fwdDepPkgName}_ENABLE_${packageName} OFF) endif() endmacro() -# Set an individual package variable enable variable (to on or off) based on a +# Set an individual package variable enable variable (to ON or OFF) based on a # global enable value # -macro(tribits_set_package_enable_based_on_global_enable projectEnableVar +macro(tribits_set_package_enable_based_on_project_enable projectEnableVar packageEnableVar ) - if (${PROJECT_NAME}_VERBOSE_CONFIGURE) - message("") - message("TRIBITS_SET_PACKAGE_ENABLE_BASED_ON_GLOBAL_ENABLE:") - message("-- " "${projectEnableVar} = ${${projectEnableVar}}") - message("-- " "${packageEnableVar} = ${${packageEnableVar}}") - endif() - if ("${${packageEnableVar}}" STREQUAL "") if (${projectEnableVar}) message("-- " "Setting ${packageEnableVar}=ON") set(${packageEnableVar} ON) - elseif ( - (NOT ${projectEnableVar}) - AND - (NOT "${projectEnableVar}" STREQUAL "") + elseif ( (NOT ${projectEnableVar}) + AND (NOT "${projectEnableVar}" STREQUAL "") ) message("-- " "Setting ${packageEnableVar}=OFF") set(${packageEnableVar} OFF) else() - if (${PROJECT_NAME}_VERBOSE_CONFIGURE) - message("-- " "ELSE") - # Otherwise, we will leave it up the the individual package - # to decide? - endif() + # Otherwise, we will leave it up the the individual package + # to decide? endif() else() - if (${PROJECT_NAME}_VERBOSE_CONFIGURE) - message("-- " "${packageEnableVar} NOT DEFAULT") - endif() - endif() - - if (${PROJECT_NAME}_VERBOSE_CONFIGURE) - message("-- " "${packageEnableVar} = ${${packageEnableVar}}") + # "${packageEnableVar} not at the default empty '' endif() endmacro() -# Set an individual package test or examples enable to on only if global enable var is on +# Set an individual package test or examples enable to on only if global +# enable var is on # -macro(tribits_set_package_enable_based_on_global_enable_on projectEnableVar +macro(tribits_set_package_enable_based_on_project_enable_on projectEnableVar packageEnableVar ) - if ("${${packageEnableVar}}" STREQUAL "") - if (${projectEnableVar}) - message("-- " "Setting ${packageEnableVar}=ON") - set(${packageEnableVar} ON) - endif() + if (("${${packageEnableVar}}" STREQUAL "") AND ${projectEnableVar}) + message("-- " "Setting ${packageEnableVar}=ON") + set(${packageEnableVar} ON) endif() endmacro() -# Macro used to set ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} based on -# ${PROJECT_NAME}_ENABLE_ALL_PACKAGES -# -macro(tribits_apply_all_package_enables PACKAGE_NAME) - tribits_is_primary_meta_project_package(${PACKAGE_NAME} PACKAGE_IS_PMPP) - tribits_implicit_package_enable_is_allowed( "" ${PACKAGE_NAME} - PROCESS_PACKAGE_ENABLE ) - if (PACKAGE_IS_PMPP AND PROCESS_PACKAGE_ENABLE) - tribits_set_package_enable_based_on_global_enable( - ${PROJECT_NAME}_ENABLE_ALL_PACKAGES ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} ) +macro(tribits_private_enable_dep_package packageName depPkgName libOrTest) + tribits_get_package_enable_status(${depPkgName} depPkgEnable depPkgEnableVar) + if (depPkgEnable) + #message("The package is already enabled so there is nothing to enable!") + elseif (${depPkgEnableVar} STREQUAL "") + set(tpedp_enableDepPkg "") + if (${packageName}_${libOrTest}_DEP_REQUIRED_${depPkgName}) + message("-- " "Setting ${depPkgEnableVar}=ON" + " because ${packageName} has a required dependence on ${depPkgName}") + set(tpedp_enableDepPkg ON) + elseif (${packageName}_ENABLE_${depPkgName}) + # Enable the upstream package if the user directly specified the + # optional package enable regardless if it is PT or ST or even EX. + message("-- " "Setting ${depPkgEnableVar}=ON" + " because ${packageName}_ENABLE_${depPkgName}=ON") + set(tpedp_enableDepPkg ON) + elseif (${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES) + # Enable the package if there is an optional dependence and we are asked + # to enabled optional dependencies. + tribits_implicit_package_enable_is_allowed(${packageName} ${depPkgName} + allowImplicitEnable) + if (allowImplicitEnable) + message("-- " "Setting ${depPkgEnableVar}=ON" + " because ${packageName} has an optional dependence on ${depPkgName}") + set(tpedp_enableDepPkg ON) + endif() + endif() + # Enable the upstream package + if (tpedp_enableDepPkg) + set(${depPkgEnableVar} ON) + set(${depPkgName}_ENABLING_PKG ${packageName}) + endif() endif() endmacro() -# Macro used to set ${TRIBITS_PACKAGE)_ENABLE_TESTS and ${TRIBITS_PACKAGE)_ENABLE_EXAMPLES -# based on ${PROJECT_NAME}_ENABLE_TESTS and ${PROJECT_NAME}_ENABLE_EXAMPLES +# Enable optional intra-package support for enabled target package +# ${packageName} (i.e. ${PROJECT_NAME}_ENABLE_${packageName} is assumed to +# be TRUE before calling this macro. # -macro(tribits_apply_test_example_enables PACKAGE_NAME) - if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - tribits_is_primary_meta_project_package(${PACKAGE_NAME} PACKAGE_IS_PMPP) - if (PACKAGE_IS_PMPP) - tribits_set_package_enable_based_on_global_enable_on( - ${PROJECT_NAME}_ENABLE_TESTS ${PACKAGE_NAME}_ENABLE_TESTS ) - tribits_set_package_enable_based_on_global_enable_on( - ${PROJECT_NAME}_ENABLE_EXAMPLES ${PACKAGE_NAME}_ENABLE_EXAMPLES ) - endif() - endif() -endmacro() +macro(tribits_private_postprocess_optional_package_enable packageName optDepPkg) + tribits_get_package_enable_status(${optDepPkg} optDepPkgEnable optDepPkgEnableVar) + tribits_get_package_enable_status(${packageName} packageEnable packageEnableVar) -# Macro to disable ${PARENT_PACKAGE_NAME)_ENABLE_ENABLES by default if -# ${PARENT_PACKAGE_NAME)_ENABLE_TESTS is explicitly disabled. -# -macro(tribits_apply_package_examples_disable PARENT_PACKAGE_NAME) - if (NOT "${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}" STREQUAL "" - AND NOT ${PARENT_PACKAGE_NAME}_ENABLE_TESTS - AND "${${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES}" STREQUAL "" + if (${packageName}_ENABLE_${optDepPkg} AND optDepPkgEnable) + message("-- " "NOTE:" + " ${packageName}_ENABLE_${optDepPkg}=${${packageName}_ENABLE_${optDepPkg}}" + " is already set!") + elseif ("${${packageName}_ENABLE_${optDepPkg}}" STREQUAL "") + if (optDepPkgEnable) + message("-- " "Setting ${packageName}_ENABLE_${optDepPkg}=ON" + " since ${packageEnableVar}=ON AND" + " ${optDepPkgEnableVar}=ON") + set(${packageName}_ENABLE_${optDepPkg} ON) + else() + message("-- " "NOT setting ${packageName}_ENABLE_${optDepPkg}=ON" + " since ${optDepPkg} is NOT enabled at this point!") + endif() + elseif ((NOT "${${packageName}_ENABLE_${optDepPkg}}" STREQUAL "") + AND (NOT ${packageName}_ENABLE_${optDepPkg}) + AND optDepPkgEnable ) - message("-- " "Setting" - " ${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES" - "=${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}" - " because" - " ${PARENT_PACKAGE_NAME}_ENABLE_TESTS" - "=${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}" ) - set(${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES ${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}) + message("-- " "NOTE: ${packageName}_ENABLE_${optDepPkg}=" + "${${packageName}_ENABLE_${optDepPkg}} is already set so not enabling even" + " though ${optDepPkgEnableVar}=" + "${optDepPkgEnable} is set!") endif() -endmacro() -# NOTE: Above, the top-level package ${PARENT_PACKAGE_NAME} may not even be -# enabled yet when this gets called but its subpackages might and we need to -# process this default disable in case their are any enabled subpackages. + string(TOUPPER ${packageName} packageName_UPPER) + string(TOUPPER ${optDepPkg} optDepPkg_UPPER) + set(macroDefineName HAVE_${packageName_UPPER}_${optDepPkg_UPPER}) -# Macro to disable ${TRIBITS_SUBPACKAGE)_ENABLE_TESTS and -# ${TRIBITS_SUBPACKAGE)_ENABLE_EXAMPLES based on -# ${TRIBITS_PARENTPACKAGE)_ENABLE_TESTS or -# ${TRIBITS_PARENTPACKAGE)_ENABLE_EXAMPLES -# -macro(tribits_apply_subpackage_tests_or_examples_disables PARENT_PACKAGE_NAME - TESTS_OR_EXAMPLES - ) - set(parentPkgEnableVar ${PARENT_PACKAGE_NAME}_ENABLE_${TESTS_OR_EXAMPLES}) - if (NOT "${${parentPkgEnableVar}}" STREQUAL "" AND NOT ${parentPkgEnableVar}) - foreach(spkg IN LISTS ${PARENT_PACKAGE_NAME}_SUBPACKAGES) - set(fullSpkgName ${PARENT_PACKAGE_NAME}${spkg}) - if (${PROJECT_NAME}_ENABLE_${fullSpkgName} AND NOT ${parentPkgEnableVar}) - if ("${${fullSpkgName}_ENABLE_${TESTS_OR_EXAMPLES}}" STREQUAL "") - message("-- " "Setting" - " ${fullSpkgName}_ENABLE_${TESTS_OR_EXAMPLES}=${${parentPkgEnableVar}}" - " because parent package" - " ${parentPkgEnableVar}=${${parentPkgEnableVar}}") - set(${fullSpkgName}_ENABLE_${TESTS_OR_EXAMPLES} ${${parentPkgEnableVar}}) - endif() - endif() - endforeach() + if(${packageName}_ENABLE_${optDepPkg}) + set(${macroDefineName} ON) + else() + set(${macroDefineName} OFF) endif() + endmacro() -# Macro to enable ${TRIBITS_SUBPACKAGE)_ENABLE_TESTS and -# ${TRIBITS_SUBPACKAGE)_ENABLE_EXAMPLES based on -# ${TRIBITS_PARENTPACKAGE)_ENABLE_TESTS or -# ${TRIBITS_PARENTPACKAGE)_ENABLE_EXAMPLES -# -macro(tribits_apply_subpackage_tests_examples_enables PARENT_PACKAGE_NAME) - if ("${${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES}" STREQUAL "" - AND ${PARENT_PACKAGE_NAME}_ENABLE_TESTS - ) - message("-- " "Setting" - " ${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES=${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}" - " because" - " ${PARENT_PACKAGE_NAME}_ENABLE_TESTS=${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}") - set(${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES ${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}) +macro(tribits_private_enable_forward_package fwdDepPkgName packageName) + tribits_implicit_package_enable_is_allowed( "" ${fwdDepPkgName} allowFwdDepPkgEnable) + if ("${${PROJECT_NAME}_ENABLE_${fwdDepPkgName}}" STREQUAL "" AND allowFwdDepPkgEnable) + message("-- " "Setting ${PROJECT_NAME}_ENABLE_${fwdDepPkgName}=ON" + " because ${PROJECT_NAME}_ENABLE_${packageName}=ON") + set(${PROJECT_NAME}_ENABLE_${fwdDepPkgName} ON) endif() - foreach(spkg IN LISTS ${PARENT_PACKAGE_NAME}_SUBPACKAGES) - set(fullSpkgName ${PARENT_PACKAGE_NAME}${spkg}) - if (${PROJECT_NAME}_ENABLE_${fullSpkgName}) - if (${PARENT_PACKAGE_NAME}_ENABLE_TESTS) - if ("${${fullSpkgName}_ENABLE_TESTS}" STREQUAL "") - message("-- " "Setting" - " ${fullSpkgName}_ENABLE_TESTS=${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}" - " because parent package" - " ${PARENT_PACKAGE_NAME}_ENABLE_TESTS" - "=${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}") - set(${fullSpkgName}_ENABLE_TESTS ${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}) - endif() - endif() - if (${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES) - if ("${${fullSpkgName}_ENABLE_EXAMPLES}" STREQUAL "") - message("-- " "Setting" - " ${fullSpkgName}_ENABLE_EXAMPLES=${${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES}" - " because parent package" - " ${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES" - "=${${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES}") - set(${fullSpkgName}_ENABLE_EXAMPLES ${${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES}) - endif() - endif() - endif() - endforeach() endmacro() -# NOTE: Above, the parent package may not actually be enabled yet -# (i.e. ${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME} my not be TRUE) if only -# subpackages needed to be enabled in the forward sweep but we want the tests -# and examples for subpackage to be enabled if -# ${PARENT_PACKAGE_NAME}_ENABLE_TESTS=ON or just examples i -# f${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES=ON -macro(tribits_private_enable_forward_package FORWARD_DEP_PACKAGE_NAME PACKAGE_NAME) - tribits_implicit_package_enable_is_allowed( "" ${FORWARD_DEP_PACKAGE_NAME} - ALLOW_PACKAGE_ENABLE ) - assert_defined(${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME}) - if("${${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME}}" STREQUAL "" - AND ALLOW_PACKAGE_ENABLE - ) - message("-- " "Setting ${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME}=ON" - " because ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}=ON") - assert_defined(${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME}) - set(${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME} ON) - endif() -endmacro() +macro(tribits_private_add_optional_package_enable packageName optionalDepPkgName + libraryOrTest setAsCacheVar + ) + if (setAsCacheVar) -# Macro used to set ${PROJECT_NAME}_ENABLE_${FWD_PACKAGE_NAME)=ON for all -# -macro(tribits_enable_forward_lib_package_enables PACKAGE_NAME) + multiline_set(docStr + "Enable optional ${libraryOrTest} support in the package ${packageName}" + " for the package ${optionalDepPkgName}." + " Set to 'ON', 'OFF', or leave empty" + " to allow for other logic to decide." + ) - assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + set_cache_on_off_empty( ${packageName}_ENABLE_${optionalDepPkgName} "" + ${docStr} ) - foreach(FWD_DEP_PKG ${${PACKAGE_NAME}_FORWARD_LIB_REQUIRED_DEP_PACKAGES}) - tribits_private_enable_forward_package(${FWD_DEP_PKG} ${PACKAGE_NAME}) - endforeach() + else() - foreach(FWD_DEP_PKG ${${PACKAGE_NAME}_FORWARD_LIB_OPTIONAL_DEP_PACKAGES}) - tribits_private_enable_forward_package(${FWD_DEP_PKG} ${PACKAGE_NAME}) - endforeach() + if (NOT DEFINED ${packageName}_ENABLE_${optionalDepPkgName}) + set(${packageName}_ENABLE_${optionalDepPkgName} "" ) + endif() endif() endmacro() -# Macro used to set ${PROJECT_NAME}_ENABLE_${FWD_PACKAGE_NAME)=ON for all -# optional and required forward test dependencies of the package -# ${PACKAGE_NAME} +# Macro that sets ``_ENABLE_=ON`` if not already +# enabled for all enabled subpackages of a parent package. # -macro(tribits_enable_forward_test_package_enables PACKAGE_NAME) - - assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - - foreach(FWD_DEP_PKG ${${PACKAGE_NAME}_FORWARD_TEST_REQUIRED_DEP_PACKAGES}) - tribits_private_enable_forward_package(${FWD_DEP_PKG} ${PACKAGE_NAME}) - endforeach() - - foreach(FWD_DEP_PKG ${${PACKAGE_NAME}_FORWARD_TEST_OPTIONAL_DEP_PACKAGES}) - tribits_private_enable_forward_package(${FWD_DEP_PKG} ${PACKAGE_NAME}) - endforeach() - - endif() - +macro(tribits_set_parent_package_subpackage_enable_for_enabled_subpackages + toplevelPackageName + ) + foreach(tap3_subPkg IN LISTS ${toplevelPackageName}_SUBPACKAGES) + set(subpkgFullName ${toplevelPackageName}${tap3_subPkg}) + if (${PROJECT_NAME}_ENABLE_${subpkgFullName} + AND "${${toplevelPackageName}_ENABLE_${subpkgFullName}}" STREQUAL "" + ) + message("-- " + "Setting ${toplevelPackageName}_ENABLE_${subpkgFullName}=ON" + " because ${PROJECT_NAME}_ENABLE_${subpkgFullName}=ON") + set(${toplevelPackageName}_ENABLE_${subpkgFullName} ON) + endif() + endforeach() endmacro() +# Macro that sets ``_ENABLE_[TESTS|EXAMPLES]=ON`` if subpackage +# is enabled and has its tests/examples are enabled. # -# Private helper macros -# - - -macro(tribits_private_enable_dep_package PACKAGE_NAME DEP_PACKAGE_NAME - OPTREQ_IN +macro(tribits_set_parent_package_test_example_enable_for_enabled_subpackages + toplevelPackageName testOrExamples ) + foreach(tap3_subPkg IN LISTS ${toplevelPackageName}_SUBPACKAGES) + set(subpkgFullName ${toplevelPackageName}${tap3_subPkg}) + if (${subpkgFullName}_ENABLE_${testOrExamples} + AND "${${toplevelPackageName}_ENABLE_${testOrExamples}}" STREQUAL "" + ) + message("-- " + "Setting ${toplevelPackageName}_ENABLE_${testOrExamples}=ON" + " because ${subpkgFullName}_ENABLE_${testOrExamples}=ON") + set(${toplevelPackageName}_ENABLE_${testOrExamples} ON) + endif() + endforeach() +endmacro() - #message("TRIBITS_PRIVATE_ENABLE_DEP_PACKAGE: '${PACKAGE_NAME}' '${DEP_PACKAGE_NAME}' '${OPTREQ_IN}'") - - assert_defined(${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME}) - #print_var(${PACKAGE_NAME}_ENABLE_${DEP_PACKAGE_NAME}) - - if (${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME}) - #message("The package is already enabled so there is nothing to enable!") - - elseif (${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME} STREQUAL "") - - set(TRIBITS_PRIVATE_ENABLE_DEP_PACKAGES_ENABLE_PACKAGE "") - - if ("${OPTREQ_IN}" STREQUAL "REQUIRED") - - #message("Always enable the upstream dependency if it is required") - - message("-- " "Setting ${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME}=ON" - " because ${PACKAGE_NAME} has a required dependence on ${DEP_PACKAGE_NAME}") - - set(TRIBITS_PRIVATE_ENABLE_DEP_PACKAGES_ENABLE_PACKAGE ON) - - elseif (${PACKAGE_NAME}_ENABLE_${DEP_PACKAGE_NAME}) - - # Enable the upstream package if the user directly specified the - # optional package enable regardless if it is PT or ST or even EX. - - message("-- " "Setting ${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME}=ON" - " because ${PACKAGE_NAME}_ENABLE_${DEP_PACKAGE_NAME}=ON") - - set(TRIBITS_PRIVATE_ENABLE_DEP_PACKAGES_ENABLE_PACKAGE ON) - - elseif (${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES) - - # Enable the package if there is an optional dependence and we are asked - # to enabled optional dependencies. - - tribits_implicit_package_enable_is_allowed(${PACKAGE_NAME} ${DEP_PACKAGE_NAME} - ALLOW_IMPLICIT_ENABLE) - if (ALLOW_IMPLICIT_ENABLE) - message("-- " "Setting ${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME}=ON" - " because ${PACKAGE_NAME} has an optional dependence on ${DEP_PACKAGE_NAME}") - set(TRIBITS_PRIVATE_ENABLE_DEP_PACKAGES_ENABLE_PACKAGE ON) - endif() - - endif() - - # Enable the upstream package - if (TRIBITS_PRIVATE_ENABLE_DEP_PACKAGES_ENABLE_PACKAGE) - assert_defined(${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME}) - set(${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME} ON) - endif() - - endif() - -endmacro() - - -macro(tribits_private_enable_dep_tpl PACKAGE_NAME DEP_TPL_NAME) - assert_defined(TPL_ENABLE_${DEP_TPL_NAME}) - if(TPL_ENABLE_${DEP_TPL_NAME} STREQUAL "") - message("-- " "Setting TPL_ENABLE_${DEP_TPL_NAME}=ON because" - " it is required by the enabled package ${PACKAGE_NAME}") - assert_defined(TPL_ENABLE_${DEP_TPL_NAME}) - set(TPL_ENABLE_${DEP_TPL_NAME} ON) - set(TPL_${DEP_TPL_NAME}_ENABLING_PKG ${PACKAGE_NAME}) - endif() -endmacro() - - -macro(tribits_private_enable_optional_dep_tpl PACKAGE_NAME DEP_TPL_NAME) - #assert_defined(${PACKAGE_NAME}_ENABLE_${DEP_TPL_NAME}) - if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} - AND ${PACKAGE_NAME}_ENABLE_${DEP_TPL_NAME} - AND TPL_ENABLE_${DEP_TPL_NAME} STREQUAL "" - ) - message("-- " "Setting TPL_ENABLE_${DEP_TPL_NAME}=ON because" - " ${PACKAGE_NAME}_ENABLE_${DEP_TPL_NAME}=ON") - assert_defined(TPL_ENABLE_${DEP_TPL_NAME}) - set(TPL_ENABLE_${DEP_TPL_NAME} ON) - endif() -endmacro() - - -# Macro that enables the optional TPLs for given package -# -macro(tribits_enable_optional_tpls PACKAGE_NAME) - - #message("TRIBITS_ENABLE_OPTIONAL_TPLS: ${PACKAGE_NAME}") - #message("-- " "${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}=${${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}}") - - assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - - if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - - foreach(DEP_TPL ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_TPLS}) - tribits_private_enable_optional_dep_tpl(${PACKAGE_NAME} ${DEP_TPL}) - endforeach() - - foreach(DEP_TPL ${${PACKAGE_NAME}_TEST_OPTIONAL_DEP_TPLS}) - tribits_private_enable_optional_dep_tpl(${PACKAGE_NAME} ${DEP_TPL}) - endforeach() - - endif() - -endmacro() - - -# Macro that enables upstream (required and optional) packages given package -# -# Here I have to enable the required packages too or the logic just does no -# work as expected. -# -macro(tribits_enable_upstream_packages PACKAGE_NAME) - - #message("TRIBITS_ENABLE_UPSTREAM_PACKAGES: ${PACKAGE_NAME}") - #message("-- " "${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}=${${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}}") - - assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - - if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - - foreach(DEP_PKG ${${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES}) - tribits_private_enable_dep_package(${PACKAGE_NAME} ${DEP_PKG} REQUIRED) - endforeach() - - foreach(DEP_PKG ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES}) - tribits_private_enable_dep_package(${PACKAGE_NAME} ${DEP_PKG} OPTIONAL) - endforeach() - - foreach(DEP_PKG ${${PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES}) - tribits_private_enable_dep_package(${PACKAGE_NAME} ${DEP_PKG} REQUIRED) - endforeach() - - foreach(DEP_PKG ${${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES}) - tribits_private_enable_dep_package(${PACKAGE_NAME} ${DEP_PKG} OPTIONAL) - endforeach() - - endif() - -endmacro() - - -# Macro that sets the required TPLs for given package -# -macro(tribits_enable_required_tpls PACKAGE_NAME) - - #message("PACKAGE_ARCH_ENABLE_REQUIRED_TPL_ENABLES: ${PACKAGE_NAME}") - #message("-- " "${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}=${${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}}") - - assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - - if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - - foreach(DEP_TPL ${${PACKAGE_NAME}_LIB_REQUIRED_DEP_TPLS}) - tribits_private_enable_dep_tpl(${PACKAGE_NAME} ${DEP_TPL}) - endforeach() - - foreach(DEP_TPL ${${PACKAGE_NAME}_TEST_REQUIRED_DEP_TPLS}) - tribits_private_enable_dep_tpl(${PACKAGE_NAME} ${DEP_TPL}) - endforeach() - - endif() - -endmacro() - - -# @MACRO: tribits_adjust_package_enables() -# -# Usage: -# -# tribits_adjust_package_enables() -# -# Macro that adjusts all of the package enables from what the user input to -# the final set that will be used to enable packages. -# -macro(tribits_adjust_package_enables) - - if (${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES) - message("") - message("Setting to empty '' all enabled packages on request ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) - if (${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE}) - set_cache_on_off_empty(${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE} "" - "Forced to empty '' by ${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES=ON" FORCE) - set(${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE} "") - endif() - #print_var(${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE}) - # NOTE: Above, we don't want to set to empty those packages that have hard - # disables because this will mess up the logic in later invocations. - endforeach() - advanced_set(${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES OFF CACHE BOOL - "Forced to FALSE after use" FORCE) - endif() - - # - # A) Sweep forward through and apply all disables first! - # - - tribits_get_nondisabled_list( ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${PROJECT_NAME} - ${PROJECT_NAME}_NOTDISABLED_PACKAGES "") - - message("") - message("Disabling all packages that have a required dependency" - " on disabled TPLs and optional package TPL support based on TPL_ENABLE_=OFF ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_NOTDISABLED_PACKAGES}) - tribits_disable_package_if_tpl_disabled(${TRIBITS_PACKAGE}) - endforeach() - - message("") - message("Disabling subpackages for hard disables of parent packages" - " due to ${PROJECT_NAME}_ENABLE_=OFF ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) - tribits_disable_parents_subpackages(${TRIBITS_PACKAGE}) - endforeach() - - message("") - message("Disabling forward required packages and optional intra-package" - " support that have a dependency on disabled packages" - " ${PROJECT_NAME}_ENABLE_=OFF ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) - tribits_disable_forward_required_dep_packages(${TRIBITS_PACKAGE}) - endforeach() - - tribits_get_nondisabled_list( ${PROJECT_NAME}_NOTDISABLED_PACKAGES ${PROJECT_NAME} - ${PROJECT_NAME}_NOTDISABLED_PACKAGES "") - - set(${PROJECT_NAME}_REVERSE_NOTDISABLED_PACKAGES - "${${PROJECT_NAME}_NOTDISABLED_PACKAGES}") - list(REVERSE ${PROJECT_NAME}_REVERSE_NOTDISABLED_PACKAGES) - - # - # B) Apply all forward enables - # - - message("") - message("Enabling subpackages for hard enables of parent packages" - " due to ${PROJECT_NAME}_ENABLE_=ON ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_NOTDISABLED_PACKAGES}) - tribits_enable_parents_subpackages(${TRIBITS_PACKAGE}) - endforeach() - - if (${PROJECT_NAME}_ENABLE_ALL_PACKAGES) - message("") - message("Enabling all packages that are not currently disabled because of" - " ${PROJECT_NAME}_ENABLE_ALL_PACKAGES=ON" - " (${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE=${${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE})" - " ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_NOTDISABLED_PACKAGES}) - tribits_apply_all_package_enables(${TRIBITS_PACKAGE}) - endforeach() - endif() - - if (${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES) - message("") - message("Sweep forward enabling all forward library dependent packages because" - " ${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES=ON ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_NOTDISABLED_PACKAGES}) - tribits_enable_forward_lib_package_enables(${TRIBITS_PACKAGE}) - endforeach() - message("") - message("Sweep backward enabling all forward test dependent packages because" - " ${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES=ON ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_REVERSE_NOTDISABLED_PACKAGES}) - tribits_enable_forward_test_package_enables(${TRIBITS_PACKAGE}) - endforeach() - # NOTE: Above, we want to sweep backward to enable test-dependent packages - # because we don't want to enable package Z just because package Y was enabled - # because it had a test-only dependency on package X. Sweeping backwards through - # the packages makes sure this does not happen. - set(${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES ON) - endif() - - tribits_get_enabled_list( ${PROJECT_NAME}_NOTDISABLED_PACKAGES ${PROJECT_NAME} - ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES "") - - # - # C) Disable and enable tests for currently enabled packages - # - - message("") - message("Disabling subpackage tests/examples based on parent package tests/examples disables ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES}) - tribits_apply_package_examples_disable(${TRIBITS_PACKAGE} TESTS) - tribits_apply_subpackage_tests_or_examples_disables(${TRIBITS_PACKAGE} TESTS) - tribits_apply_subpackage_tests_or_examples_disables(${TRIBITS_PACKAGE} EXAMPLES) - endforeach() - - if (${PROJECT_NAME}_ENABLE_TESTS OR ${PROJECT_NAME}_ENABLE_EXAMPLES) - message("") - message("Enabling all tests and/or examples that have not been" - " explicitly disabled because ${PROJECT_NAME}_ENABLE_[TESTS,EXAMPLES]=ON ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) - tribits_apply_test_example_enables(${TRIBITS_PACKAGE}) - endforeach() - endif() - # NOTE: Above, we enable tests and examples here, before the remaining required - # packages so that we don't enable tests that don't need to be enabled based - # on the use of the option ${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES. - - message("") - message("Enabling subpackage tests/examples based on parent package tests/examples enables ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES}) - tribits_apply_subpackage_tests_examples_enables(${TRIBITS_PACKAGE}) - endforeach() - # NOTE: We want to apply this logic here instead of later after the backward - # sweep of package enables because we don't want to enable the - # tests/examples for a subpackage if it is not needed based on set of - # requested subpackages and packages to be enabled and the optional forward - # sweep of downstream packages. - - # - # D) Sweep backwards and enable upstream required and optional packages - # - - if (${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES) - set(EXTRA_MSG_STR " (and optional since ${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES=ON)") - else() - set(EXTRA_MSG_STR "") - endif() - - message("") - message("Enabling all required${EXTRA_MSG_STR} upstream packages for current set of" - " enabled packages" - " (${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE=${${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE})" - " ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_REVERSE_NOTDISABLED_PACKAGES}) - tribits_enable_upstream_packages(${TRIBITS_PACKAGE}) - endforeach() - # NOTE: Above, we have to loop through the packages backward to enable all - # the packages that feed into these packages. This has to include *all* - # upstream package enables including required packages, optional packages - # (when ${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES), and packages - - tribits_get_enabled_list( ${PROJECT_NAME}_NOTDISABLED_PACKAGES ${PROJECT_NAME} - ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES "") - - message("") - message("Enabling all optional intra-package enables _ENABLE_" - " that are not currently disabled if both sets of packages are enabled ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) - tribits_postprocess_optional_package_enables(${TRIBITS_PACKAGE}) - endforeach() - - # - # E) Enable TPLs - # - - message("") - message("Enabling all remaining required TPLs for current set of" - " enabled packages ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) - tribits_enable_required_tpls(${TRIBITS_PACKAGE}) - endforeach() - - message("") - message("Enabling all optional package TPL support" - " _ENABLE_ not currently disabled for" - " enabled TPLs ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) - tribits_postprocess_optional_tpl_enables(${TRIBITS_PACKAGE}) - endforeach() - - message("") - message("Enabling TPLs based on _ENABLE_=ON if TPL is not explicitly disabled ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) - tribits_enable_optional_tpls(${TRIBITS_PACKAGE}) - endforeach() - # NOTE: We need to do this after the above optional package TPL support - # logic so that the TPL will be turned on for this package only as requested - # in bug 4298. - - # - # F) Set user cache variables for current set of enabled packages - # - - message("") - message("Set cache entries for optional packages/TPLs and tests/examples for packages actually enabled ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) - tribits_set_up_optional_package_enables_and_cache_vars(${TRIBITS_PACKAGE}) - endforeach() - - # - # G) Turn on parent packages where at least one subpackage has been enabled - # - - message("") - message("Enabling the shell of non-enabled parent packages (mostly for show) that have at least one subpackage enabled ...") - message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES}) - tribits_postprocess_package_with_subpackages_enables(${TRIBITS_PACKAGE}) - endforeach() - # NOTE: The above ensures that loops involving the parent package will - # process the parent package but doing this last ensures that no downstream - # dependencies will be enabled. - - tribits_set_up_enabled_lists_and_pkg_idx() - - # - # H) Set up flat list of direct external and inner package dependencies (even - # for non-enabled packages) and enabled package dependencies for enabled - # packages - # - - foreach(externalPkgName ${${PROJECT_NAME}_DEFINED_TPLS}) - tribits_extpkg_setup_enabled_dependencies(${externalPkgName}) - # ToDo: Assert that all of the listed dependencies in - # ${externalPkgName}_LIB_ENABLED_DEPENDENCIES exist and are upstream from - # ${externalPkgName} - endforeach() - - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) - tribits_setup_direct_package_dependencies_lists_and_lib_required_enable_vars( - ${TRIBITS_PACKAGE}) - endforeach() - - if (${PROJECT_NAME}_DUMP_PACKAGE_DEPENDENCIES) - message("\nDumping direct dependencies for each package ...") - foreach(tribitsPkg IN LISTS ${PROJECT_NAME}_DEFINED_TPLS - ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES - ) - tribits_print_direct_package_dependencies_lists(${tribitsPkg}) - endforeach() - endif() - -endmacro() - - -# Function that sets up the full package dependencies for each enabled package -# including all of its indirect upstream package dependencies. -# -# This is needed in several different parts of the TriBITS implementation. -# -# ToDo: #63: Remove this function since we should not need a full list of -# direct and indirect package dependencies! -# -function(tribits_package_set_full_enabled_dep_packages PACKAGE_NAME) - - set(PACKAGE_FULL_DEPS_LIST "") - - foreach(DEP_PKG ${${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES}) - if (${PROJECT_NAME}_ENABLE_${DEP_PKG}) - list(APPEND PACKAGE_FULL_DEPS_LIST ${DEP_PKG}) - endif() - # NOTE: This if() should not be needed but this is a safeguard - endforeach() - - foreach(DEP_PKG ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES}) - if (${PACKAGE_NAME}_ENABLE_${DEP_PKG}) - list(APPEND PACKAGE_FULL_DEPS_LIST ${DEP_PKG}) - endif() - endforeach() - - if(PACKAGE_FULL_DEPS_LIST) - list(REMOVE_DUPLICATES PACKAGE_FULL_DEPS_LIST) - - foreach(DEP_PACKAGE ${PACKAGE_FULL_DEPS_LIST}) - list(APPEND PACKAGE_FULL_DEPS_LIST ${${DEP_PACKAGE}_FULL_ENABLED_DEP_PACKAGES}) - endforeach() - - list(REMOVE_DUPLICATES PACKAGE_FULL_DEPS_LIST) - endif() - - set(ORDERED_PACKAGE_FULL_DEPS_LIST "") - - foreach(DEP_PACKAGE ${PACKAGE_FULL_DEPS_LIST}) - - #print_var(${DEP_PACKAGE}_PKG_IDX) - set(DEP_PACKAGE_VALUE ${${DEP_PACKAGE}_PKG_IDX}) - - set(SORTED_INDEX 0) - set(INSERTED_DEP_PACKAGE FALSE) - - foreach(SORTED_PACKAGE ${ORDERED_PACKAGE_FULL_DEPS_LIST}) - - #print_var(${SORTED_PACKAGE}_PKG_IDX) - set(SORTED_PACKAGE_VALUE ${${SORTED_PACKAGE}_PKG_IDX}) - - if (${DEP_PACKAGE_VALUE} GREATER ${SORTED_PACKAGE_VALUE}) - list(INSERT ORDERED_PACKAGE_FULL_DEPS_LIST ${SORTED_INDEX} ${DEP_PACKAGE}) - set(INSERTED_DEP_PACKAGE TRUE) - break() - endif() - - math(EXPR SORTED_INDEX ${SORTED_INDEX}+1) - - endforeach() - - if(NOT INSERTED_DEP_PACKAGE) - list(APPEND ORDERED_PACKAGE_FULL_DEPS_LIST ${DEP_PACKAGE}) - endif() - - endforeach() - - global_set(${PACKAGE_NAME}_FULL_ENABLED_DEP_PACKAGES - ${ORDERED_PACKAGE_FULL_DEPS_LIST}) - - if (${PROJECT_NAME}_VERBOSE_CONFIGURE) - print_var(${PACKAGE_NAME}_FULL_ENABLED_DEP_PACKAGES) - endif() - -endfunction() - - -# Function that creates enable-only dependency data-structures -# -# ToDo: #63: Remove this function since we should not need a full list of -# direct and indirect package dependencies! -# -function(tribits_set_up_enabled_only_dependencies) - - set(GENERATE_EXPORT_DEPENDENCIES ${${PROJECT_NAME}_GENERATE_EXPORT_FILE_DEPENDENCIES}) - set(lastExportTribitsPackage) - - if ("${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES}" STREQUAL "" - AND NOT - "${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES}" STREQUAL "" - ) - message(DEPRECATION - "WARNING! The cache var" - " ${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES" - "='${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES}'" - " is deprecated! Please instead set" - " ${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES" - "='${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES}'") - set(${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES - ${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES} ) - endif() - - if (GENERATE_EXPORT_DEPENDENCIES - AND ${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES - ) - # Find the last enabled package for which an export file is requested. - set(LAST_PKG_IDX -1) - set(LAST_PKG) - foreach(tribitsPkg ${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES}) - #print_var(tribitsPkg) - set(PKG_IDX ${${tribitsPkg}_PKG_IDX}) - #print_var(PKG_IDX) - if (PKG_IDX) - # The listed package is enabled so we will consider it - if (PKG_IDX GREATER ${LAST_PKG_IDX}) - set(LAST_PKG_IDX ${PKG_IDX}) - set(LAST_PKG ${tribitsPkg}) - #print_var(LAST_PKG_IDX) - #print_var(LAST_PKG) - endif() - endif() - endforeach() - if (LAST_PKG) - # At least one listed package was enabled - set(lastExportTribitsPackage ${LAST_PKG}) - else() - # None of the listed packages were enabled so don't bother generating - # any export dependencies - set(GENERATE_EXPORT_DEPENDENCIES FALSE) - endif() - - endif() - - if (GENERATE_EXPORT_DEPENDENCIES) - - if (lastExportTribitsPackage) - message("\nSetting up export dependencies up through ${lastExportTribitsPackage} ...\n") - else() - message("\nSetting up export dependencies for all enabled packages ...\n") - endif() - - foreach(tribitsPackage ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) - tribits_package_set_full_enabled_dep_packages(${tribitsPackage}) - if (${PROJECT_NAME}_DUMP_PACKAGE_DEPENDENCIES) - set(PRINTED_VAR FALSE) - print_nonempty_var_with_spaces(${tribitsPackage}_FULL_ENABLED_DEP_PACKAGES - PRINTED_VAR) - if (NOT PRINTED_VAR) - message("-- ${tribitsPackage}: No library dependencies!") - endif() - endif() - if ("${lastExportTribitsPackage}" STREQUAL ${tribitsPackage}) - break() - endif() - endforeach() - - endif() - -endfunction() +# LocalWords: tribits TriBITS foreach endmacro endfunction diff --git a/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake b/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake index 2d041a2ca424..fd4adb86a9f8 100644 --- a/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake +++ b/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake @@ -166,8 +166,9 @@ endfunction() # @FUNCTION: tribits_extpkg_write_config_file_str() # -# Create the text string for a ``Config.cmake`` file given the list of -# include directories and libraries for an external package/TPL. +# Create the text string for a ``Config.cmake`` file given the list +# of include directories and libraries for an external package/TPL from the +# legacy TriBITS TPL specification. # # Usage:: # @@ -194,9 +195,11 @@ endfunction() # packages listed in ``_LIB_ENABLED_DEPENDENCIES``. # # The arguments in ``TPL__LIBRARIES`` are handled in special ways in -# order to create the namespaced IMPORTED targets ``::`` and -# the ``::all_libs`` target that depends on these. The types of -# arguments that are handled and how the are interpreted: +# order to create the namespaced IMPORTED targets +# ``tribits::::`` and the ``::all_libs`` target +# that depends on these. +# +# The types of arguments that are handled and how the are interpreted: # # ``/[lib].`` # @@ -204,13 +207,13 @@ endfunction() # imported target name ```` is derived from the file name (of the # form ``lib.`` removing beginning ``lib`` and file # extension ``.``). The IMPORTED target -# ``::`` is created and the file path is set using the -# ``IMPORTED_LOCATION`` target property. +# ``tribits::::`` is created and the file path is set +# using the ``IMPORTED_LOCATION`` target property. # # ``-l`` # # Arguments of the form ``-l`` are used to create IMPORTED -# targets with the name ``::`` using the +# targets with the name ``tribits::::`` using the # ``IMPORTED_LIBNAME`` target property. # # ```` @@ -248,6 +251,20 @@ endfunction() # ``_LIB_ENABLED_DEPENDENCIES``, a link dependency is created using # ``target_link_library(::all_libs INTERFACE )``. # +# NOTE: The IMPORTED targets generated for each library argument +# ``::`` are prefixed with ``tribits::`` to give +# ``tribits::::``. This is to avoid clashing with IMPORTED +# targets ``::`` from other package config files +# ``Config.cmake`` or find modules ``Find.cmake`` that may +# clash (see TriBITSPub/TriBITS#548). But the generated INTERFACE IMPORTED +# target ``::all_libs`` is **not** namespaced with ``tribits::`` +# since the ``all_libs`` target is unlikely to clash. The targets +# ``tribits::::`` are not directly used in downstream +# ``target_link_library()`` calls so the names of these targets are really +# just an implementation detail. (The reason we give these a name based of +# the library name they represent ```` is to make it more clear what +# the matching library is and to make the name unique.) +# function(tribits_extpkg_write_config_file_str tplName tplConfigFileStrOut) # A) Set up beginning of config file text @@ -529,14 +546,14 @@ function(tribits_extpkg_process_libraries_list_library_entry tribits_extpkg_get_libname_and_path_from_libentry( "${libentry}" ${libEntryType} libname libpath) # Create IMPORTED library target - set(prefixed_libname "${tplName}::${libname}") + set(prefixed_libname "tribits::${tplName}::${libname}") if (NOT (prefixed_libname IN_LIST libTargets)) tribits_extpkg_append_add_library_str (${libname} ${prefixed_libname} ${libEntryType} "${libpath}" configFileStr) if (lastLibProcessed) string(APPEND configFileStr "target_link_libraries(${prefixed_libname}\n" - " INTERFACE ${tplName}::${lastLibProcessed})\n" + " INTERFACE tribits::${tplName}::${lastLibProcessed})\n" ) else() tribits_extpkg_append_upstream_target_link_libraries_str( ${tplName} @@ -553,10 +570,11 @@ function(tribits_extpkg_process_libraries_list_library_entry set(${lastLibProcessedInOut} ${lastLibProcessed} PARENT_SCOPE) set(${configFileStrInOut} ${configFileStr} PARENT_SCOPE) endfunction() -# NOTE: Above, we only need to link the first library :: -# against the upstream TPL libraries ::all_libs. The other -# imported targets :: for this TPL are linked to this first -# :: which has the needed dependencies. +# NOTE: Above, we only need to link the first library +# tribits:::: against the upstream TPL libraries +# ::all_libs. The other imported targets +# tribits:::: for this TPL are linked to this first +# tribits:::: which has the needed dependencies. function(tribits_extpkg_get_libname_and_path_from_libentry diff --git a/cmake/tribits/core/package_arch/TribitsGeneralMacros.cmake b/cmake/tribits/core/package_arch/TribitsGeneralMacros.cmake index 9fc85539061e..0dc079655a34 100644 --- a/cmake/tribits/core/package_arch/TribitsGeneralMacros.cmake +++ b/cmake/tribits/core/package_arch/TribitsGeneralMacros.cmake @@ -42,6 +42,8 @@ include(AssertDefined) include(MessageWrapper) include(TribitsParseArgumentsHelpers) include(TribitsSortListAccordingToMasterList) +include(TribitsDeprecatedHelpers) +include(TribitsGetPackageEnableStatus) # Optionally start CMake code configure timing @@ -143,165 +145,6 @@ function(tribits_set_base_repo_dir BASE_DIR REPO_DIR BASE_REPO_DIR_OUT) endfunction() -# Get the list of explicitly enabled entries -# -# These is the list of entries in ${LISTVAR} for which: -# -# if (${ENABLED_PREFIX}_ENABLE_{ENTRY}) -# -# evaluates to true. -# -function(tribits_get_enabled_list LISTVAR ENABLED_PREFIX - ENABLED_LIST_OUT_OUT NUM_ENABLED_OUT_OUT - ) - set(ENABLED_LIST_OUT) - foreach(ENTITY ${${LISTVAR}}) - set(ENTITY_NAME ${ENABLED_PREFIX}_ENABLE_${ENTITY}) - assert_defined(${ENTITY_NAME}) - set(INCLUDE_ENTITY FALSE) - if (${ENTITY_NAME}) - list(APPEND ENABLED_LIST_OUT ${ENTITY}) - endif() - endforeach() - list(LENGTH ENABLED_LIST_OUT NUM_ENABLED_OUT) - set(${ENABLED_LIST_OUT_OUT} ${ENABLED_LIST_OUT} PARENT_SCOPE) - if (NUM_ENABLED_OUT_OUT) - set(${NUM_ENABLED_OUT_OUT} ${NUM_ENABLED_OUT} PARENT_SCOPE) - endif() -endfunction() - - -# Get the list non-disabled entries -# -# These is the list of entries in ${LISTVAR} for which: -# -# if ( -# (${ENABLED_PREFIX}_ENABLE_{ENTRY}) -# OR -# (${ENABLED_PREFIX}_ENABLE_{ENTRY} STREQUAL "" ) -# ) -# -# evaluates to true. -# -function(tribits_get_nondisabled_list LISTVAR ENABLED_PREFIX - NONDISABLED_LIST_OUT_OUT NUM_NONDISABLED_OUT_OUT - ) - set(NONDISABLED_LIST_OUT) - foreach(ENTITY ${${LISTVAR}}) - set(ENTITY_NAME ${ENABLED_PREFIX}_ENABLE_${ENTITY}) - assert_defined(${ENTITY_NAME}) - set(INCLUDE_ENTITY FALSE) - if (${ENTITY_NAME} OR ${ENTITY_NAME} STREQUAL "") - list(APPEND NONDISABLED_LIST_OUT ${ENTITY}) - endif() - endforeach() - list(LENGTH NONDISABLED_LIST_OUT NUM_NONDISABLED_OUT) - set(${NONDISABLED_LIST_OUT_OUT} ${NONDISABLED_LIST_OUT} PARENT_SCOPE) - if (NUM_NONDISABLED_OUT_OUT) - set(${NUM_NONDISABLED_OUT_OUT} ${NUM_NONDISABLED_OUT} PARENT_SCOPE) - endif() -endfunction() - - -# Get the list of explicitly disabled entries -# -# These is the list of entries in ${LISTVAR} for which: -# -# if ( -# (NOT ${ENABLED_PREFIX}_ENABLE_{ENTRY}) -# AND -# (NOT ${ENABLED_PREFIX}_ENABLE_{ENTRY} STREQUAL "" ) -# ) -# -# evaluates to true. -# -function(tribits_get_disabled_list LISTVAR ENABLED_PREFIX - DISABLED_LIST_OUT_OUT NUM_DISABLED_OUT_OUT - ) - set(DISABLED_LIST_OUT) - foreach(ENTITY ${${LISTVAR}}) - set(ENTITY_NAME ${ENABLED_PREFIX}_ENABLE_${ENTITY}) - assert_defined(${ENTITY_NAME}) - set(INCLUDE_ENTITY FALSE) - if ( (NOT ${ENTITY_NAME}) AND (NOT ${ENTITY_NAME} STREQUAL "") ) - list(APPEND DISABLED_LIST_OUT ${ENTITY}) - endif() - endforeach() - list(LENGTH DISABLED_LIST_OUT NUM_DISABLED_OUT) - set(${DISABLED_LIST_OUT_OUT} ${DISABLED_LIST_OUT} PARENT_SCOPE) - if (NUM_DISABLED_OUT_OUT) - set(${NUM_DISABLED_OUT_OUT} ${NUM_DISABLED_OUT} PARENT_SCOPE) - endif() -endfunction() - - -# Get the list of non-enabled entries -# -# These is the list of entries in ${LISTVAR} for which: -# -# if (NOT ${ENABLED_PREFIX}_ENABLE_{ENTRY}) -# -# evaluates to true. -# -function(tribits_get_nonenabled_list LISTVAR ENABLED_PREFIX - NONENABLED_LIST_OUT_OUT NUM_NONENABLED_OUT_OUT - ) - set(NONENABLED_LIST_OUT) - foreach(ENTITY ${${LISTVAR}}) - set(ENTITY_NAME ${ENABLED_PREFIX}_ENABLE_${ENTITY}) - assert_defined(${ENTITY_NAME}) - set(INCLUDE_ENTITY FALSE) - if (NOT ${ENTITY_NAME}) # Note that empty "" is also false! - list(APPEND NONENABLED_LIST_OUT ${ENTITY}) - endif() - endforeach() - list(LENGTH NONENABLED_LIST_OUT NUM_NONENABLED_OUT) - set(${NONENABLED_LIST_OUT_OUT} ${NONENABLED_LIST_OUT} PARENT_SCOPE) - if (NUM_NONENABLED_OUT_OUT) - set(${NUM_NONENABLED_OUT_OUT} ${NUM_NONENABLED_OUT} PARENT_SCOPE) - endif() -endfunction() - - -# Macro that sets up the basic lists of enabled packages and packages. -# -macro(tribits_set_up_enabled_lists_and_pkg_idx) - - # ${PROJECT_NAME}_ENABLED_PACKAGES - tribits_get_enabled_list( - ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES ${PROJECT_NAME} - ${PROJECT_NAME}_ENABLED_INTERNAL_TOPLEVEL_PACKAGES - ${PROJECT_NAME}_NUM_ENABLED_INTERNAL_TOPLEVEL_PACKAGES) - - # ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES - tribits_get_enabled_list( ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${PROJECT_NAME} - ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES - ${PROJECT_NAME}_NUM_ENABLED_INTERNAL_PACKAGES) - - # ${PROJECT_NAME}_REVERSE_ENABLED_INTERNAL_PACKAGES - set(${PROJECT_NAME}_REVERSE_ENABLED_INTERNAL_PACKAGES - "${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}") - list(REVERSE ${PROJECT_NAME}_REVERSE_ENABLED_INTERNAL_PACKAGES) - - # ${PACKAGE_NAME}_PKG_IDX - set(PKG_IDX 0) - foreach(tribitsPackage ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) - set(${tribitsPackage}_PKG_IDX ${PKG_IDX}) - math(EXPR PKG_IDX "${PKG_IDX} + 1") - endforeach() - - # ${PROJECT_NAME}_ENABLED_TPLS - tribits_get_enabled_list( ${PROJECT_NAME}_DEFINED_TPLS TPL - ${PROJECT_NAME}_ENABLED_TPLS ${PROJECT_NAME}_NUM_ENABLED_TPLS) - - # ${PROJECT_NAME}_REVERSE_ENABLED_TPLS - set(${PROJECT_NAME}_REVERSE_ENABLED_TPLS - "${${PROJECT_NAME}_ENABLED_TPLS}") - list(REVERSE ${PROJECT_NAME}_REVERSE_ENABLED_TPLS) - -endmacro() - - # @FUNCTION: tribits_set_st_for_dev_mode() # # Function that allows packages to easily make a feature ``ST`` for @@ -337,47 +180,12 @@ endfunction() # For backward compatibility macro(tribits_set_ss_for_dev_mode OUTPUT_VAR) - message(WARNING - "WARNING: tribits_set_ss_for_dev_mode() is deprecated," - " use tribits_set_st_for_dev_mode() instead!") + tribits_deprecated_command(tribits_set_ss_for_dev_mode + MESSAGE "Use tribits_set_st_for_dev_mode() instead.") tribits_set_st_for_dev_mode(${OUTPUT_VAR}) endmacro() -# Function that extracts all of the required and optional -# items for a given class of package lists -# -function( tribits_gather_enabled_items PACKAGE_NAME LISTTYPE_PREFIX - LISTTYPE_POSTFIX GATHERED_ITEMS_LIST_OUT - ) - - #message("TRIBITS_GATHER_ENABLED_ITEMS: '${PACKAGE_NAME}' '${LISTTYPE_PREFIX}'" - # " '${LISTTYPE_POSTFIX}' '${GATHERED_ITEMS_LIST_OUT}'") - - set(GATHERED_ITEMS_LIST_TMP - ${${PACKAGE_NAME}_${LISTTYPE_PREFIX}_REQUIRED_DEP_${LISTTYPE_POSTFIX}} - ) - - #message("TRIBITS_GATHER_ENABLED_ITEMS:" - # " ${PACKAGE_NAME}_${LISTTYPE_PREFIX}_REQUIRED_DEP_${LISTTYPE_POSTFIX} = ${GATHERED_ITEMS_LIST_TMP}") - - foreach(ITEM - ${${PACKAGE_NAME}_${LISTTYPE_PREFIX}_OPTIONAL_DEP_${LISTTYPE_POSTFIX}} - ) - assert_defined(${PACKAGE_NAME}_ENABLE_${ITEM}) - if (${PACKAGE_NAME}_ENABLE_${ITEM}) - append_set(GATHERED_ITEMS_LIST_TMP ${ITEM}) - endif() - endforeach() - - #message("TRIBITS_GATHER_ENABLED_ITEMS:" - # " ${GATHERED_ITEMS_LIST_OUT} = ${GATHERED_ITEMS_LIST_TMP}") - - set(${GATHERED_ITEMS_LIST_OUT} ${GATHERED_ITEMS_LIST_TMP} PARENT_SCOPE) - -endfunction() - - # @FUNCTION: tribits_trace_file_processing() # # Print trace of file processing when diff --git a/cmake/tribits/core/package_arch/TribitsGetEnabledSublists.cmake b/cmake/tribits/core/package_arch/TribitsGetEnabledSublists.cmake new file mode 100644 index 000000000000..0444ba3dde25 --- /dev/null +++ b/cmake/tribits/core/package_arch/TribitsGetEnabledSublists.cmake @@ -0,0 +1,163 @@ +# @HEADER +# ************************************************************************ +# +# TriBITS: Tribal Build, Integrate, and Test System +# Copyright 2013 Sandia Corporation +# +# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +# the U.S. Government retains certain rights in this software. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# 3. Neither the name of the Corporation nor the names of the +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# ************************************************************************ +# @HEADER + +include(TribitsGetPackageEnableStatus) + + +# @FUNCTION: tribits_get_sublist_enabled() +# +# Get sub-list of enabled packages +# +# Usage:: +# +# tribits_get_sublist_enabled( +# ) +# +# On output, ```` contains the sublist of entries in +# ```` which evaluate to ``TRUE`` in an ``if ()`` statement. +# +function(tribits_get_sublist_enabled enableListName + enabledSublistNameOut numEnabledVarOut + ) + set(enabledSublist) + foreach(pkgName IN LISTS ${enableListName}) + tribits_get_package_enable_status(${pkgName} enableVal "") + if (enableVal) + list(APPEND enabledSublist ${pkgName}) + endif() + endforeach() + list(LENGTH enabledSublist numEnabled) + set(${enabledSublistNameOut} ${enabledSublist} PARENT_SCOPE) + if (numEnabledVarOut) + set(${numEnabledVarOut} ${numEnabled} PARENT_SCOPE) + endif() +endfunction() + + +# @FUNCTION: tribits_get_sublist_nondisabled() +# +# Get sub-list of non-disabled packages +# +# Usage:: +# +# tribits_get_sublist_nondisabled( +# ) +# +# On output, ```` contains the sublist of entries from +# ```` for which evaluate to ``TRUE`` or empty ``""`` in an +# ``if ()`` statement. +# +function(tribits_get_sublist_nondisabled enableListName + nondisabledListNameOut numNondisabledVarOut + ) + set(nondisabledList "") + foreach(pkgName IN LISTS ${enableListName}) + tribits_get_package_enable_status(${pkgName} enableVal "") + if (enableVal OR "${enableVal}" STREQUAL "") + list(APPEND nondisabledList ${pkgName}) + endif() + endforeach() + list(LENGTH nondisabledList numNondisabled) + set(${nondisabledListNameOut} ${nondisabledList} PARENT_SCOPE) + if (numNondisabledVarOut) + set(${numNondisabledVarOut} ${numNondisabled} PARENT_SCOPE) + endif() +endfunction() + + +# @FUNCTION: tribits_get_sublist_disabled() +# +# Get sub-list of disabled packages +# +# Usage:: +# +# tribits_get_sublist_disabled( +# ) +# +# On output, ```` contains the sublist of entries +# ```` which evaluate to ``FALSE`` and is not empty ``""`` in +# an ``if ()`` statement. +# +function(tribits_get_sublist_disabled enableListName + disabledSublistNameOut numDisabledVarOut + ) + set(disabledSublist "") + foreach(pkgName IN LISTS ${enableListName}) + tribits_get_package_enable_status(${pkgName} enableVal "") + if ((NOT enableVal) AND (NOT "${enableVal}" STREQUAL "")) + list(APPEND disabledSublist ${pkgName}) + endif() + endforeach() + list(LENGTH disabledSublist numDisabled) + set(${disabledSublistNameOut} ${disabledSublist} PARENT_SCOPE) + if (numDisabledVarOut) + set(${numDisabledVarOut} ${numDisabled} PARENT_SCOPE) + endif() +endfunction() + + +# @FUNCTION: tribits_get_sublist_nonenabled() +# +# Get sub-list of non-enabled entries +# +# Usage:: +# +# tribits_get_sublist_nonenabled( +# ) +# +# On output, ```` contains the subset of entries in +# ```` that evaluate to ``FALSE`` (which can also be empty +# ``""``) in an ``if ()`` statement. +# +function(tribits_get_sublist_nonenabled enableListName + nonenabledListNameOut numNonenabledVarOut + ) + set(nonenabledList "") + foreach(pkgName IN LISTS ${enableListName}) + tribits_get_package_enable_status(${pkgName} enableVal "") + if (NOT enableVal) + list(APPEND nonenabledList ${pkgName}) + endif() + endforeach() + list(LENGTH nonenabledList numNonenabled) + set(${nonenabledListNameOut} ${nonenabledList} PARENT_SCOPE) + if (numNonenabledVarOut) + set(${numNonenabledVarOut} ${numNonenabled} PARENT_SCOPE) + endif() +endfunction() diff --git a/cmake/tribits/core/package_arch/TribitsGetPackageEnableStatus.cmake b/cmake/tribits/core/package_arch/TribitsGetPackageEnableStatus.cmake new file mode 100644 index 000000000000..3fac736a78cc --- /dev/null +++ b/cmake/tribits/core/package_arch/TribitsGetPackageEnableStatus.cmake @@ -0,0 +1,134 @@ +# @HEADER +# ************************************************************************ +# +# TriBITS: Tribal Build, Integrate, and Test System +# Copyright 2013 Sandia Corporation +# +# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +# the U.S. Government retains certain rights in this software. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# 3. Neither the name of the Corporation nor the names of the +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# ************************************************************************ +# @HEADER + + +# @FUNCTION: tribits_get_package_enable_status() +# +# Function that determines if a given external or internal package's enable +# status (e.g. 'ON' or 'OFF') +# +# Usage:: +# +# tribits_get_package_enable_status( +# ) +# +# On return, if non-empty, the variable ```` will contain +# the actual value of ``${${PROJECT_NAME}_ENABLE_}`` or +# ``${TPL_ENABLE_}`` or will return empty "". If +# ``${packageName}_PACKAGE_BUILD_STATUS == "INTERNAL", then only the value of +# ``${PROJECT_NAME}_ENABLE_`` will be considered. +# +# On return, if non-empty, the variable ```` will be +# either ``${${PROJECT_NAME}_ENABLE_}`` or +# ``${TPL_ENABLE_}``, depending on which one is used to obtain +# the value ````. +# +# This works for both external packages/TPLs and internal packages. +# +function(tribits_get_package_enable_status packageName packageEnableOut + packageEnableVarNameOut + ) + tribits_get_package_enable_status_assert_args("${packageName}" + "${packageEnableOut}" "${packageEnableVarNameOut}") + tribits_assert_package_enable_status(${packageName}) + # Determine which variable, if any, to extract enable status from + set(packageEnableVarName "") + if (${packageName}_PACKAGE_BUILD_STATUS STREQUAL "INTERNAL") + set(packageEnableVarName ${PROJECT_NAME}_ENABLE_${packageName}) + elseif (${packageName}_PACKAGE_BUILD_STATUS STREQUAL "EXTERNAL") + if (NOT "${TPL_ENABLE_${packageName}}" STREQUAL "") + set(packageEnableVarName TPL_ENABLE_${packageName}) + elseif (NOT "${${PROJECT_NAME}_ENABLE_${packageName}}" STREQUAL "") + set(packageEnableVarName ${PROJECT_NAME}_ENABLE_${packageName}) + else() + # If neither is set, select the default var TPL name + set(packageEnableVarName TPL_ENABLE_${packageName}) + endif() + endif() + if (packageEnableVarName) + set(packageEnable ${${packageEnableVarName}}) + else() + set(packageEnable "") + endif() + # Set output args + if (packageEnableOut) + set(${packageEnableOut} ${packageEnable} PARENT_SCOPE) + endif() + if (packageEnableVarNameOut) + set(${packageEnableVarNameOut} ${packageEnableVarName} PARENT_SCOPE) + endif() +endfunction() + + +# @FUNCTION: tribits_assert_package_enable_status() +# +# Function that asserts that if both ``${PROJECT_NAME}_ENABLE_${packageName}`` +# and ``TPL_ENABLE_${packageName}`` are both set to non-empty, then they must +# be the same value or this is an error. +# +# Usage:: +# +# tribits_assert_package_enable_status() +# +function(tribits_assert_package_enable_status packageName) + if ( (NOT "${${PROJECT_NAME}_ENABLE_${packageName}}" STREQUAL "") + AND (NOT "${TPL_ENABLE_${packageName}}" STREQUAL "") + AND (NOT "${${PROJECT_NAME}_ENABLE_${packageName}}" STREQUAL + "${TPL_ENABLE_${packageName}}") + ) + message(SEND_ERROR "Error, ${PROJECT_NAME}_ENABLE_${packageName}=" + "'${${PROJECT_NAME}_ENABLE_${packageName}}' !=" + " TPL_ENABLE_${packageName} = '${TPL_ENABLE_${packageName}}'") + endif() +endfunction() +# ToDo: Create a cache var for the mode of message() above in case the user +# wants to disable the warning. + + +function(tribits_get_package_enable_status_assert_args packageName packageEnableOut + packageEnableVarNameOut + ) + if ("${packageName}" STREQUAL "") + message(FATAL_ERROR "Error, packageName='' is not allowed!") + endif() + if ("${packageEnableOut}" STREQUAL "" AND "${packageEnableVarNameOut}" STREQUAL "") + message(FATAL_ERROR "Error, both packageEnableOut='' and" + " packageEnableVarNameOut='' is not allowed!") + endif() +endfunction() diff --git a/cmake/tribits/core/package_arch/TribitsGlobalMacros.cmake b/cmake/tribits/core/package_arch/TribitsGlobalMacros.cmake index ac994b29a2e9..283d81af78d2 100644 --- a/cmake/tribits/core/package_arch/TribitsGlobalMacros.cmake +++ b/cmake/tribits/core/package_arch/TribitsGlobalMacros.cmake @@ -51,9 +51,11 @@ include(TribitsReportInvalidTribitsUsage) include(TribitsReadAllProjectDepsFilesCreateDepsGraph) include(TribitsAdjustPackageEnables) include(TribitsGitRepoVersionInfo) +include(TribitsSetUpEnabledOnlyDependencies) # Standard TriBITS utilities includes include(TribitsAddOptionAndDefine) +include(TribitsAddEnumCacheVar) include(AdvancedOption) include(AdvancedSet) include(AppendStringVar) @@ -69,6 +71,7 @@ include(Split) include(TimingUtils) include(SetDefaultAndFromEnv) # Used by some call-back files include(TribitsFilepathHelpers) +include(TribitsDeprecatedHelpers) # Standard CMake includes include(CheckIncludeFileCXX) @@ -717,22 +720,49 @@ macro(tribits_define_global_options_and_define_extra_repos) "Determines if a variety of development mode checks are turned on by default or not." ) - advanced_set( ${PROJECT_NAME}_ASSERT_MISSING_PACKAGES - ${${PROJECT_NAME}_ENABLE_DEVELOPMENT_MODE} - CACHE BOOL - "Determines if asserts are performed on missing packages or not." ) + if ("${${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_DEFAULT}" STREQUAL "") + if (${PROJECT_NAME}_ENABLE_DEVELOPMENT_MODE) + set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_DEFAULT FATAL_ERROR) + else() + set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_DEFAULT IGNORE) + endif() + endif() + set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST + "FATAL_ERROR" "SEND_ERROR" ) + set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_VALUES_LIST + ${${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST} + "WARNING" "NOTICE" "IGNORE" "OFF" ) + tribits_add_enum_cache_var( ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES + DEFAULT_VAL ${${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_DEFAULT} + DOC_STRING + "Assert that all external and internal dependencies are defined in the project" + ALLOWED_STRINGS_LIST + ${${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_VALUES_LIST} + IS_ADVANCED ) + + if (NOT "${${PROJECT_NAME}_ASSERT_MISSING_PACKAGES}" STREQUAL "") + message(FATAL_ERROR "Error, ${PROJECT_NAME}_ASSERT_MISSING_PACKAGES=" + " '${${PROJECT_NAME}_ASSERT_MISSING_PACKAGES}' is set and is no" + " longer supported! Please set" + " ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES=FATAL_ERROR instead!" ) + endif() if ("${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT}" STREQUAL "") if (${PROJECT_NAME}_ENABLE_DEVELOPMENT_MODE) - set(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT FATAL_ERROR) + set(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT FATAL_ERROR) else() - set(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT IGNORE) + set(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT IGNORE) endif() endif() - advanced_set( ${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE - "${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT}" - CACHE BOOL - "Assert correct usage of TriBITS. Value values include 'FATAL_ERROR', 'SEND_ERROR', 'WARNING', and 'IGNORE'. Default '${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT}' " ) + set(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_VALUES_LIST + "FATAL_ERROR" "SEND_ERROR" "WARNING" "IGNORE" "OFF") + tribits_add_enum_cache_var( ${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE + DEFAULT_VAL "${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT}" + DOC_STRING + "Assert correct usage of TriBITS" + ALLOWED_STRINGS_LIST + ${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_VALUES_LIST} + IS_ADVANCED ) advanced_set( ${PROJECT_NAME}_WARN_ABOUT_MISSING_EXTERNAL_PACKAGES FALSE CACHE BOOL @@ -929,6 +959,13 @@ macro(tribits_define_global_options_and_define_extra_repos) CACHE BOOL "Set to 'ON' to see the machine load for advanced tests." ) + tribits_add_enum_cache_var(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE + DEFAULT_VAL "DEPRECATION" + DOC_STRING "Mode for dealing with usage of TriBITS deprecated functionality" + ALLOWED_STRINGS_LIST ${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_ALL_VALID_VALUES} + IS_ADVANCED + ) + mark_as_advanced(BUILD_TESTING) mark_as_advanced(CMAKE_BACKWARDS_COMPATIBILITY) mark_as_advanced(DART_TESTING_TIMEOUT) @@ -2279,14 +2316,12 @@ macro(tribits_setup_packaging_and_distribution) # K.2) Removing any packages or packages not enabled from the tarball if (${PROJECT_NAME}_EXCLUDE_DISABLED_SUBPACKAGES_FROM_DISTRIBUTION) - set(tribitsPackage ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) + set(tribitsPackageList ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) else() - set(tribitsPackage ${${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES}) + set(tribitsPackageList ${${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES}) endif() - tribits_get_nonenabled_list( - tribitsPackage ${PROJECT_NAME} - nonEnabledTribitsPackage "") + tribits_get_sublist_nonenabled(tribitsPackageList nonEnabledTribitsPackage "") foreach(TRIBITS_PACKAGE ${nonEnabledTribitsPackage}) @@ -2345,18 +2380,18 @@ macro(tribits_setup_packaging_and_distribution) # K.3) Set up install component dependencies - tribits_get_enabled_list( - ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES ${PROJECT_NAME} - ENABLED_PACKAGES NUM_ENABLED) - #message("ENABLED PACKAGES: ${ENABLED_PACKAGES} ${NUM_ENABLED}") - - foreach(PKG ${ENABLED_PACKAGES}) - if(NOT "${${PKG}_LIB_REQUIRED_DEP_PACKAGES}" STREQUAL "") - string(TOUPPER ${PKG} UPPER_PKG) - #message("${UPPER_PKG} depends on : ${${PKG}_LIB_REQUIRED_DEP_PACKAGES}") - set(CPACK_COMPONENT_${UPPER_PKG}_DEPENDS ${${PKG}_LIB_REQUIRED_DEP_PACKAGES}) + tribits_get_sublist_enabled( + ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES + enabledInternalToplevelPackages "") + + foreach(pkgName ${enabledInternalToplevelPackages}) + if(NOT "${${pkgName}_LIB_ENABLED_DEPENDENCIES}" STREQUAL "") + string(TOUPPER ${pkgName} upperPkgName) + set(CPACK_COMPONENT_${upperPkgName}_DEPENDS ${${pkgName}_LIB_ENABLED_DEPENDENCIES}) + # ToDo: The above needs to be changed to the list of *internal* enabled + # package dependencies! (But there are no tests for this currently and + # I am not sure who is using this.) endif() - #message("${PKG} depends on : ${${PKG}_LIB_REQUIRED_DEP_PACKAGES}") endforeach() # K.4) Resetting the name to avoid overwriting registry keys when installing diff --git a/cmake/tribits/core/package_arch/TribitsIncludeDirectories.cmake b/cmake/tribits/core/package_arch/TribitsIncludeDirectories.cmake index 3f90fc873d69..f31da5dfb38b 100644 --- a/cmake/tribits/core/package_arch/TribitsIncludeDirectories.cmake +++ b/cmake/tribits/core/package_arch/TribitsIncludeDirectories.cmake @@ -38,6 +38,7 @@ # @HEADER include(CMakeParseArguments) +include(TribitsDeprecatedHelpers) # @MACRO: tribits_include_directories() @@ -89,7 +90,11 @@ endmacro() # Deprecated. Use tribits_include_directories() instead! macro(include_directories) - cmake_parse_arguments( + tribits_deprecated_command(include_directories + MESSAGE "Use tribits_include_directories() instead." + ) + + cmake_parse_arguments( #prefix PARSE #options @@ -101,11 +106,6 @@ macro(include_directories) ${ARGN} ) -# if (PARSE_REQUIRED_DURING_INSTALLATION_TESTING) -# message(WARNING "Warning: the override include_directories() is deprecated," -# " use tribits_include_directories() instead!") -# endif() - if(NOT ${PROJECT_NAME}_ENABLE_INSTALLATION_TESTING OR PARSE_REQUIRED_DURING_INSTALLATION_TESTING) _include_directories(${PARSE_UNPARSED_ARGUMENTS}) endif() diff --git a/cmake/tribits/core/package_arch/TribitsListHelpers.cmake b/cmake/tribits/core/package_arch/TribitsListHelpers.cmake index 92184a2520e6..69ade415d655 100644 --- a/cmake/tribits/core/package_arch/TribitsListHelpers.cmake +++ b/cmake/tribits/core/package_arch/TribitsListHelpers.cmake @@ -39,6 +39,7 @@ include(TribitsHostType) +include(TribitsDeprecatedHelpers) # @@ -120,8 +121,8 @@ endmacro() macro( package_disable_on_platforms PACKAGE_NAME_IN_ ) - message(WARNING "package_disable_on_platforms() is deprecated!" - " Use tribits_disable_package_on_platforms() instead!") + tribits_deprecated_command(package_disable_on_platforms + MESSAGE "Use tribits_disable_package_on_platforms() instead!") tribits_disable_package_on_platforms(${PACKAGE_NAME_IN_} ${ARGN}) endmacro() @@ -136,19 +137,19 @@ function(tribits_update_ps_pt_ss_st THING_TYPE THING_NAME TESTGROUP_VAR) if (TESTGROUP_IN STREQUAL PS) if (${PROJECT_NAME}_VERBOSE_CONFIGURE) - message("-- " "WARNING: ${THING_TYPE} ${THING_NAME} TESTGROUP 'PS' is deprecated." + tribits_deprecated("${THING_TYPE} ${THING_NAME} TESTGROUP 'PS' is deprecated." " Use 'PT' instead!") endif() set(TESTGROUP_OUT PT) elseif (TESTGROUP_IN STREQUAL SS) if (${PROJECT_NAME}_VERBOSE_CONFIGURE) - message("-- " "WARNING: ${THING_TYPE} ${THING_NAME} TESTGROUP 'SS' is deprecated." + tribits_deprecated("${THING_TYPE} ${THING_NAME} TESTGROUP 'SS' is deprecated." " Use 'ST' instead!") endif() set(TESTGROUP_OUT ST) elseif (TESTGROUP_IN STREQUAL TS) if (${PROJECT_NAME}_VERBOSE_CONFIGURE) - message("-- " "WARNING: ${THING_TYPE} ${THING_NAME} TESTGROUP 'TS' is deprecated." + tribits_deprecated("${THING_TYPE} ${THING_NAME} TESTGROUP 'TS' is deprecated." " Use 'TT' instead!") endif() set(TESTGROUP_OUT TT) diff --git a/cmake/tribits/core/package_arch/TribitsPackageDependencies.cmake b/cmake/tribits/core/package_arch/TribitsPackageDependencies.cmake index 416b03d7fddf..0f4a956dd783 100644 --- a/cmake/tribits/core/package_arch/TribitsPackageDependencies.cmake +++ b/cmake/tribits/core/package_arch/TribitsPackageDependencies.cmake @@ -123,13 +123,14 @@ endmacro() # Takes the list ``_LIB_DEFINED_DEPENDENCIES`` and sets the # default entries of the non-cache var # ``_LIB_ENABLED_DEPENDENCIES``. However, if -# ``${_LIB_DEFINED_DEPENDENCIES}`` is non-empty when this macro -# is called, then it will not be changed. That allows the user to override -# the list of enabled TPL dependencies in the cache. This also sets the -# non-cache vars ``_ENABLE_=ON`` for each -# enabled package listed in ``_LIB_ENABLED_DEPENDENCIES`` and -# to ``OFF`` for each ```` listed in -# ``_LIB_ENABLED_DEPENDENCIES`` but not in +# ``${_LIB_ENABLED_DEPENDENCIES`` is non-empty when this +# macro is called, then it will not be changed. That allows the user to +# override the list of enabled TPL dependencies in the cache. This also sets +# the non-cache vars ``_ENABLE_=ON`` for +# each enabled package listed in +# ``_LIB_ENABLED_DEPENDENCIES`` and to ``OFF`` for each +# ```` listed in +# ``_LIB_DEFINED_DEPENDENCIES`` but not in # ``_LIB_ENABLED_DEPENDENCIES``. # macro(tribits_extpkg_setup_enabled_dependencies externalPkgName) @@ -149,7 +150,7 @@ macro(tribits_extpkg_setup_enabled_dependencies externalPkgName) endif() if ("${${externalPkgName}_LIB_ENABLED_DEPENDENCIES}" STREQUAL "") - # Only set of not already set as a cache var, for example + # Only set of not already set as a cache var, for example, by the user set(${externalPkgName}_LIB_ENABLED_DEPENDENCIES ${libEnabledDependencies}) endif() diff --git a/cmake/tribits/core/package_arch/TribitsPackageMacros.cmake b/cmake/tribits/core/package_arch/TribitsPackageMacros.cmake index 8a0475f6746e..a0c53f5129fe 100644 --- a/cmake/tribits/core/package_arch/TribitsPackageMacros.cmake +++ b/cmake/tribits/core/package_arch/TribitsPackageMacros.cmake @@ -545,10 +545,7 @@ endmacro() # up example directories any way one would like. # # Currently, all it does macro does is to call ``add_subdirectory()`` if -# ``${PACKAGE_NAME}_ENABLE_EXAMPLES`` or -# ``${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES`` are true. However, this macro may -# be extended in the future in order to modify behavior related to adding -# tests and examples in a uniform way. +# `${PACKAGE_NAME}_ENABLE_EXAMPLES`_ ``= TRUE``. # macro(tribits_add_example_directories) diff --git a/cmake/tribits/core/package_arch/TribitsPkgExportCacheVars.cmake b/cmake/tribits/core/package_arch/TribitsPkgExportCacheVars.cmake index 6fb85e0ef8de..9380cebe1dd9 100644 --- a/cmake/tribits/core/package_arch/TribitsPkgExportCacheVars.cmake +++ b/cmake/tribits/core/package_arch/TribitsPkgExportCacheVars.cmake @@ -122,7 +122,7 @@ function(tribits_pkg_append_set_commands_for_exported_vars packageName endforeach() endif() foreach(exportedCacheVar IN LISTS ${packageName}_PKG_VARS_TO_EXPORT) - tribits_assert_cache_and_local_vars_same_value(${exportedCacheVar}) + #tribits_assert_cache_and_local_vars_same_value(${exportedCacheVar}) string(APPEND configFileStr "set(${exportedCacheVar} \"${${exportedCacheVar}}\")\n") endforeach() diff --git a/cmake/tribits/core/package_arch/TribitsPrintDependencyInfo.cmake b/cmake/tribits/core/package_arch/TribitsPrintDependencyInfo.cmake index 143610266c51..2b96e2f74175 100644 --- a/cmake/tribits/core/package_arch/TribitsPrintDependencyInfo.cmake +++ b/cmake/tribits/core/package_arch/TribitsPrintDependencyInfo.cmake @@ -114,7 +114,7 @@ function(tribits_dump_package_dependencies_info) if (${PROJECT_NAME}_DUMP_PACKAGE_DEPENDENCIES) message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_PACKAGES}) tribits_print_package_dependencies(${TRIBITS_PACKAGE}) message("") endforeach() @@ -123,6 +123,9 @@ function(tribits_dump_package_dependencies_info) endfunction() +# Optionally print out a global project list var with spaces and +# unconditionally print out the number of items in that list +# function(tribits_print_project_list_var_and_num listVarSuffix) message("") if (${PROJECT_NAME}_DUMP_PACKAGE_DEPENDENCIES) @@ -132,4 +135,101 @@ function(tribits_print_project_list_var_and_num listVarSuffix) endfunction() +# Print out dependencies for a package +# +function(tribits_print_package_dependencies packageName) + + set(printedVar "") + + # Print deps vars + + if (printedVar) + message("") + endif() + + tribits_print_nonempty_package_deps_list(${packageName} LIB DEFINED printedVar) + tribits_print_nonempty_package_deps_list(${packageName} TEST DEFINED printedVar) + + if (${PROJECT_NAME}_DUMP_FORWARD_PACKAGE_DEPENDENCIES) + tribits_print_nonempty_package_forward_defined_deps_list(${packageName} LIB + printedVar) + tribits_print_nonempty_package_forward_defined_deps_list(${packageName} TEST + printedVar) + endif() + + if (NOT printedVar) + message("-- ${packageName}: No defined dependencies!") + endif() + +endfunction() + + +# Print out a dependency list including if each item is optional or required +# ('R' or 'O') +# +# Usage:: +# +# tribits_print_nonempty_package_deps_list( +# ) +# +# which prints out the list:: +# +# __DEFINED_DEPENDENCIES +# +# if it is non-empty. +# +function(tribits_print_nonempty_package_deps_list packageName + libOrTest definedOrEnabled printedListOut + ) + set(depsListName ${packageName}_${libOrTest}_${definedOrEnabled}_DEPENDENCIES) + if (NOT "${${depsListName}}" STREQUAL "") + set(lineStr "-- ${depsListName}:") + foreach (depPkg IN LISTS ${depsListName}) + string(APPEND lineStr " ${depPkg}") + if (${packageName}_${libOrTest}_DEP_REQUIRED_${depPkg}) + string(APPEND lineStr "[R]") + else() + string(APPEND lineStr "[O]") + endif() + endforeach() + message("${lineStr}") + set(${printedListOut} TRUE PARENT_SCOPE) + endif() +endfunction() + + +# Print out a forward dependency list including if each item is optional or +# required ('R' or 'O') +# +# Usage:: +# +# tribits_print_nonempty_package_forward_defined_deps_list( +# ) +# +# which prints out the list:: +# +# _FORWARD__DEFINED_DEPENDENCIES +# +# if it is non-empty. +# +function(tribits_print_nonempty_package_forward_defined_deps_list packageName + libOrTest printedListOut + ) + set(fwdDepsListName ${packageName}_FORWARD_${libOrTest}_DEFINED_DEPENDENCIES) + if (NOT "${${fwdDepsListName}}" STREQUAL "") + set(lineStr "-- ${fwdDepsListName}:") + foreach (fwdDepPkg IN LISTS ${fwdDepsListName}) + string(APPEND lineStr " ${fwdDepPkg}") + if (${fwdDepPkg}_${libOrTest}_DEP_REQUIRED_${packageName}) + string(APPEND lineStr "[R]") + else() + string(APPEND lineStr "[O]") + endif() + endforeach() + message("${lineStr}") + set(${printedListOut} TRUE PARENT_SCOPE) + endif() +endfunction() + + # LocalWords: TRIBITS diff --git a/cmake/tribits/core/package_arch/TribitsPrintEnabledPackagesLists.cmake b/cmake/tribits/core/package_arch/TribitsPrintEnabledPackagesLists.cmake index 547c9a9f60e9..b49d96372bfc 100644 --- a/cmake/tribits/core/package_arch/TribitsPrintEnabledPackagesLists.cmake +++ b/cmake/tribits/core/package_arch/TribitsPrintEnabledPackagesLists.cmake @@ -37,6 +37,8 @@ # ************************************************************************ # @HEADER +include(TribitsGetEnabledSublists) + # @FUNCTION: tribits_print_enables_before_adjust_package_enables() # @@ -107,20 +109,20 @@ function(tribits_print_internal_package_list_enable_status DOCSTRING ENABLED_FLAG INCLUDE_EMPTY ) if (ENABLED_FLAG AND NOT INCLUDE_EMPTY) - tribits_get_enabled_list( - ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${PROJECT_NAME} + tribits_get_sublist_enabled( + ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES internalPackagesEnableStatusList "") elseif (ENABLED_FLAG AND INCLUDE_EMPTY) - tribits_get_nondisabled_list( + tribits_get_sublist_nondisabled( ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${PROJECT_NAME} internalPackagesEnableStatusList "") elseif (NOT ENABLED_FLAG AND NOT INCLUDE_EMPTY) - tribits_get_disabled_list( - ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${PROJECT_NAME} + tribits_get_sublist_disabled( + ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES internalPackagesEnableStatusList "") else() # NOT ENABLED_FLAG AND INCLUDE_EMPTY - tribits_get_nonenabled_list( - ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${PROJECT_NAME} + tribits_get_sublist_nonenabled( + ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES internalPackagesEnableStatusList "") endif() tribits_print_prefix_string_and_list("${DOCSTRING}" @@ -132,16 +134,16 @@ endfunction() # function(tribits_print_tpl_list_enable_status DOCSTRING ENABLED_FLAG INCLUDE_EMPTY) if (ENABLED_FLAG AND NOT INCLUDE_EMPTY) - tribits_get_enabled_list( ${PROJECT_NAME}_DEFINED_TPLS TPL + tribits_get_sublist_enabled( ${PROJECT_NAME}_DEFINED_TPLS tplsEnableStatusList "") elseif (ENABLED_FLAG AND INCLUDE_EMPTY) - tribits_get_nondisabled_list( ${PROJECT_NAME}_DEFINED_TPLS TPL + tribits_get_sublist_nondisabled( ${PROJECT_NAME}_DEFINED_TPLS tplsEnableStatusList "") elseif (NOT ENABLED_FLAG AND NOT INCLUDE_EMPTY) - tribits_get_disabled_list( ${PROJECT_NAME}_DEFINED_TPLS TPL + tribits_get_sublist_disabled( ${PROJECT_NAME}_DEFINED_TPLS tplsEnableStatusList "") else() # NOT ENABLED_FLAG AND INCLUDE_EMPTY - tribits_get_nonenabled_list( ${PROJECT_NAME}_DEFINED_TPLS TPL + tribits_get_sublist_nonenabled( ${PROJECT_NAME}_DEFINED_TPLS tplsEnableStatusList "") endif() tribits_print_prefix_string_and_list("${DOCSTRING}" "${tplsEnableStatusList}") @@ -155,16 +157,15 @@ function(tribits_print_packages_list_enable_status_from_var PACKAGES_LIST_VAR DOCSTRING ENABLED_FLAG INCLUDE_EMPTY ) if (ENABLED_FLAG AND NOT INCLUDE_EMPTY) - tribits_get_enabled_list(${PACKAGES_LIST_VAR} ${PROJECT_NAME} + tribits_get_sublist_enabled(${PACKAGES_LIST_VAR} enableStatusList "") elseif (ENABLED_FLAG AND INCLUDE_EMPTY) - tribits_get_nondisabled_list(${PACKAGES_LIST_VAR} ${PROJECT_NAME} - enableStatusList "") + tribits_get_sublist_nondisabled(${PACKAGES_LIST_VAR} enableStatusList "") elseif (NOT ENABLED_FLAG AND NOT INCLUDE_EMPTY) - tribits_get_disabled_list(${PACKAGES_LIST_VAR} ${PROJECT_NAME} + tribits_get_sublist_disabled(${PACKAGES_LIST_VAR} enableStatusList "") else() # NOT ENABLED_FLAG AND INCLUDE_EMPTY - tribits_get_nonenabled_list(${PACKAGES_LIST_VAR} ${PROJECT_NAME} + tribits_get_sublist_nonenabled(${PACKAGES_LIST_VAR} enableStatusList "") endif() tribits_print_prefix_string_and_list("${DOCSTRING}" "${enableStatusList}") diff --git a/cmake/tribits/core/package_arch/TribitsProcessEnabledTpl.cmake b/cmake/tribits/core/package_arch/TribitsProcessEnabledTpl.cmake index dcdde4ce6349..f6925f2081ff 100644 --- a/cmake/tribits/core/package_arch/TribitsProcessEnabledTpl.cmake +++ b/cmake/tribits/core/package_arch/TribitsProcessEnabledTpl.cmake @@ -57,9 +57,9 @@ function(tribits_process_enabled_tpl TPL_NAME) # Setup the processing string set(PROCESSING_MSG_STRING "Processing enabled external package/TPL: ${TPL_NAME} (") - if (TPL_${TPL_NAME}_ENABLING_PKG) + if (${TPL_NAME}_ENABLING_PKG) string(APPEND PROCESSING_MSG_STRING - "enabled by ${TPL_${TPL_NAME}_ENABLING_PKG}," ) + "enabled by ${${TPL_NAME}_ENABLING_PKG}," ) else() string(APPEND PROCESSING_MSG_STRING "enabled explicitly," ) @@ -121,14 +121,14 @@ function(tribits_process_enabled_tpl TPL_NAME) " which is pointed to in the file:\n" " ${${TPL_NAME}_TPLS_LIST_FILE}\n" ) - if (TPL_${TPL_NAME}_ENABLING_PKG) + if (${TPL_NAME}_ENABLING_PKG) message( "TIP: One way to get past the configure failure for the\n" "TPL '${TPL_NAME}' is to simply disable it with:\n" " -DTPL_ENABLE_${TPL_NAME}=OFF\n" "which will disable it and will recursively disable all of the\n" "downstream packages that have required dependencies on it, including\n" - "the package '${TPL_${TPL_NAME}_ENABLING_PKG}' which triggered its enable.\n" + "the package '${${TPL_NAME}_ENABLING_PKG}' which triggered its enable.\n" "When you reconfigure, just grep the cmake stdout for '${TPL_NAME}'\n" "and then follow the disables that occur as a result to see what impact\n" "this TPL disable has on the configuration of ${PROJECT_NAME}.\n" diff --git a/cmake/tribits/core/package_arch/TribitsProcessPackagesAndDirsLists.cmake b/cmake/tribits/core/package_arch/TribitsProcessPackagesAndDirsLists.cmake index 35a5d46b4864..d045fdedfaaa 100644 --- a/cmake/tribits/core/package_arch/TribitsProcessPackagesAndDirsLists.cmake +++ b/cmake/tribits/core/package_arch/TribitsProcessPackagesAndDirsLists.cmake @@ -334,29 +334,32 @@ function(tribits_is_primary_meta_project_package PACKAGE_NAME_IN endfunction() -# Function that determines if it is okay to allow an implicit package enable -# based on its classification. +# Function that determines if it is okay to allow an implicit enable of an +# upstream package given the disable of a downstream package that depends on +# it. # -function(tribits_implicit_package_enable_is_allowed UPSTREAM_PACKAGE_NAME_IN - PACKAGE_NAME_IN IMPLICIT_PACKAGE_ENABLE_ALLOWED_OUT +function(tribits_implicit_package_enable_is_allowed upstreamPackageName + packageName implictPackageEnableAllowedOut ) - if (${PACKAGE_NAME_IN}_TESTGROUP STREQUAL PT) - set(IMPLICIT_PACKAGE_ENABLE_ALLOWED TRUE) - elseif (${PACKAGE_NAME_IN}_TESTGROUP STREQUAL ST - AND ${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE + if (${packageName}_PACKAGE_BUILD_STATUS STREQUAL "EXTERNAL") + set(implicitPackageEnableAllowed FALSE) + elseif (${packageName}_TESTGROUP STREQUAL "PT") + set(implicitPackageEnableAllowed TRUE) + elseif (${packageName}_TESTGROUP STREQUAL "ST" + AND ${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE ) - set(IMPLICIT_PACKAGE_ENABLE_ALLOWED TRUE) + set(implicitPackageEnableAllowed TRUE) else() - if (UPSTREAM_PACKAGE_NAME_IN) - message("-- " "NOTE: Not Setting ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME_IN}=ON" - " even though ${UPSTREAM_PACKAGE_NAME_IN} has an optional dependence on" - " ${PACKAGE_NAME_IN} because ${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE=OFF" ) + if (upstreamPackageName) + message("-- " "NOTE: Not Setting ${PROJECT_NAME}_ENABLE_${packageName}=ON" + " even though ${upstreamPackageName} has an optional dependence on" + " ${packageName} because ${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE=OFF" ) endif() - set(IMPLICIT_PACKAGE_ENABLE_ALLOWED FALSE) + set(implicitPackageEnableAllowed FALSE) endif() - set(${IMPLICIT_PACKAGE_ENABLE_ALLOWED_OUT} ${IMPLICIT_PACKAGE_ENABLE_ALLOWED} + set(${implictPackageEnableAllowedOut} "${implicitPackageEnableAllowed}" PARENT_SCOPE ) endfunction() @@ -378,7 +381,6 @@ endfunction() # * `${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES`_ # * `${PROJECT_NAME}_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES`_ # * ``${PROJECT_NAME}_LAST_DEFINED_INTERNAL_TOPLEVEL_PACKAGE_IDX`` -# * ``${PROJECT_NAME}_REVERSE_DEFINED_INTERNAL_TOPLEVEL_PACKAGES`` # # For each of the listed top-level (parent) packages ${PACKAGE_NAME}, it also # sets up constant variables defined in `TriBITS Package Top-Level Local @@ -386,12 +388,15 @@ endfunction() # # * `${PACKAGE_NAME}_SOURCE_DIR`_ # * `${PACKAGE_NAME}_REL_SOURCE_DIR`_ +# * `${PACKAGE_NAME}_PARENT_PACKAGE`_ (to empty "") +# * `${PACKAGE_NAME}_PARENT_REPOSITORY`_ (to empty "") # * `${PACKAGE_NAME}_TESTGROUP`_ +# * `${PACKAGE_NAME}_PACKAGE_BUILD_STATUS`_ (to ``INTERNAL``) # # and sets up some standard enable/disable vars with default values as defined -# in `TriBITS Package Cache Variables`_ like:: +# in `TriBITS Package Cache Variables`_ like: # -# ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} +# * `${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}`_ # # NOTE: Set ``TRIBITS_PROCESS_PACKAGES_AND_DIRS_LISTS_VERBOSE=TRUE`` to see # really verbose debug output from this macro. @@ -541,11 +546,12 @@ macro(tribits_process_packages_and_dirs_lists REPOSITORY_NAME REPOSITORY_DIR) print_var(REPOSITORY_AND_PACKAGE_DIR) print_var(PACKAGE_ABS_DIR) print_var(PACKAGE_EXISTS) - print_var(${PROJECT_NAME}_ASSERT_MISSING_PACKAGES) + print_var(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES) print_var(${TRIBITS_PACKAGE}_ALLOW_MISSING_EXTERNAL_PACKAGE) endif() - if (${PROJECT_NAME}_ASSERT_MISSING_PACKAGES + if (${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES IN_LIST + ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST AND NOT PACKAGE_EXISTS AND NOT ${TRIBITS_PACKAGE}_ALLOW_MISSING_EXTERNAL_PACKAGE ) @@ -558,15 +564,14 @@ macro(tribits_process_packages_and_dirs_lists REPOSITORY_NAME REPOSITORY_DIR) if (PACKAGE_EXISTS OR ${PROJECT_NAME}_IGNORE_PACKAGE_EXISTS_CHECK) list(APPEND ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES ${TRIBITS_PACKAGE}) - tribits_insert_standard_package_options(${TRIBITS_PACKAGE} - ${PACKAGE_TESTGROUP}) - set(${TRIBITS_PACKAGE}_PACKAGE_BUILD_STATUS INTERNAL) set(${TRIBITS_PACKAGE}_SOURCE_DIR "${PROJECT_SOURCE_DIR}/${REPOSITORY_AND_PACKAGE_DIR}") set(${TRIBITS_PACKAGE}_REL_SOURCE_DIR "${REPOSITORY_AND_PACKAGE_DIR}") set(${TRIBITS_PACKAGE}_PARENT_PACKAGE "") set(${TRIBITS_PACKAGE}_PARENT_REPOSITORY ${REPOSITORY_NAME}) + tribits_insert_standard_package_options(${TRIBITS_PACKAGE} ${PACKAGE_TESTGROUP}) + set(${TRIBITS_PACKAGE}_PACKAGE_BUILD_STATUS INTERNAL) else() if (${PROJECT_NAME}_VERBOSE_CONFIGURE) message( @@ -580,10 +585,14 @@ macro(tribits_process_packages_and_dirs_lists REPOSITORY_NAME REPOSITORY_DIR) # gets set to TRUE for some unit tests. Otherwise, in every legitimate # usage of this macro it is always FALSE. - if (TRIBITS_PROCESS_PACKAGES_AND_DIRS_LISTS_VERBOSE) + if (TRIBITS_PROCESS_PACKAGES_AND_DIRS_LISTS_VERBOSE + OR ${PROJECT_NAME}_VERBOSE_CONFIGURE + ) print_var(${TRIBITS_PACKAGE}_SOURCE_DIR) + print_var(${TRIBITS_PACKAGE}_REL_SOURCE_DIR) print_var(${TRIBITS_PACKAGE}_PARENT_PACKAGE) print_var(${TRIBITS_PACKAGE}_PARENT_REPOSITORY) + print_var(${TRIBITS_PACKAGE}_PACKAGE_BUILD_STATUS) endif() if (TRIBITS_PROCESS_PACKAGES_AND_DIRS_LISTS_VERBOSE) @@ -599,12 +608,6 @@ macro(tribits_process_packages_and_dirs_lists REPOSITORY_NAME REPOSITORY_DIR) math(EXPR ${PROJECT_NAME}_LAST_DEFINED_INTERNAL_TOPLEVEL_PACKAGE_IDX "${${PROJECT_NAME}_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES}-1") - # Create a reverse list for later use - - set(${PROJECT_NAME}_REVERSE_DEFINED_INTERNAL_TOPLEVEL_PACKAGES - ${${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES}) - list(REVERSE ${PROJECT_NAME}_REVERSE_DEFINED_INTERNAL_TOPLEVEL_PACKAGES) - else() set(${REPOSITORY_NAME}_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES 0) diff --git a/cmake/tribits/core/package_arch/TribitsProcessTplsLists.cmake b/cmake/tribits/core/package_arch/TribitsProcessTplsLists.cmake index 0a9c2ea486bd..611dcf3f73b2 100644 --- a/cmake/tribits/core/package_arch/TribitsProcessTplsLists.cmake +++ b/cmake/tribits/core/package_arch/TribitsProcessTplsLists.cmake @@ -138,6 +138,7 @@ endmacro() # * `${TPL_NAME}_TESTGROUP`_ # * `${TPL_NAME}_DEPENDENCIES_FILE`_ # * `${TPL_NAME}_TPLS_LIST_FILE`_ +# * `${TPL_NAME}_PACKAGE_BUILD_STATUS`_ (to ``EXTERNAL``) # # See `Function call tree for constructing package dependency graph`_ # @@ -216,10 +217,6 @@ macro(tribits_process_tpls_lists REPOSITORY_NAME REPOSITORY_DIR) list(APPEND ${PROJECT_NAME}_DEFINED_TPLS ${TPL_NAME}) endif() - # Set ${TPL_NAME}_PACKAGE_BUILD_STATUS - - set(${TPL_NAME}_PACKAGE_BUILD_STATUS EXTERNAL) - # Set ${TPL_NAME}_TESTGROUP if (TPL_TESTGROUP STREQUAL PT @@ -274,6 +271,10 @@ macro(tribits_process_tpls_lists REPOSITORY_NAME REPOSITORY_DIR) assert_defined(${REPOSITORY_NAME}_TPLS_FILE) set(${TPL_NAME}_TPLS_LIST_FILE ${${REPOSITORY_NAME}_TPLS_FILE}) + # Set ${TPL_NAME}_PACKAGE_BUILD_STATUS + + set(${TPL_NAME}_PACKAGE_BUILD_STATUS EXTERNAL) + # Print variables/properties for the TPL if (${PROJECT_NAME}_VERBOSE_CONFIGURE OR TRIBITS_PROCESS_TPLS_LISTS_VERBOSE) @@ -281,6 +282,7 @@ macro(tribits_process_tpls_lists REPOSITORY_NAME REPOSITORY_DIR) print_var(${TPL_NAME}_FINDMOD) print_var(${TPL_NAME}_DEPENDENCIES_FILE) print_var(${TPL_NAME}_TPLS_LIST_FILE) + print_var(${TPL_NAME}_PACKAGE_BUILD_STATUS) endif() # Set cache var TPL_ENABLE_${TPL_NAME} with default "" diff --git a/cmake/tribits/core/package_arch/TribitsProjectImpl.cmake b/cmake/tribits/core/package_arch/TribitsProjectImpl.cmake index fc9e30109206..892cecc6b6a3 100644 --- a/cmake/tribits/core/package_arch/TribitsProjectImpl.cmake +++ b/cmake/tribits/core/package_arch/TribitsProjectImpl.cmake @@ -117,7 +117,7 @@ macro(tribits_project_impl) # Since the version header file is now configured the root build # dir needs to be on the include path - include_directories(${CMAKE_CURRENT_BINARY_DIR}) + tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) # # B) Set up user options and global variables that will be used throughout diff --git a/cmake/tribits/core/package_arch/TribitsReadAllProjectDepsFilesCreateDepsGraph.cmake b/cmake/tribits/core/package_arch/TribitsReadAllProjectDepsFilesCreateDepsGraph.cmake index 261d815f3e05..2b71d8288589 100644 --- a/cmake/tribits/core/package_arch/TribitsReadAllProjectDepsFilesCreateDepsGraph.cmake +++ b/cmake/tribits/core/package_arch/TribitsReadAllProjectDepsFilesCreateDepsGraph.cmake @@ -64,7 +64,6 @@ include(TimingUtils) # # * `Lists of external and internal packages`_ # * `Variables defining the package dependencies graph`_ -# (`Legacy list variables defining the package dependencies graph`_) # * `TriBITS Package Top-Level Local Variables`_ # * `TriBITS Subpackage Top-Level Local Variables`_ # * `TriBITS Package Cache Variables`_ @@ -238,14 +237,6 @@ macro(tribits_read_defined_external_and_internal_toplevel_packages_lists) # ${PROJECT_NAME}_NUM_DEFINED_TPLS list(LENGTH ${PROJECT_NAME}_DEFINED_TPLS ${PROJECT_NAME}_NUM_DEFINED_TPLS) - # ${PROJECT_NAME}_REVERSE_DEFINED_TPLS (ToDo: Remove the need for this #63) - if (${PROJECT_NAME}_DEFINED_TPLS) - set(${PROJECT_NAME}_REVERSE_DEFINED_TPLS ${${PROJECT_NAME}_DEFINED_TPLS}) - list(REVERSE ${PROJECT_NAME}_REVERSE_DEFINED_TPLS) - else() - set(${PROJECT_NAME}_REVERSE_DEFINED_TPLS) - endif() - # ${PROJECT_NAME}_DEFINED_TOPLEVEL_PACKAGES set(${PROJECT_NAME}_DEFINED_TOPLEVEL_PACKAGES ${${PROJECT_NAME}_DEFINED_TPLS} diff --git a/cmake/tribits/core/package_arch/TribitsReadDepsFilesCreateDepsGraph.cmake b/cmake/tribits/core/package_arch/TribitsReadDepsFilesCreateDepsGraph.cmake index c55673ee927b..9ec045e0099b 100644 --- a/cmake/tribits/core/package_arch/TribitsReadDepsFilesCreateDepsGraph.cmake +++ b/cmake/tribits/core/package_arch/TribitsReadDepsFilesCreateDepsGraph.cmake @@ -38,6 +38,7 @@ # @HEADER include(TribitsPackageDefineDependencies) +include(TribitsPackageDependencies) include(SetDefault) include(DualScopeSet) @@ -64,12 +65,12 @@ include(DualScopeSet) # # * `${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES`_ # -# as well creates the package dependency variables described in `Legacy list -# variables defining the package dependencies graph`_ that defines the -# directed acyclic dependency (DAG) package dependency graph (with navigation -# up and down the graph). +# as well creates the package dependency variables described in `Variables +# defining the package dependencies graph`_ that defines the directed acyclic +# dependency (DAG) package dependency graph (with navigation up and down the +# graph). # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # macro(tribits_read_deps_files_create_deps_graph) @@ -91,20 +92,15 @@ endmacro() # Process any dependency logic at the repo level by loading # `/cmake/RepositoryDependenciesSetup.cmake`_ files. # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # macro(tribits_process_all_repository_deps_setup_files) - foreach(TIBITS_REPO ${${PROJECT_NAME}_ALL_REPOSITORIES}) + foreach(TIBITS_REPO IN LISTS ${PROJECT_NAME}_ALL_REPOSITORIES) tribits_get_repo_name_dir(${TIBITS_REPO} REPO_NAME REPO_DIR) tribits_set_base_repo_dir(${PROJECT_SOURCE_DIR} ${REPO_DIR} BASE_REPO_DIR) tribits_get_repo_name(${TIBITS_REPO} REPOSITORY_NAME) - #print_var(TIBITS_REPO) - #print_var(REPO_NAME) - #print_var(REPO_DIR) - #print_var(REPOSITORY_NAME) set(REPO_DEPENDENCIES_SETUP_FILE "${BASE_REPO_DIR}/cmake/RepositoryDependenciesSetup.cmake") - #print_var(REPO_DEPENDENCIES_SETUP_FILE) if (EXISTS ${REPO_DEPENDENCIES_SETUP_FILE}) tribits_trace_file_processing(REPOSITORY INCLUDE "${REPO_DEPENDENCIES_SETUP_FILE}") @@ -128,7 +124,7 @@ endmacro() # Process any dependency logic at the project level by loading the # `/cmake/ProjectDependenciesSetup.cmake`_ file # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # macro(tribits_process_project_dependency_setup_file) set(PROJECT_DEPENDENCIES_SETUP_FILE @@ -170,33 +166,26 @@ endmacro() # # * `${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES`_ # -# as well creates the package dependency variables described in `Legacy list -# variables defining the package dependencies graph`_ that defines the -# directed acyclic dependency (DAG) package dependency graph (with navigation -# up and down the graph). +# as well creates the package dependency variables described in `Variables +# defining the package dependencies graph`_ that defines the directed acyclic +# dependency (DAG) package dependency graph (with navigation up and down the +# graph). # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # macro(tribits_read_all_package_deps_files_create_deps_graph) - foreach(tribitsExternalPkg IN LISTS ${PROJECT_NAME}_DEFINED_TPLS) + foreach(tribitsExternalPkg IN LISTS ${PROJECT_NAME}_DEFINED_TPLS) tribits_read_external_package_deps_files_add_to_graph(${tribitsExternalPkg}) endforeach() set(${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES "") # Packages and subpackages - foreach(TRIBITS_PACKAGE IN LISTS ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES) + foreach(TRIBITS_PACKAGE IN LISTS ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES) tribits_read_toplevel_package_deps_files_add_to_graph(${TRIBITS_PACKAGE} ${${TRIBITS_PACKAGE}_REL_SOURCE_DIR}) endforeach() - # Create a reverse packages list for later use - set(${PROJECT_NAME}_REVERSE_DEFINED_INTERNAL_PACKAGES - ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) - if (${PROJECT_NAME}_REVERSE_DEFINED_INTERNAL_PACKAGES) - list(REVERSE ${PROJECT_NAME}_REVERSE_DEFINED_INTERNAL_PACKAGES) - endif() - list(LENGTH ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${PROJECT_NAME}_NUM_DEFINED_INTERNAL_PACKAGES) print_var(${PROJECT_NAME}_NUM_DEFINED_INTERNAL_PACKAGES) @@ -218,9 +207,13 @@ endmacro() # # _LIB_DEFINED_DEPENDENCIES # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # macro(tribits_read_external_package_deps_files_add_to_graph tplName) + # Set up empty lists for forward dependencies + set(${tplName}_FORWARD_LIB_DEFINED_DEPENDENCIES "") + set(${tplName}_FORWARD_TEST_DEFINED_DEPENDENCIES "") + # Read in and process the external package/TPL dependency file if (IS_ABSOLUTE "${${tplName}_DEPENDENCIES_FILE}") set(absTplDepsFile "${${tplName}_DEPENDENCIES_FILE}") else() @@ -229,6 +222,10 @@ macro(tribits_read_external_package_deps_files_add_to_graph tplName) if (EXISTS "${absTplDepsFile}") tribits_trace_file_processing(TPL INCLUDE "${absTplDepsFile}") include(${absTplDepsFile}) + foreach(depPkg IN LISTS ${tplName}_LIB_DEFINED_DEPENDENCIES) + global_set(${tplName}_LIB_DEP_REQUIRED_${depPkg} TRUE) + endforeach() + tribits_append_forward_dep_packages(${tplName} LIB) endif() endmacro() @@ -242,21 +239,8 @@ endmacro() # Macro that reads in package dependencies for a top-level package from the # file `/cmake/Dependencies.cmake`_ and appends the forward # dependencies list vars for packages already read in for this package -# ````. -# -# Modifies the global variables:: -# -# ${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES -# ${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES -# ${PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES -# ${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES -# _FORWARD_LIB_REQUIRED_DEP_PACKAGES -# _FORWARD_LIB_OPTIONAL_DEP_PACKAGES -# _FORWARD_TEST_REQUIRED_DEP_PACKAGES -# _FORWARD_TEST_OPTIONAL_DEP_PACKAGES -# -# (where ```` are upstream dependencies of this package -# ``${PACKAGE_NAME}``). +# ```` (see `Variables defining the package dependencies +# graph`_). # # It also appends the list variable: # @@ -266,11 +250,12 @@ endmacro() # order and then this top-level package is appended and dependencies are # created for them. # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # macro(tribits_read_toplevel_package_deps_files_add_to_graph PACKAGE_NAME) - # A) Get ready to read in the contents of this this pakages's Dependencies.cmake file + # A) Get ready to read in the contents of this package's Dependencies.cmake + # file tribits_prep_to_read_dependencies(${PACKAGE_NAME}) @@ -309,7 +294,7 @@ macro(tribits_read_toplevel_package_deps_files_add_to_graph PACKAGE_NAME) # Append the subpackages to the dependencies list if this top-level package set(SUBPACKAGE_IDX 0) - foreach(TRIBITS_SUBPACKAGE ${${PACKAGE_NAME}_SUBPACKAGES}) + foreach(TRIBITS_SUBPACKAGE IN LISTS ${PACKAGE_NAME}_SUBPACKAGES) set(SUBPACKAGE_FULLNAME ${PACKAGE_NAME}${TRIBITS_SUBPACKAGE}) list(GET ${PACKAGE_NAME}_SUBPACKAGE_OPTREQ ${SUBPACKAGE_IDX} SUBPACKAGE_OPTREQ) list(APPEND LIB_${SUBPACKAGE_OPTREQ}_DEP_PACKAGES ${SUBPACKAGE_FULLNAME}) @@ -342,49 +327,32 @@ endmacro() # # It also sets to empty the forward dependency list vars: # -# * `${PACKAGE_NAME}_FORWARD_LIB_DEP_PACKAGES`_ -# * `${PACKAGE_NAME}_FORWARD_TEST_DEP_PACKAGES`_ -# -# for each of the forward/downstream in `Variables defining the package -# dependencies graph`_. -# -# See `Function call tree for constructing package dependency graph`_ -# -# **__Legacy variables:__** +# * `${PACKAGE_NAME}_FORWARD_LIB_DEFINED_DEPENDENCIES`_ +# * `${PACKAGE_NAME}_FORWARD_TEST_DEFINED_DEPENDENCIES`_ # -# It also sets to empty the forward dependency list vars: -# -# _FORWARD_ +# for each of the forward/downstream package/dependency in `Variables defining +# the package dependencies graph`_. # -# for each of the forward/downstream in `Legacy list variables defining the -# package dependencies graph`_. +# See `Function call tree for constructing package dependency graph`_. # macro(tribits_prep_to_read_dependencies PACKAGE_NAME_IN) # Initial vars that must be set in the Dependencies.cmake file - tribits_declare_undefined(LIB_REQUIRED_DEP_PACKAGES) tribits_declare_undefined(LIB_OPTIONAL_DEP_PACKAGES) tribits_declare_undefined(TEST_REQUIRED_DEP_PACKAGES) tribits_declare_undefined(TEST_OPTIONAL_DEP_PACKAGES) - tribits_declare_undefined(LIB_REQUIRED_DEP_TPLS "") - tribits_declare_undefined(LIB_OPTIONAL_DEP_TPLS "") - tribits_declare_undefined(TEST_REQUIRED_DEP_TPLS "") - tribits_declare_undefined(TEST_OPTIONAL_DEP_TPLS "") + tribits_declare_undefined(LIB_REQUIRED_DEP_TPLS) + tribits_declare_undefined(LIB_OPTIONAL_DEP_TPLS) + tribits_declare_undefined(TEST_REQUIRED_DEP_TPLS) + tribits_declare_undefined(TEST_OPTIONAL_DEP_TPLS) set(REGRESSION_EMAIL_LIST "") # Allow to be empty # Initialize other vars - - set(${PACKAGE_NAME_IN}_FORWARD_LIB_DEP_PACKAGES "") - set(${PACKAGE_NAME_IN}_FORWARD_TEST_DEP_PACKAGES "") - - # Legacy vars #63 - set(${PACKAGE_NAME_IN}_FORWARD_LIB_REQUIRED_DEP_PACKAGES "") - set(${PACKAGE_NAME_IN}_FORWARD_LIB_OPTIONAL_DEP_PACKAGES "") - set(${PACKAGE_NAME_IN}_FORWARD_TEST_REQUIRED_DEP_PACKAGES "") - set(${PACKAGE_NAME_IN}_FORWARD_TEST_OPTIONAL_DEP_PACKAGES "") + set(${PACKAGE_NAME_IN}_FORWARD_LIB_DEFINED_DEPENDENCIES "") + set(${PACKAGE_NAME_IN}_FORWARD_TEST_DEFINED_DEPENDENCIES "") endmacro() @@ -399,7 +367,7 @@ endmacro() # `tribits_package_define_dependencies()`_ in the file # `/cmake/Dependencies.cmake`_ have been set. # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # macro(tribits_assert_read_dependency_vars PACKAGE_NAME) @@ -424,7 +392,7 @@ endmacro() # # Saves off package dependency variables with variable suffix ``_``. # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # macro(tribits_save_off_dependency_vars POSTFIX) @@ -450,7 +418,7 @@ endmacro() # Read back the local package dependency vars from the saved-off vars with # suffix ``_``. # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # macro(tribits_read_back_dependencies_vars POSTFIX) @@ -473,46 +441,56 @@ endmacro() # # tribits_process_package_dependencies_lists() # -# Sets up the upstream and downstream/forward package dependency list -# variables for ```` described in `Legacy list variables defining -# the package dependencies graph`_. Note that the downstream/forward -# dependencies of upstream packages on this package ```` are -# built up incrementally. +# Sets up the upstream/backward and downstream/forward package dependency list +# variables for ```` described in `Variables defining the package +# dependencies graph`_. Note that the downstream/forward dependencies of +# upstream packages for this package ```` are built up +# incrementally. (The forward dependency list vars are initialized to empty +# in `tribits_prep_to_read_dependencies()`_.) # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # -macro(tribits_process_package_dependencies_lists PACKAGE_NAME) - - tribits_set_dep_packages(${PACKAGE_NAME} LIB REQUIRED) - tribits_set_dep_packages(${PACKAGE_NAME} LIB OPTIONAL) - tribits_set_dep_packages(${PACKAGE_NAME} TEST REQUIRED) - tribits_set_dep_packages(${PACKAGE_NAME} TEST OPTIONAL) - - set(${PACKAGE_NAME}_LIB_REQUIRED_DEP_TPLS ${LIB_REQUIRED_DEP_TPLS}) - set(${PACKAGE_NAME}_LIB_OPTIONAL_DEP_TPLS ${LIB_OPTIONAL_DEP_TPLS}) - set(${PACKAGE_NAME}_TEST_REQUIRED_DEP_TPLS ${TEST_REQUIRED_DEP_TPLS}) - set(${PACKAGE_NAME}_TEST_OPTIONAL_DEP_TPLS ${TEST_OPTIONAL_DEP_TPLS}) - - tribits_append_forward_dep_packages(${PACKAGE_NAME} LIB_REQUIRED_DEP_PACKAGES) - tribits_append_forward_dep_packages(${PACKAGE_NAME} LIB_OPTIONAL_DEP_PACKAGES) - tribits_append_forward_dep_packages(${PACKAGE_NAME} TEST_REQUIRED_DEP_PACKAGES) - tribits_append_forward_dep_packages(${PACKAGE_NAME} TEST_OPTIONAL_DEP_PACKAGES) +macro(tribits_process_package_dependencies_lists packageName) + + # Initialize backward dep vars + set(${packageName}_LIB_DEFINED_DEPENDENCIES "") + set(${packageName}_TEST_DEFINED_DEPENDENCIES "") + + # Fill the backward dependency vars + tribits_set_dep_packages(${packageName} LIB REQUIRED PACKAGES) + tribits_set_dep_packages(${packageName} LIB OPTIONAL PACKAGES) + tribits_set_dep_packages(${packageName} LIB REQUIRED TPLS) + tribits_set_dep_packages(${packageName} LIB OPTIONAL TPLS) + tribits_set_dep_packages(${packageName} TEST REQUIRED PACKAGES) + tribits_set_dep_packages(${packageName} TEST OPTIONAL PACKAGES) + tribits_set_dep_packages(${packageName} TEST REQUIRED TPLS) + tribits_set_dep_packages(${packageName} TEST OPTIONAL TPLS) + + # Fill forward deps lists #63 + tribits_append_forward_dep_packages(${packageName} LIB) + tribits_append_forward_dep_packages(${packageName} TEST) endmacro() -# @FUNCTION: tribits_set_dep_packages() +# @MACRO: tribits_set_dep_packages() +# +# Macro set up backward package dependency lists for a given package given the +# vars read in from the macro `tribits_package_define_dependencies()`_. # # Usage:: # -# tribits_set_dep_packages( LIB|TEST REQUIRED|OPTIONAL) +# tribits_set_dep_packages( ) +# +# where: +# +# * ````: ``LIB`` or ``TEST`` +# * ````: ``REQUIRED`` or ``OPTIONAL`` +# * ````: ``PACKAGES`` or ``TPLS`` # -# Function that helps to set up backward package dependency lists for a given -# package given the vars read in from the macro -# `tribits_package_define_dependencies()`_. # # Sets the upstream/backward dependency variables defined in the section -# `Legacy list variables defining the package dependencies graph`_. +# `Variables defining the package dependencies graph`_. # # This also handles the several types of issues: # @@ -523,124 +501,149 @@ endmacro() # `tribits_abort_on_missing_package()`_ or allow to be missing and disable # this package if this is a required dependency). # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # -function(tribits_set_dep_packages PACKAGE_NAME LIB_OR_TEST REQUIRED_OR_OPTIONAL) - - if (TRIBITS_SET_DEP_PACKAGES_DEBUG_DUMP) - message("\nTRIBITS_SET_DEP_PACKAGES: ${PACKAGE_NAME} ${LIB_OR_TEST} ${REQUIRED_OR_OPTIONAL})") - endif() +macro(tribits_set_dep_packages packageName testOrLib requiredOrOptional pkgsOrTpls) - set(LIST_TYPE ${LIB_OR_TEST}_${REQUIRED_OR_OPTIONAL}_DEP_PACKAGES) - set(PACKAGE_DEPS_LIST "") - set(PACKAGE_ENABLE_VAR ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + set(inputListType ${testOrLib}_${requiredOrOptional}_DEP_${pkgsOrTpls}) + set(packageEnableVar ${PROJECT_NAME}_ENABLE_${packageName}) - foreach(DEP_PKG ${${LIST_TYPE}}) - if (TRIBITS_SET_DEP_PACKAGES_DEBUG_DUMP) - print_var(DEP_PKG) - endif() - if (${DEP_PKG} STREQUAL ${PACKAGE_NAME}) - tribits_abort_on_self_dep("${PACKAGE_NAME}" "${LIST_TYPE}") - endif() - if (${DEP_PKG}_SOURCE_DIR) - set(DEP_PKG_DEFINED_AND_EXISTS TRUE) - else() - set(DEP_PKG_DEFINED_AND_EXISTS FALSE) - endif() - if (TRIBITS_SET_DEP_PACKAGES_DEBUG_DUMP) - print_var(DEP_PKG_DEFINED_AND_EXISTS) + foreach(depPkg IN LISTS ${inputListType}) + if (${depPkg} STREQUAL ${packageName}) + tribits_abort_on_self_dep("${packageName}" "${inputListType}") endif() - if (DEP_PKG_DEFINED_AND_EXISTS) - list(APPEND PACKAGE_DEPS_LIST ${DEP_PKG}) - else() - if (${PROJECT_NAME}_ASSERT_MISSING_PACKAGES - AND NOT ${DEP_PKG}_ALLOW_MISSING_EXTERNAL_PACKAGE - ) - tribits_abort_on_missing_package( - "${DEP_PKG}" "${PACKAGE_NAME}" "${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES") + tribits_is_pkg_defined(${depPkg} ${pkgsOrTpls} depPkgIsDefined) + if (depPkgIsDefined) + list(APPEND ${packageName}_${testOrLib}_DEFINED_DEPENDENCIES ${depPkg}) + if ("${requiredOrOptional}" STREQUAL "REQUIRED") + global_set(${packageName}_${testOrLib}_DEP_REQUIRED_${depPkg} TRUE) + elseif ("${requiredOrOptional}" STREQUAL "OPTIONAL") + global_set(${packageName}_${testOrLib}_DEP_REQUIRED_${depPkg} FALSE) else() - if (${DEP_PKG}_ALLOW_MISSING_EXTERNAL_PACKAGE) - if (${PROJECT_NAME}_WARN_ABOUT_MISSING_EXTERNAL_PACKAGES) - message_wrapper("NOTE: ${DEP_PKG} is being ignored since its directory" - " is missing and ${DEP_PKG}_ALLOW_MISSING_EXTERNAL_PACKAGE =" - " ${${DEP_PKG}_ALLOW_MISSING_EXTERNAL_PACKAGE}!") - endif() - if (REQUIRED_OR_OPTIONAL STREQUAL "REQUIRED") - message_wrapper("NOTE: Setting ${PACKAGE_ENABLE_VAR}=OFF because" - " package ${PACKAGE_NAME} has a required dependency on missing" - " package ${DEP_PKG}!") - dual_scope_set(${PACKAGE_ENABLE_VAR} OFF) - endif() - endif() - if (${PROJECT_NAME}_VERBOSE_CONFIGURE) - message( - "\n***" - "\n*** NOTE: The package ${DEP_PKG} which is a dependent package of" - " ${PACKAGE_NAME} being ignored because ${DEP_PKG} is missing!" - "\n***\n" ) - endif() - # Must set enable vars for missing package to off so that logic in - # existing downstream packages that key off of these vars will still - # work. - dual_scope_set(${PROJECT_NAME}_ENABLE_${DEP_PKG} OFF) - dual_scope_set(${PACKAGE_NAME}_ENABLE_${DEP_PKG} OFF) + message(FATAL_ERROR + "Invalid value for requiredOrOptional='${requiredOrOptional}'!") endif() + else() + tribits_set_dep_packages__handle_undefined_pkg(${packageName} ${depPkg} + ${requiredOrOptional} ${pkgsOrTpls} ${packageEnableVar}) endif() endforeach() - #print_var(PACKAGE_DEPS_LIST) +endmacro() - global_set(${PACKAGE_NAME}_${LIST_TYPE} ${PACKAGE_DEPS_LIST}) +# Determine if a (internal or external) package is defined or not +# +function(tribits_is_pkg_defined depPkg pkgsOrTpls depPkgIsDefinedOut) + set(depPkgIsDefined FALSE) + if (pkgsOrTpls STREQUAL "PACKAGES") + if (${depPkg}_SOURCE_DIR) + set(depPkgIsDefined TRUE) + endif() + elseif(pkgsOrTpls STREQUAL "TPLS") + if (${depPkg}_FINDMOD) + set(depPkgIsDefined TRUE) + endif() + else() + message(FATAL_ERROR "Invalid value for pkgsOrTpls = '${pkgsOrTpls}'") + endif() + set(${depPkgIsDefinedOut} ${depPkgIsDefined} PARENT_SCOPE) endfunction() -# @FUNCTION: tribits_append_forward_dep_packages() +# Implementation macro for tribits_set_dep_packages() to deal with a package +# that is not defined by TriBITS. # -# Usage: tribits_append_forward_dep_packages( ) +# ToDo #63: This may need to be modified when dealing with TriBITS-compatible +# packages already installed out on the system. We may need a mode where we +# don't assert packages that are not defined but instead just assume they are +# TriBITS-compatible packages already installed. +# +macro(tribits_set_dep_packages__handle_undefined_pkg packageName depPkg + requiredOrOptional pkgsOrTpls packageEnableVar + ) + # Determine if it is allowed for this depPkg to not be defined + set(errorOutForUndefinedDepPkg TRUE) + if (${depPkg}_ALLOW_MISSING_EXTERNAL_PACKAGE) + set(errorOutForUndefinedDepPkg FALSE) + elseif (NOT ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES IN_LIST + ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST + ) + set(errorOutForUndefinedDepPkg FALSE) + endif() + # Produce error or deal with allowed undefined ${depPkg} + if (errorOutForUndefinedDepPkg) + tribits_abort_on_missing_package("${depPkg}" "${packageName}") + else() + if (${depPkg}_ALLOW_MISSING_EXTERNAL_PACKAGE) + if (${PROJECT_NAME}_WARN_ABOUT_MISSING_EXTERNAL_PACKAGES) + message_wrapper("NOTE: ${depPkg} is being ignored since its directory" + " is missing and ${depPkg}_ALLOW_MISSING_EXTERNAL_PACKAGE =" + " ${${depPkg}_ALLOW_MISSING_EXTERNAL_PACKAGE}!") + endif() + if ("${requiredOrOptional}" STREQUAL "REQUIRED") + message_wrapper("NOTE: Setting ${packageEnableVar}=OFF because" + " package ${packageName} has a required dependency on missing" + " package ${depPkg}!") + set(${packageEnableVar} OFF) + endif() + endif() + # Must set enable vars for missing package to off so that logic in + # existing downstream packages that key off of these vars will still + # work. + set(${PROJECT_NAME}_ENABLE_${depPkg} OFF) + set(${packageName}_ENABLE_${depPkg} OFF) + endif() +endmacro() + + +# @MACRO: tribits_append_forward_dep_packages() # -# Function that helps to set up forward package dependency lists for an -# upstream package given that a downstream package declared a dependency on -# it. In particular, it appends the var:: +# Appends forward/downstream package dependency lists for the upstream +# dependent package list provided. +# +# Usage:: +# +# tribits_append_forward_dep_packages( ) +# +# In particular, it appends the var:: # # _FORWARD_ # -# for one of the vars listed in `Legacy list variables defining the package -# dependencies graph`_. +# for one of the vars listed in `Variables defining the package dependencies +# graph`_. # # This function is called multiple times to build up the forward package # dependencies for a given ```` by the downstream packages that # declare dependencies on it. # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # -function(tribits_append_forward_dep_packages PACKAGE_NAME LIST_TYPE) - - set(DEP_PKG_LIST_NAME "${PACKAGE_NAME}_${LIST_TYPE}") +macro(tribits_append_forward_dep_packages packageName libOrTest) - assert_defined(${PROJECT_NAME}_ASSERT_MISSING_PACKAGES) - foreach(DEP_PKG ${${DEP_PKG_LIST_NAME}}) - set(FWD_DEP_PKG_LIST_NAME "${DEP_PKG}_FORWARD_${LIST_TYPE}") - if (NOT DEFINED ${FWD_DEP_PKG_LIST_NAME}) - if (${PROJECT_NAME}_ASSERT_MISSING_PACKAGES) - tribits_abort_on_missing_package(${DEP_PKG} ${PACKAGE_NAME} ${DEP_PKG_LIST_NAME}) + foreach(depPkg IN LISTS ${packageName}_${libOrTest}_DEFINED_DEPENDENCIES) + set(fwdDepPkgListName ${depPkg}_FORWARD_${libOrTest}_DEFINED_DEPENDENCIES) + if (DEFINED ${fwdDepPkgListName}) + list(APPEND ${fwdDepPkgListName} ${packageName}) + else() + if (${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES IN_LIST + ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST + ) + tribits_abort_on_missing_package(${depPkg} ${packageName}) else() if (${PROJECT_NAME}_VERBOSE_CONFIGURE) message( "\n***" - "\n*** NOTE: The package ${DEP_PKG} has forward dependent package" - " ${PACKAGE_NAME}, but that dependency is being ignored because the package" - " ${DEP_PKG} is missing!" + "\n*** NOTE: The package ${depPkg} has forward dependent package" + " ${packageName}, but that dependency is being ignored because the package" + " ${depPkg} is missing!" "\n***\n" ) endif() endif() - else() - set(${FWD_DEP_PKG_LIST_NAME} ${${FWD_DEP_PKG_LIST_NAME}} ${PACKAGE_NAME} - PARENT_SCOPE) endif() endforeach() -endfunction() +endmacro() # @MACRO: tribits_set_package_regression_email_list() @@ -652,9 +655,9 @@ endfunction() # Macro that sets a pacakge's regression email address # ``${PACKAGE_NAME}_REGRESSION_EMAIL_LIST`` as described in ???. # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # -macro(tribits_set_package_regression_email_list PACKAGE_NAME) +macro(tribits_set_package_regression_email_list PACKAGE_NAME) # Lower-case package name To be used with auto email naming based on base email address string(TOLOWER "${PACKAGE_NAME}" LPACKAGE) @@ -663,7 +666,6 @@ macro(tribits_set_package_regression_email_list PACKAGE_NAME) endif() tribits_get_repo_name(${${PACKAGE_NAME}_PARENT_REPOSITORY} REPOSITORY_NAME) - #print_var(REPOSITORY_NAME) if(${REPOSITORY_NAME}_REPOSITORY_OVERRIDE_PACKAGE_EMAIL_LIST) set(${PACKAGE_NAME}_REGRESSION_EMAIL_LIST @@ -697,25 +699,28 @@ endmacro() # # Usage:: # -# tribits_abort_on_missing_package( ) +# tribits_abort_on_missing_package( ) # # Function that creates error message about missing/misspelled package. This # error message also suggests that the package might be defining an upstream # dependency on a downstream dependency (i.e. a circular dependency). # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # -function(tribits_abort_on_missing_package DEP_PKG PACKAGE_NAME DEP_PKG_LIST_NAME) +function(tribits_abort_on_missing_package depPkg packageName) multiline_set(ERRMSG - "Error, the package '${DEP_PKG}' is listed as a dependency of the package" - " '${PACKAGE_NAME}' is in the list '${DEP_PKG_LIST_NAME}' but the package" - " '${DEP_PKG}' is either not defined or is listed later in the package order." + "Error, the package '${depPkg}' is listed as a dependency of the package" + " '${packageName}' but the package '${depPkg}' is either not defined or" + " is listed later in the package order." " This may also be an attempt to create a circular dependency between" - " the packages '${DEP_PKG}' and '${PACKAGE_NAME}' (which is not allowed)." - " Check the spelling of '${DEP_PKG}' or see how it is listed in" + " the packages '${depPkg}' and '${packageName}' (which is not allowed)." + " Check the spelling of '${depPkg}' or see how it is listed in" " a call to tribits_repository_define_packages() in relation to" - " '${PACKAGE_NAME}'.") - message(FATAL_ERROR ${ERRMSG}) + " '${packageName}'." + " To ignore/disable the undefined package '${depPkg}', set the cache" + " variable ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES=IGNORE." + ) + message(${${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES} "${ERRMSG}") endfunction() @@ -728,7 +733,7 @@ endfunction() # Prints a fatal error message for an attempt for a self dependency # declaration and which list it comes from. # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # function(tribits_abort_on_self_dep PACKAGE_NAME DEP_PKG_LIST_NAME) multiline_set(ERRMSG @@ -747,14 +752,15 @@ endfunction() # # Usage:: # -# tribits_parse_subpackages_append_packages_add_options() +# tribits_parse_subpackages_append_packages_add_options() # # Macro that parses the read-in variable # ``SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS`` set by the macro # `tribits_package_define_dependencies()`_ , adds subpackages to the list of # defined packages, and defines user cache var options for those subpackages. # -# This sets the list variables for the parent package ````:: +# This sets the list variables for the parent package +# ````:: # # _SUBPACKAGES # _SUBPACKAGE_DIRS @@ -767,108 +773,102 @@ endfunction() # _PARENT_PACKAGE # _PARENT_REPOSITORY # -# And it appends for each subpackage to variable: +# And it appends each subpackage to the list variable: # # * `${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES`_ # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # -macro(tribits_parse_subpackages_append_packages_add_options - PACKAGE_NAME - ) +macro(tribits_parse_subpackages_append_packages_add_options parentPackageName) - # Structure of SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS + # Fields in the list var SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS set(SPDC_SP_NAME_OFFSET 0) set(SPDC_SP_DIR_OFFSET 1) set(SPDC_SP_CLASSIFICATION_OFFSET 2) set(SPDC_SP_OPTREQ_OFFSET 3) - set(SPDC_NUM_FIELDS 4) + set(SPDC_NUM_FIELDS 4) # Number of the above files - set(${PACKAGE_NAME}_SUBPACKAGES "") - set(${PACKAGE_NAME}_SUBPACKAGE_DIRS "") - set(${PACKAGE_NAME}_SUBPACKAGE_OPTREQ "") + set(${parentPackageName}_SUBPACKAGES "") + set(${parentPackageName}_SUBPACKAGE_DIRS "") + set(${parentPackageName}_SUBPACKAGE_OPTREQ "") if (SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS) - list(LENGTH SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS SPDC_TOTAL_LENGTH) - math(EXPR NUM_SUBPACKAGES "${SPDC_TOTAL_LENGTH}/${SPDC_NUM_FIELDS}") - math(EXPR SUBPACKAGES_LAST_IDX "${NUM_SUBPACKAGES}-1") - - foreach(SUBPACKAGE_IDX RANGE ${SUBPACKAGES_LAST_IDX}) + list(LENGTH SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS SPDC_TOTAL_LENGTH) + math(EXPR numSubpackages "${SPDC_TOTAL_LENGTH}/${SPDC_NUM_FIELDS}") + math(EXPR subpackagesLastIdx "${numSubpackages}-1") - #message("") - #print_var(SUBPACKAGE_IDX) + foreach(SUBPACKAGE_IDX RANGE ${subpackagesLastIdx}) - # SUBPACKAGE_NAME - math(EXPR SUBPACKAGE_NAME_IDX + # subpkgName + math(EXPR subpkgNameIdx "${SUBPACKAGE_IDX}*${SPDC_NUM_FIELDS}+${SPDC_SP_NAME_OFFSET}") - list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${SUBPACKAGE_NAME_IDX} - SUBPACKAGE_NAME ) + list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${subpkgNameIdx} subpkgName) - set(SUBPACKAGE_FULLNAME ${PACKAGE_NAME}${SUBPACKAGE_NAME}) + # subpkgFullname + set(subpkgFullname ${parentPackageName}${subpkgName}) - # SUBPACKAGE_DIR - math(EXPR SUBPACKAGE_DIR_IDX + # subpkgDir + math(EXPR subpkgDirIdx "${SUBPACKAGE_IDX}*${SPDC_NUM_FIELDS}+${SPDC_SP_DIR_OFFSET}") - list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${SUBPACKAGE_DIR_IDX} - SUBPACKAGE_DIR ) + list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${subpkgDirIdx} subpkgDir) - # SUBPACKAGE_CLASSIFICATION - math(EXPR SUBPACKAGE_CLASSIFICATION_IDX + # subpkgClassification + math(EXPR subpkgClassificationIdx "${SUBPACKAGE_IDX}*${SPDC_NUM_FIELDS}+${SPDC_SP_CLASSIFICATION_OFFSET}") - list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${SUBPACKAGE_CLASSIFICATION_IDX} - SUBPACKAGE_CLASSIFICATION ) + list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${subpkgClassificationIdx} + subpkgClassification ) # ToDo: Parse out TESTGROUP and MATURITYLEVEL (Trilinos #6042) - set(SUBPACKAGE_TESTGROUP ${SUBPACKAGE_CLASSIFICATION}) + set(subpkgTestgroup ${subpkgClassification}) - tribits_update_ps_pt_ss_st(Subpackage ${SUBPACKAGE_FULLNAME} SUBPACKAGE_TESTGROUP) + tribits_update_ps_pt_ss_st(Subpackage ${subpkgFullname} subpkgTestgroup) - # SUBPACKAGE_OPTREQ - math(EXPR SUBPACKAGE_OPTREQ_IDX + # subpkgOptreq + math(EXPR subpkgOptreqIdx "${SUBPACKAGE_IDX}*${SPDC_NUM_FIELDS}+${SPDC_SP_OPTREQ_OFFSET}") - list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${SUBPACKAGE_OPTREQ_IDX} - SUBPACKAGE_OPTREQ ) + list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${subpkgOptreqIdx} + subpkgOptreq ) # Determine if this subpackage exists - set(SUBPACKAGE_FULL_SOURCE_DIR - ${PROJECT_SOURCE_DIR}/${${PACKAGE_NAME}_REL_SOURCE_DIR}/${SUBPACKAGE_DIR}) - if (EXISTS ${SUBPACKAGE_FULL_SOURCE_DIR}) - set(SUBPACKAGE_EXISTS TRUE) + set(subpkgFullSrcDir + "${PROJECT_SOURCE_DIR}/${${parentPackageName}_REL_SOURCE_DIR}/${subpkgDir}") + if (EXISTS "${subpkgFullSrcDir}") + set(subpkgExists TRUE) else() - set(SUBPACKAGE_EXISTS FALSE) + set(subpkgExists FALSE) endif() - if (NOT SUBPACKAGE_EXISTS AND ${PROJECT_NAME}_ASSERT_MISSING_PACKAGES) - message(SEND_ERROR "ERROR: Subpackage dir '${SUBPACKAGE_FULL_SOURCE_DIR}'" - " is missing!") + if (NOT subpkgExists AND ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES IN_LIST + ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST + ) + message(SEND_ERROR "ERROR: Subpackage dir '${subpkgFullSrcDir}' is missing!") endif() # Append to lists and global variables - if (SUBPACKAGE_EXISTS) + if (subpkgExists) - list(APPEND ${PACKAGE_NAME}_SUBPACKAGES ${SUBPACKAGE_NAME}) - list(APPEND ${PACKAGE_NAME}_SUBPACKAGE_DIRS ${SUBPACKAGE_DIR}) - list(APPEND ${PACKAGE_NAME}_SUBPACKAGE_OPTREQ ${SUBPACKAGE_OPTREQ}) - list(APPEND ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${SUBPACKAGE_FULLNAME}) - set(${SUBPACKAGE_FULLNAME}_SOURCE_DIR "${SUBPACKAGE_FULL_SOURCE_DIR}") - set(${SUBPACKAGE_FULLNAME}_REL_SOURCE_DIR - "${${PACKAGE_NAME}_REL_SOURCE_DIR}/${SUBPACKAGE_DIR}") - set(${SUBPACKAGE_FULLNAME}_PARENT_PACKAGE ${PACKAGE_NAME}) - set(${SUBPACKAGE_FULLNAME}_PARENT_REPOSITORY - ${${PACKAGE_NAME}_PARENT_REPOSITORY}) + list(APPEND ${parentPackageName}_SUBPACKAGES ${subpkgName}) + list(APPEND ${parentPackageName}_SUBPACKAGE_DIRS ${subpkgDir}) + list(APPEND ${parentPackageName}_SUBPACKAGE_OPTREQ ${subpkgOptreq}) + list(APPEND ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${subpkgFullname}) + set(${subpkgFullname}_SOURCE_DIR "${subpkgFullSrcDir}") + set(${subpkgFullname}_REL_SOURCE_DIR + "${${parentPackageName}_REL_SOURCE_DIR}/${subpkgDir}") + set(${subpkgFullname}_PARENT_PACKAGE ${parentPackageName}) + set(${subpkgFullname}_PARENT_REPOSITORY + ${${parentPackageName}_PARENT_REPOSITORY}) if (${PROJECT_NAME}_VERBOSE_CONFIGURE) - print_var(${SUBPACKAGE_FULLNAME}_PARENT_PACKAGE) - print_var(${SUBPACKAGE_FULLNAME}_PARENT_REPOSITORY) + print_var(${subpkgFullname}_PARENT_PACKAGE) + print_var(${subpkgFullname}_PARENT_REPOSITORY) endif() - set(${SUBPACKAGE_FULLNAME}_PACKAGE_BUILD_STATUS INTERNAL) + set(${subpkgFullname}_PACKAGE_BUILD_STATUS INTERNAL) # Set up the input options for this subpackage - tribits_insert_standard_package_options(${SUBPACKAGE_FULLNAME} - ${SUBPACKAGE_TESTGROUP}) + tribits_insert_standard_package_options(${subpkgFullname} ${subpkgTestgroup}) endif() @@ -876,9 +876,6 @@ macro(tribits_parse_subpackages_append_packages_add_options endif() - #print_var(${PACKAGE_NAME}_SUBPACKAGES) - #print_var(${PACKAGE_NAME}_SUBPACKAGE_OPTREQ) - endmacro() @@ -891,16 +888,12 @@ endmacro() # Read in subpackages dependencies files and add to dependencies graph # variables. # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # macro(tribits_read_package_subpackage_deps_files_add_to_graph PACKAGE_NAME) - #message("TRIBITS_READ_PACKAGE_SUBPACKAGE_DEPS_FILES_ADD_TO_GRAPH: ${PACKAGE_NAME}") - - #print_var(${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES) - set(SUBPACKAGE_IDX 0) - foreach(TRIBITS_SUBPACKAGE ${${PACKAGE_NAME}_SUBPACKAGES}) + foreach(TRIBITS_SUBPACKAGE IN LISTS ${PACKAGE_NAME}_SUBPACKAGES) list(GET ${PACKAGE_NAME}_SUBPACKAGE_DIRS ${SUBPACKAGE_IDX} SUBPACKAGE_DIR) tribits_read_subpackage_deps_file_add_to_graph(${TRIBITS_PACKAGE} ${TRIBITS_SUBPACKAGE} ${SUBPACKAGE_DIR}) @@ -921,14 +914,12 @@ endmacro() # `//cmake/Dependencies.cmake`_ and sets up the # dependency structure for it. # -# See `Function call tree for constructing package dependency graph`_ +# See `Function call tree for constructing package dependency graph`_. # macro(tribits_read_subpackage_deps_file_add_to_graph PACKAGE_NAME SUBPACKAGE_NAME SUBPACKAGE_DIR ) - #message("TRIBITS_READ_SUBPACKAGE_DEPS_FILE_ADD_TO_GRAPH: ${PACKAGE_NAME} ${SUBPACKAGE_NAME} ${SUBPACKAGE_DIR}") - set(SUBPACKAGE_FULLNAME ${PACKAGE_NAME}${SUBPACKAGE_NAME}) # @@ -958,7 +949,9 @@ macro(tribits_read_subpackage_deps_file_add_to_graph PACKAGE_NAME set(SUBPACKAGE_EXISTS FALSE) endif() - if (SUBPACKAGE_EXISTS OR ${PROJECT_NAME}_ASSERT_MISSING_PACKAGES) + if (SUBPACKAGE_EXISTS OR ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES IN_LIST + ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST + ) tribits_trace_file_processing(PACKAGE INCLUDE "${SUBPAKCAGE_DEPENDENCIES_FILE}") include(${SUBPAKCAGE_DEPENDENCIES_FILE}) diff --git a/cmake/tribits/core/package_arch/TribitsReportInvalidTribitsUsage.cmake b/cmake/tribits/core/package_arch/TribitsReportInvalidTribitsUsage.cmake index 442a4928fbcd..0a40deaa928e 100644 --- a/cmake/tribits/core/package_arch/TribitsReportInvalidTribitsUsage.cmake +++ b/cmake/tribits/core/package_arch/TribitsReportInvalidTribitsUsage.cmake @@ -53,6 +53,7 @@ include(MessageWrapper) # * FATAL_ERROR: Calls message(FATAL_ERROR "") # * SEND_ERROR: Calls message(SEND_ERROR "") # * WARNING: Calls message(WARNING "") +# * NOTICE: Calls message(NOTICE "") # * IGNORE: Does not call message() at all and is silent # # If '${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE}' is empty on call, then @@ -60,24 +61,14 @@ include(MessageWrapper) # function(tribits_report_invalid_tribits_usage) if ("${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE}" STREQUAL "") - set(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE FATAL_ERROR) + set(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE FATAL_ERROR) endif() - set(PRINT_ERR_MSG) - if (${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE STREQUAL "FATAL_ERROR") - set(PRINT_ERR_MSG FATAL_ERROR) - elseif (${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE STREQUAL "SEND_ERROR") - set(PRINT_ERR_MSG SEND_ERROR) - elseif (${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE STREQUAL "WARNING") - set(PRINT_ERR_MSG WARNING) - elseif (${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE STREQUAL "IGNORE") - set(PRINT_ERR_MSG) - else() - message_wrapper(FATAL_ERROR "Error, invalid value for" - " ${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE =" - " '${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE}'!" - " Value values include 'FATAL_ERROR', 'SEND_ERROR', 'WARNING', and 'IGNORE'!") + set(printErrMsgMode ${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE}) + set(ignoreValues "IGNORE" "OFF") + if(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE IN_LIST ignoreValues) + set(printErrMsgMode "") endif() - if (PRINT_ERR_MSG) - message_wrapper(${PRINT_ERR_MSG} ${ARGN}) + if (printErrMsgMode) + message_wrapper(${printErrMsgMode} ${ARGN}) endif() endfunction() diff --git a/cmake/tribits/core/package_arch/TribitsSetUpEnabledOnlyDependencies.cmake b/cmake/tribits/core/package_arch/TribitsSetUpEnabledOnlyDependencies.cmake new file mode 100644 index 000000000000..9e5900114bc0 --- /dev/null +++ b/cmake/tribits/core/package_arch/TribitsSetUpEnabledOnlyDependencies.cmake @@ -0,0 +1,237 @@ +# @HEADER +# ************************************************************************ +# +# TriBITS: Tribal Build, Integrate, and Test System +# Copyright 2013 Sandia Corporation +# +# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +# the U.S. Government retains certain rights in this software. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# 3. Neither the name of the Corporation nor the names of the +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# ************************************************************************ +# @HEADER + +include(TribitsDeprecatedHelpers) + + +# Function that creates enable-only dependency data-structures +# +# For each enabled package ``, this function sets up the global list +# var:: +# +# _FULL_ENABLED_DEP_PACKAGES +# +# If ``${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES`` is +# set, then ``_FULL_ENABLED_DEP_PACKAGES`` will only be sets for +# those packages. Otherwise, ``_FULL_ENABLED_DEP_PACKAGES`` will be +# set for all packages listed in `${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES`_. +# +# NOTE: The modern TriBITS implementation does not need this full list of +# dependencies for each package. Only the function +# `tribits_find_most_recent_file_timestamp()` needs this. (Therefore, this +# could not be striped out of TriBITS because there are still some projects +# that use this function.) +# +function(tribits_set_up_enabled_only_dependencies) + + set(GENERATE_EXPORT_DEPENDENCIES ${${PROJECT_NAME}_GENERATE_EXPORT_FILE_DEPENDENCIES}) + if ("${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES}" STREQUAL "" + AND NOT + "${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES}" STREQUAL "" + ) + tribits_deprecated( + "The cache var" + " ${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES" + "='${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES}'" + " is deprecated! Please instead set" + " ${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES" + "='${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES}'") + set(${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES + ${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES} ) + endif() + + # Determine lastExportTribitsPackage if not to generate any of these full + # dependency lists + set(lastExportTribitsPackage "") + if (GENERATE_EXPORT_DEPENDENCIES + AND ${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES + ) + # Find the last enabled package for which an export file is requested. + set(LAST_PKG_IDX -1) + set(LAST_PKG) + foreach(tribitsPkg IN LISTS + ${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES + ) + set(PKG_IDX ${${tribitsPkg}_PKG_IDX}) + if (NOT "${PKG_IDX}" STREQUAL "") + # The listed package is enabled so we will consider it + if (PKG_IDX GREATER ${LAST_PKG_IDX}) + set(LAST_PKG_IDX ${PKG_IDX}) + set(LAST_PKG ${tribitsPkg}) + endif() + endif() + endforeach() + if (LAST_PKG) + # At least one listed package was enabled + set(lastExportTribitsPackage ${LAST_PKG}) + else() + # None of the listed packages were enabled so don't bother generating + # any export dependencies + set(GENERATE_EXPORT_DEPENDENCIES FALSE) + endif() + + endif() + + if (GENERATE_EXPORT_DEPENDENCIES) + + if (lastExportTribitsPackage) + message("\nSetting up export dependencies up through ${lastExportTribitsPackage} ...\n") + else() + message("\nSetting up export dependencies for all enabled packages ...\n") + endif() + + foreach(tribitsPackage IN LISTS ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES) + tribits_package_set_full_enabled_dep_packages(${tribitsPackage}) + if (${PROJECT_NAME}_DUMP_PACKAGE_DEPENDENCIES) + set(printedVar FALSE) + print_nonempty_var_with_spaces(${tribitsPackage}_FULL_ENABLED_DEP_PACKAGES + printedVar) + if (NOT printedVar) + message("-- ${tribitsPackage}: No library dependencies!") + endif() + endif() + if ("${lastExportTribitsPackage}" STREQUAL "${tribitsPackage}") + break() + endif() + endforeach() + + endif() + +endfunction() + + +# Function that sets up the full package dependencies for the given *internal* +# enabled package ``${packageName}``, including all of its indirect upstream +# *internal* package dependencies. +# +# After running, this function sets the internal cache var: +# +# * ``${packageName}_FULL_ENABLED_DEP_PACKAGES`` +# +# NOTE: This function must be called for all of the upstream internal packages +# before calling it for this package. +# +# NOTE: The complexity of this function is O(^2) due to the +# sorting algorithm. That is why it would be good to get rid of this function +# at some point (or refactor it to have a better complexity). +# +function(tribits_package_set_full_enabled_dep_packages packageName) + + tribits_package_build_unsorted_full_enabled_dep_packages(${packageName} + packageFullDepsList) + + tribits_package_sort_full_enabled_dep_packages(packageFullDepsList + orderedPackageFullDepsList) + + global_set(${packageName}_FULL_ENABLED_DEP_PACKAGES ${orderedPackageFullDepsList}) + +endfunction() + + +# Helper function that builds the full list of internal upstream dep packages +# (with no duplicates) for a given internal package. +# +function(tribits_package_build_unsorted_full_enabled_dep_packages packageName + packageFullDepsListOut + ) + + set(packageFullDepsList "") + foreach(depPkg IN LISTS ${packageName}_LIB_DEFINED_DEPENDENCIES) + if ((${depPkg}_PACKAGE_BUILD_STATUS STREQUAL "INTERNAL") + AND ((${packageName}_LIB_DEP_REQUIRED AND ${PROJECT_NAME}_ENABLE_${depPkg}) + OR ((NOT ${packageName}_LIB_DEP_REQUIRED) AND ${packageName}_ENABLE_${depPkg})) + ) + list(APPEND packageFullDepsList ${depPkg}) + endif() + endforeach() + + if(packageFullDepsList) + list(REMOVE_DUPLICATES packageFullDepsList) + + foreach(DEP_PACKAGE IN LISTS packageFullDepsList) + list(APPEND packageFullDepsList ${${DEP_PACKAGE}_FULL_ENABLED_DEP_PACKAGES}) + endforeach() + + list(REMOVE_DUPLICATES packageFullDepsList) + endif() + + set(${packageFullDepsListOut} ${packageFullDepsList} PARENT_SCOPE) + +endfunction() + + +# Helper function to sort the full set of upstream dep packages for a given +# internal package. +# +function(tribits_package_sort_full_enabled_dep_packages packageFullDepsListName + orderedPackageFullDepsListOut + ) + + set(orderedPackageFullDepsList "") + + foreach(depPkg IN LISTS ${packageFullDepsListName}) + + set(depPkgIdx ${${depPkg}_PKG_IDX}) + + set(sortedIndex 0) + set(insertedDepPkg FALSE) + + foreach(sortedPackage IN LISTS orderedPackageFullDepsList) + + set(sortedPackageIdx ${${sortedPackage}_PKG_IDX}) + + if (${depPkgIdx} GREATER ${sortedPackageIdx}) + list(INSERT orderedPackageFullDepsList ${sortedIndex} ${depPkg}) + set(insertedDepPkg TRUE) + break() + endif() + + math(EXPR sortedIndex ${sortedIndex}+1) + + endforeach() + + if(NOT insertedDepPkg) + list(APPEND orderedPackageFullDepsList ${depPkg}) + endif() + + endforeach() + + set(${orderedPackageFullDepsListOut} ${orderedPackageFullDepsList} PARENT_SCOPE) + +endfunction() diff --git a/cmake/tribits/core/package_arch/TribitsSystemDataStructuresMacrosFunctions.rst b/cmake/tribits/core/package_arch/TribitsSystemDataStructuresMacrosFunctions.rst index 3e5a4e3718b1..f4661403fabd 100644 --- a/cmake/tribits/core/package_arch/TribitsSystemDataStructuresMacrosFunctions.rst +++ b/cmake/tribits/core/package_arch/TribitsSystemDataStructuresMacrosFunctions.rst @@ -295,14 +295,9 @@ the dependencies for each external package/TPL and internal package: The list of all **defined direct** required and optional upstream external package/TPL and internal package dependencies, regardless if they are - enabled or not. (Note, this is currently the concatenation of the lists - `${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES`_, - `${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES`_, - ``${PACKAGE_NAME}_LIB_REQUIRED_DEP_TPLS``, and - ``${PACKAGE_NAME}_LIB_OPTIONAL_DEP_TPLS``. With the completion of #63, - the ``XXX_TPLS`` lists will be removed.) To determine if a given direct - upstream package ```` in this list is enabled or not for this - package ``${PACKAGE_NAME}``, check the value of + enabled or not. To determine if a given direct upstream package + ```` in this list is enabled or not for this package + ``${PACKAGE_NAME}``, check the value of ``${PACKAGE_NAME}_ENABLE_``. NOTE: The variables ``${PACKAGE_NAME}_ENABLE_`` will be set even for required upstream packages to allow for uniform loops involving required and optional @@ -338,13 +333,8 @@ the dependencies for each external package/TPL and internal package: This list of all **define direct** extra package test required and optional upstream external package/TPL and internal package dependencies. - (Currently, this is a concatenation of the lists - `${PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES`_, - `${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES`_, - ``${PACKAGE_NAME}_TEST_REQUIRED_DEP_TPLS``, and - ``${PACKAGE_NAME}_TEST_OPTIONAL_DEP_TPLS``. With the completion of #63, - the ``XXX_TPLS`` lists will be removed.) This list is set regardless if - the package ``${PACKAGE_NAME}`` is enabled or not. + This list is set regardless if the package ``${PACKAGE_NAME}`` is enabled + or not. .. _${PACKAGE_NAME}_TEST_ENABLED_DEPENDENCIES: @@ -390,17 +380,17 @@ Given the above upstream dependency list variables, the following derived list variables are then constructed which provide navigation from a package to its downstream/forward dependent packages: - .. _${PACKAGE_NAME}_FORWARD_LIB_DEP_PACKAGES: + .. _${PACKAGE_NAME}_FORWARD_LIB_DEFINED_DEPENDENCIES: - ``${PACKAGE_NAME}_FORWARD_LIB_DEP_PACKAGES`` + ``${PACKAGE_NAME}_FORWARD_LIB_DEFINED_DEPENDENCIES`` For a given package ``${PACKAGE_NAME}``, lists the names of all of the forward packages ```` that list this package in their ``_LIB_DEFINED_PACKAGES`` variables. - .. _${PACKAGE_NAME}_FORWARD_TEST_DEP_PACKAGES: + .. _${PACKAGE_NAME}_FORWARD_TEST_DEFINED_DEPENDENCIES: - ``${PACKAGE_NAME}_FORWARD_TEST_DEP_PACKAGES`` + ``${PACKAGE_NAME}_FORWARD_TEST_DEFINED_DEPENDENCIES`` For a given package ``${PACKAGE_NAME}``, lists the names of all of the forward packages ```` that list this package in their @@ -452,6 +442,7 @@ or:: -D _ROOT= .. _${PACKAGE_NAME}_PACKAGE_BUILD_STATUS: +.. _${TPL_NAME}_PACKAGE_BUILD_STATUS: The final status of whether a package is treated as an internal package or an external package is provided by the variable:: @@ -522,86 +513,6 @@ information about a given internal package: variable defined for them. -Legacy list variables defining the package dependencies graph -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -The following top-level non-cache variables are defined after reading in each -top-level package and subpackage ``Dependencies.cmake`` files and they are -used to define the basic dependencies that exist between packages in a project -to support the enable and disable logic described in section `Package -Dependencies and Enable/Disable Logic`_. These variables taken together -constitute a bidirectional acyclic graph (DAG) data-structure for package -dependencies. - -The following lists variables define the **direct** dependencies from a -package ``${PACKAGE_NAME}`` to its upstream packages which are directly set in -a package's `/cmake/Dependencies.cmake`_ file. (These lists -should **not** contain any *indirect* dependencies as the dependency system -already handles these automatically.) - - .. _${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES: - - ``${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES`` - - List of *direct* package dependencies that are required for the libraries - and non-test executables built by ``${PACKAGE_NAME}``. - - .. _${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES: - - ``${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES`` - - List of *direct* package dependencies that are only optional for the - libraries and non-test executables built by ``${PACKAGE_NAME}``. - - .. _${PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES: - - ``${PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES`` - - List of *direct* package dependencies that are required for the - tests/examples built by ``${PACKAGE_NAME}``. This list should **not** - contain any of the packages already listed in - ``${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES``. - - .. _${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES: - - ``${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES``` - - List of *direct* package dependencies that are optional for the - tests/examples built by ``${PACKAGE_NAME}``. This list should **not** - contain any of the packages listed in - ``${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES``, - ``${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES``, or - ``${PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES``. - -Given the above upstream dependency list variables, the following derived list -variables are then constructed which provide navigation from a package to its -downstream/forward dependent packages: - - ``${PACKAGE_NAME}_FORWARD_LIB_REQUIRED_DEP_PACKAGES`` - - For a given package ``${PACKAGE_NAME}``, lists the names of all of the - forward packages ``${FORWARD_PACKAGE_NAME}`` that list this package in - their ``${FORWARD_PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES`` variables. - - ``${PACKAGE_NAME}_FORWARD_LIB_OPTIONAL_DEP_PACKAGES`` - - For a given package ``${PACKAGE_NAME}``, lists the names of all of the - forward packages ``${FORWARD_PACKAGE_NAME}`` that list this package in - their ``${FORWARD_PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES`` variables. - - ``${PACKAGE_NAME}_FORWARD_TEST_REQUIRED_DEP_PACKAGES`` - - For a given package ``${PACKAGE_NAME}``, lists the names of all of the - forward packages ``${FORWARD_PACKAGE_NAME}`` that list this package in - their ``${FORWARD_PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES`` variables. - - ``${PACKAGE_NAME}_FORWARD_TEST_OPTIONAL_DEP_PACKAGES`` - - For a given package ``${PACKAGE_NAME}``, lists the names of all of the - forward packages ``${FORWARD_PACKAGE_NAME}`` that list this package in - their ``${FORWARD_PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES`` variables. - - Function call tree for constructing package dependency graph ------------------------------------------------------------ diff --git a/cmake/tribits/core/package_arch/TribitsTestCategories.cmake b/cmake/tribits/core/package_arch/TribitsTestCategories.cmake index c0058c9c7cd8..acd55cee153d 100644 --- a/cmake/tribits/core/package_arch/TribitsTestCategories.cmake +++ b/cmake/tribits/core/package_arch/TribitsTestCategories.cmake @@ -40,6 +40,7 @@ include(FindListElement) include(MessageWrapper) include(Join) +include(TribitsDeprecatedHelpers) # Define the valid categories that will be recognized in the CATEGORIES keyword @@ -97,7 +98,7 @@ function(tribits_filter_and_assert_categories CATEGORIES_VAR_INOUT) set(CATEGORIES_OUT) foreach(CATEGORY ${${CATEGORIES_VAR_INOUT}}) if (CATEGORY STREQUAL "WEEKLY") - message_wrapper(WARNING "Warning: The test category 'WEEKLY' is deprecated" + tribits_deprecated("The test category 'WEEKLY' is deprecated" " and is replaced with 'HEAVY'. Please change to use 'HEAVY' instead.") list(APPEND CATEGORIES_OUT "HEAVY") else() diff --git a/cmake/tribits/core/package_arch/TribitsTplDeclareLibraries.cmake b/cmake/tribits/core/package_arch/TribitsTplDeclareLibraries.cmake index 16e8bae9e60e..aa808d8e8fc8 100644 --- a/cmake/tribits/core/package_arch/TribitsTplDeclareLibraries.cmake +++ b/cmake/tribits/core/package_arch/TribitsTplDeclareLibraries.cmake @@ -38,11 +38,12 @@ # @HEADER include(TribitsTplFindIncludeDirsAndLibraries) +include(TribitsDeprecatedHelpers) function(tribits_tpl_declare_libraries TPL_NAME) - message(WARNING - "WARNING: tribits_tpl_declare_libraries() is deprecated, instead use" - " tribits_tpl_find_include_dirs_and_libraries()!" + tribits_deprecated_command(tribits_tpl_declare_libraries + MESSAGE + "Use tribits_tpl_find_include_dirs_and_libraries() instead." " Make this change in the file:\n" " ${${TPL_NAME}_FINDMOD}\n" "which is pointed to by the file:\n" diff --git a/cmake/tribits/core/package_arch/TribitsTplFindIncludeDirsAndLibraries.cmake b/cmake/tribits/core/package_arch/TribitsTplFindIncludeDirsAndLibraries.cmake index d3cb102cf3d2..ad2621289daf 100644 --- a/cmake/tribits/core/package_arch/TribitsTplFindIncludeDirsAndLibraries.cmake +++ b/cmake/tribits/core/package_arch/TribitsTplFindIncludeDirsAndLibraries.cmake @@ -676,8 +676,11 @@ function(tribits_tpl_find_include_dirs_and_libraries TPL_NAME) advanced_set(TPL_${TPL_NAME}_INCLUDE_DIRS ${${TPL_NAME}_INCLUDE_DIRS} CACHE PATH "User provided include dirs in the absence of include files.") else() - # Library has no header files, no user override, so just set them to null - global_null_set(TPL_${TPL_NAME}_INCLUDE_DIRS) + if ("${TPL_${TPL_NAME}_INCLUDE_DIRS}" STREQUAL "") + # Library has no header files, no user override, so just set them to + # null (unless the user has already set this). + global_null_set(TPL_${TPL_NAME}_INCLUDE_DIRS) + endif() endif() endif() diff --git a/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake b/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake index 1f31b6ec0c01..7ef8f2666bd4 100644 --- a/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake +++ b/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake @@ -178,125 +178,11 @@ function(tribits_write_flexible_package_client_export_files) print_var(EXPORT_FILE_VAR_PREFIX) endif() - # - # B) Get the set of upstream packages for this package that are enabled, - # libraries, library dirs, and include dirs - # - - set(FULL_PACKAGE_SET "") - set(FULL_LIBRARY_SET "") - - - if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) - print_var(${PACKAGE_NAME}_FULL_ENABLED_DEP_PACKAGES) - endif() - - foreach(TRIBITS_PACKAGE ${${PACKAGE_NAME}_FULL_ENABLED_DEP_PACKAGES}) - - if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) - print_var(TRIBITS_PACKAGE) - if (${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE}) - print_var(${TRIBITS_PACKAGE}_HAS_NATIVE_LIBRARIES_TO_INSTALL) - endif() - endif() - - set(APPEND_THE_PACKAGE TRUE) - set(APPEND_THE_PACKAGE_LIBS TRUE) - - if (NOT ${TRIBITS_PACKAGE}_HAS_NATIVE_LIBRARIES_TO_INSTALL) - set(APPEND_THE_PACKAGE_LIBS FALSE) - endif() - - if (APPEND_THE_PACKAGE) - list(APPEND FULL_PACKAGE_SET ${TRIBITS_PACKAGE}) - if (APPEND_THE_PACKAGE_LIBS) - append_set(FULL_LIBRARY_SET ${${TRIBITS_PACKAGE}_LIBRARIES}) - else() - if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) - message("-- " "Skipping adding the package libs!") - endif() - endif() - else() - if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) - message("-- " "Skipping adding the package!") - endif() - endif() - - if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) - print_var(FULL_PACKAGE_SET) - print_var(FULL_LIBRARY_SET) - endif() - - endforeach() - - # Must prepend the current package and its libraries itself so that we get - # its TPLs libraries. However, if the current package has no native - # libraries (yet), then there is no point in listing the package or its - # TPLs. Why would a package list TPLs (with actual libraries) if itself - # does not have libraries to export? Note, this does not affect internal - # tests and examples which could have TPLs but no native libraries. - if (${PACKAGE_NAME}_LIBRARIES AND ${PACKAGE_NAME}_HAS_NATIVE_LIBRARIES_TO_INSTALL) - prepend_set(FULL_PACKAGE_SET ${PACKAGE_NAME}) - prepend_set(FULL_LIBRARY_SET ${${PACKAGE_NAME}_LIBRARIES}) - endif() - - if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) - message("-- " "*** Final sets of packages, libs, include dirs, and lib dirs:") - print_var(FULL_PACKAGE_SET) - print_var(FULL_LIBRARY_SET) - endif() - - # - # C) Get the set of TPLs for this package that are enabled - # - - # C.1) Get the set of enabled TPLs - - set(FULL_TPL_SET "") - foreach(TRIBITS_PACKAGE ${FULL_PACKAGE_SET}) - list(APPEND FULL_TPL_SET ${${TRIBITS_PACKAGE}_LIB_REQUIRED_DEP_TPLS}) - set(OPTIONAL_TPLS ${${TRIBITS_PACKAGE}_LIB_OPTIONAL_DEP_TPLS}) - foreach(TPL ${OPTIONAL_TPLS}) - # Only add if support for the optional TPL is enabled in this - # package. Don't just check if the TPL is enabled! - if(${TRIBITS_PACKAGE}_ENABLE_${TPL}) - list(APPEND FULL_TPL_SET ${TPL}) - endif() - endforeach() - endforeach() - if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) - print_var(FULL_TPL_SET) - endif() - - # C.2) Sort the TPLs according to the master TPL list - - #We will use the complete list of supported tpls for the project - #to help us create a properly ordered list of tpls. - if (FULL_TPL_SET) - set(ORDERED_FULL_TPL_SET ${FULL_TPL_SET}) - tribits_sort_list_according_to_master_list("${${PROJECT_NAME}_REVERSE_DEFINED_TPLS}" - ORDERED_FULL_TPL_SET) - endif() - - if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) - print_var(ORDERED_FULL_TPL_SET) - endif() - - # - # D) Get the libraries, library dirs, and the include dirs for the - # upstream enabled TPLs - # - - set(${PACKAGE_NAME}_TPL_LIBRARIES "") - foreach(TPL ${ORDERED_FULL_TPL_SET}) - list(APPEND ${PACKAGE_NAME}_TPL_LIBRARIES ${TPL}::all_libs) - endforeach() - # Generate a note discouraging editing of the Config.cmake file set(DISCOURAGE_EDITING "Do not edit: This file was generated automatically by CMake.") # - # E) Deal with the library rpath issues with shared libs + # B) Deal with the library rpath issues with shared libs # # Write the specification of the rpath if necessary. This is only needed if @@ -309,14 +195,14 @@ function(tribits_write_flexible_package_client_export_files) endif() # - # F) Create the contents of the Config.cmake file for the build tree + # C) Create the contents of the Config.cmake file for the build tree # tribits_generate_package_config_file_for_build_tree(${PACKAGE_NAME} EXPORT_FILE_VAR_PREFIX ${EXPORT_FILE_VAR_PREFIX}) # - # G) Create Config_install.cmake file for the install tree + # D) Create Config_install.cmake file for the install tree # tribits_generate_package_config_file_for_install_tree(${PACKAGE_NAME} @@ -787,28 +673,6 @@ function(tribits_write_project_client_export_files) # Custom code in configuration file. set(PROJECT_CONFIG_CODE "") - # # Export targets from the build tree. - # if(FULL_LIBRARY_SET) - # list(SORT FULL_LIBRARY_SET) - # list(REMOVE_DUPLICATES FULL_LIBRARY_SET) - # set(FULL_LIBRARY_TARGET_SET) - # foreach(LIB_ELE ${FULL_LIBRARY_SET}) - # if (TARGET ${LIB_ELE}) - # list(APPEND FULL_LIBRARY_TARGET_SET ${LIB_ELE}) - # endif() - # endforeach() - # export(TARGETS ${FULL_LIBRARY_TARGET_SET} FILE - # "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake") - # # Import the targets in applications. - # set(PROJECT_CONFIG_CODE "${PROJECT_CONFIG_CODE} - ## Import ${PROJECT_NAME} targets - #if(NOT ${PROJECT_NAME}_TARGETS_IMPORTED) - # set(${PROJECT_NAME}_TARGETS_IMPORTED 1) - # include(\"${PROJECT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake\") - #endif() - #") - # endif() - # Appending the logic to include each package's config file. set(LOAD_CODE "# Load configurations from enabled packages") foreach(TRIBITS_PACKAGE ${FULL_PACKAGE_SET}) @@ -916,7 +780,6 @@ include(\"${${TRIBITS_PACKAGE}_BINARY_DIR}/${TRIBITS_PACKAGE}Config.cmake\")") endfunction() - macro(tribits_set_compiler_var_for_config_file LANG FOR_DIR) if (NOT "${CMAKE_${LANG}_COMPILER_FOR_CONFIG_FILE_${FOR_DIR}}" STREQUAL "") set(CMAKE_${LANG}_COMPILER_FOR_CONFIG_FILE diff --git a/cmake/tribits/core/utils/AppendStringVar.cmake b/cmake/tribits/core/utils/AppendStringVar.cmake index 9b4e553a1494..dbd0c1fb5d1b 100644 --- a/cmake/tribits/core/utils/AppendStringVar.cmake +++ b/cmake/tribits/core/utils/AppendStringVar.cmake @@ -39,6 +39,7 @@ include(ConcatStrings) include(PrintVar) +include(TribitsDeprecatedHelpers) # @FUNCTION: append_string_var() @@ -60,6 +61,8 @@ include(PrintVar) # string(APPEND "" "" ...) # function(append_string_var STRING_VAR_OUT) + tribits_deprecated_command(append_string_var + MESSAGE "Use string(APPEND) instead.") #message("APPEND_STRING_VAR: ${STRING_VAR_OUT} {${ARGN}}") concat_strings( STRING_VAR "${${STRING_VAR_OUT}}" ${ARGN} ) #print_var( STRING_VAR ) diff --git a/cmake/tribits/core/utils/ParseVariableArguments.cmake b/cmake/tribits/core/utils/ParseVariableArguments.cmake index 92e1b060fd15..da2e58ad2099 100644 --- a/cmake/tribits/core/utils/ParseVariableArguments.cmake +++ b/cmake/tribits/core/utils/ParseVariableArguments.cmake @@ -37,14 +37,12 @@ # ************************************************************************ # @HEADER -# Set up to use cmake_parse_arguments() function! -include(CMakeParseArguments) -# NOTE: For CMake versions 3.5.0 and above, this module is empty so the -# natively implemented function cmake_parse_arguments() will get used! +include(TribitsDeprecatedHelpers) + macro(parse_arguments_deprecated_warning) - message(DEPRECATION "parse_arguments() is deprecated and should not be used." - " Instead use cmake_parse_arguments()") + tribits_deprecated_command(parse_arguments + MESSAGE "Use cmake_parse_arguments() instead.") endmacro() parse_arguments_deprecated_warning() diff --git a/cmake/tribits/core/utils/TribitsAddEnumCacheVar.cmake b/cmake/tribits/core/utils/TribitsAddEnumCacheVar.cmake new file mode 100644 index 000000000000..2ee30b7ed9d4 --- /dev/null +++ b/cmake/tribits/core/utils/TribitsAddEnumCacheVar.cmake @@ -0,0 +1,89 @@ +# @HEADER +# ************************************************************************ +# +# TriBITS: Tribal Build, Integrate, and Test System +# Copyright 2013 Sandia Corporation +# +# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +# the U.S. Government retains certain rights in this software. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# 3. Neither the name of the Corporation nor the names of the +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# ************************************************************************ +# @HEADER + +include(TribitsParseArgumentsHelpers) + + +# @FUNCTION: tribits_add_enum_cache_var() +# +# Set up a string cache variable that must match a fixed set of values +# (i.e. an enum) and assert that it matches those values. +# +# Usage:: +# +# tribits_add_enum_cache_var( +# DEFAULT_VAL +# DOC_STRING "" +# ALLOWED_STRINGS_LIST "" "" ... +# [IS_ADVANCED] +# ) +# +# On output, ```` will be set to the list of paths +# +function(tribits_add_enum_cache_var cacheVarName defaultVal docString + isAdvanced allowedStringsListName + ) + # Parse input arguments + set(argOneValArgKeywords DEFAULT_VAL DOC_STRING) + set(argMultiValArgKeywords ALLOWED_STRINGS_LIST) + cmake_parse_arguments(PARSE_ARGV 1 PREFIX + "IS_ADVANCED" # options + "" # one_value_keywords + "${argOneValArgKeywords};${argMultiValArgKeywords}" # multi_value_keywords + ) + tribits_check_for_unparsed_arguments(PREFIX) + tribits_assert_parse_arg_one_value(PREFIX ${argOneValArgKeywords}) + tribits_assert_parse_arg_one_or_more_values(PREFIX ${argMultiValArgKeywords}) + # Human readable list of allowed values: '', '', ... + string(REPLACE ";" "', '" validStringValuesListStr "'${PREFIX_ALLOWED_STRINGS_LIST}'") + # Set cache var + set(${cacheVarName} ${PREFIX_DEFAULT_VAL} CACHE STRING + "${PREFIX_DOC_STRING}. Valid values: ${validStringValuesListStr} (default '${PREFIX_DEFAULT_VAL}')") + if (PREFIX_IS_ADVANCED) + mark_as_advanced(${cacheVarName}) + endif() + set_property(CACHE ${cacheVarName} PROPERTY STRINGS + ${PREFIX_ALLOWED_STRINGS_LIST} ) + # Assert in list of allowed strings + if (NOT ${cacheVarName} IN_LIST PREFIX_ALLOWED_STRINGS_LIST) + message(FATAL_ERROR "Error, the cache var ${cacheVarName} with value" + " '${${cacheVarName}}' is not in the list of allowed values:" + " ${validStringValuesListStr} (default '${PREFIX_DEFAULT_VAL}')" ) + endif() +endfunction() diff --git a/cmake/tribits/core/utils/TribitsCreateReverseList.cmake b/cmake/tribits/core/utils/TribitsCreateReverseList.cmake new file mode 100644 index 000000000000..2f84d8c4781d --- /dev/null +++ b/cmake/tribits/core/utils/TribitsCreateReverseList.cmake @@ -0,0 +1,52 @@ +# @HEADER +# ************************************************************************ +# +# TriBITS: Tribal Build, Integrate, and Test System +# Copyright 2013 Sandia Corporation +# +# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +# the U.S. Government retains certain rights in this software. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# 3. Neither the name of the Corporation nor the names of the +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# ************************************************************************ +# @HEADER + + +# @MACRO: tribits_create_reverse_list() +# +# Create a reverse list var in one shot. +# +# Usage:: +# +# tribits_create_reverse_list( ) +# +macro(tribits_create_reverse_list oldListName newListName) + set(${newListName} ${${oldListName}}) + list(REVERSE ${newListName}) +endmacro() diff --git a/cmake/tribits/core/utils/TribitsDeprecatedHelpers.cmake b/cmake/tribits/core/utils/TribitsDeprecatedHelpers.cmake new file mode 100644 index 000000000000..4dec816bf8e1 --- /dev/null +++ b/cmake/tribits/core/utils/TribitsDeprecatedHelpers.cmake @@ -0,0 +1,115 @@ +# @HEADER +# ************************************************************************ +# +# TriBITS: Tribal Build, Integrate, and Test System +# Copyright 2013 Sandia Corporation +# +# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +# the U.S. Government retains certain rights in this software. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# 3. Neither the name of the Corporation nor the names of the +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# ************************************************************************ +# @HEADER + +include(MessageWrapper) +include(TribitsParseArgumentsHelpers) + + +set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_CALL_MESSAGE + DEPRECATION AUTHOR_WARNING SEND_ERROR FATAL_ERROR + ) +set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_DONT_CALL_MESSAGE + IGNORE + ) +set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_ALL_VALID_VALUES + ${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_CALL_MESSAGE} + ${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_CALL_MESSAGE} + ) + + +# @FUNCTION: tribits_deprecated() +# +# Notify the user that some TriBITS functionality is deprecated. Depending on +# the value of TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE, this can do one of +# several things: +# +# - ``DEPRECATION`` or empty string: issue a CMake ``DEPRECATION`` message and +# continue. +# - ``AUTHOR_WARNING``: issue a CMake ``AUTHOR_WARNING`` message and continue. +# - ``SEND_ERROR``: issue a CMake ``SEND_ERROR`` message and continue. +# - ``FATAL_ERROR``: issue a CMake ``FATAL_ERROR`` message and exit. +# - ``IGNORE``: issue no message and continue. +# +# Usage:: +# +# tribits_deprecated() +# +function(tribits_deprecated) + cmake_parse_arguments(PARSE_ARGV 0 FWD "" "" "") + + if ("${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}" STREQUAL "") + set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE DEPRECATION) + endif() + + if ("${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}" IN_LIST TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_CALL_MESSAGE) + message_wrapper("${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}" ${FWD_UNPARSED_ARGUMENTS}) + elseif (NOT "${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}" IN_LIST TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_ALL_VALID_VALUES) + message_wrapper(FATAL_ERROR "Invalid value for TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE: '${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}'") + endif() +endfunction() + + +# @FUNCTION: tribits_deprecated_command() +# +# Notify the user that a TriBITS function or macro is deprecated. This should +# be the first command called at the top of any deprecated function or macro. +# +# Usage:: +# +# tribits_deprecated_command( +# [MESSAGE ] +# ) +# +function(tribits_deprecated_command name) + # Parse input arguments + set(argMultiValArgKeywords MESSAGE) + cmake_parse_arguments(PARSE_ARGV 1 PREFIX + "" # options + "" # one_value_keywords + "${argMultiValArgKeywords}" # multi_value_keywords + ) + tribits_check_for_unparsed_arguments(PREFIX) + + set(deprecationMessage "TriBITS command '${name}' is deprecated.") + if (NOT "${PREFIX_MESSAGE}" STREQUAL "") + string(APPEND deprecationMessage "\n\n${PREFIX_MESSAGE}") + endif() + + tribits_deprecated("${deprecationMessage}") +endfunction() diff --git a/cmake/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake b/cmake/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake index c6135cb88c70..837ddf05e5f8 100644 --- a/cmake/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake +++ b/cmake/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake @@ -249,8 +249,8 @@ macro(tribits_setup_packages) # Second, the extra repos do not even exist in the "driver" source # tree. - set(${PROJECT_NAME}_ASSERT_MISSING_PACKAGES FALSE) - set(${PROJECT_NAME}_OUTPUT_DEPENDENCY_FILES FALSE) + set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES OFF) + set(${PROJECT_NAME}_OUTPUT_DEPENDENCY_FILES FALSE) if (CTEST_GENERATE_OUTER_DEPS_XML_OUTPUT_FILE) set(${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE "${PROJECT_BINARY_DIR}/${${PROJECT_NAME}_PACKAGE_DEPS_XML_FILE_NAME}") diff --git a/cmake/tribits/doc/build_ref/TribitsBuildReferenceBody.rst b/cmake/tribits/doc/build_ref/TribitsBuildReferenceBody.rst index 9abf82ed5cd2..f71863a55821 100644 --- a/cmake/tribits/doc/build_ref/TribitsBuildReferenceBody.rst +++ b/cmake/tribits/doc/build_ref/TribitsBuildReferenceBody.rst @@ -427,18 +427,12 @@ To find this output, look for the line:: and the dependencies are listed below this for each package in the form:: - -- _LIB_REQUIRED_DEP_TPLS: ... - -- _LIB_OPTIONAL_DEP_TPLS: ... - -- _LIB_REQUIRED_DEP_PACKAGES: <[PKG1> ... - -- _LIB_OPTIONAL_DEP_PACKAGES: ... - -- _TEST_REQUIRED_DEP_TPLS: ... - -- _TEST_OPTIONAL_DEP_TPLS: ... - -- _TEST_REQUIRED_DEP_PACKAGES: <[PKG5> ... - -- _TEST_OPTIONAL_DEP_PACKAGES: ... - + -- _LIB_DEFINED_DEPENDENCIES: [O] <[PKG1>[R] ... + -- _TEST_DEFINED_DEPENDENCIES: [R] <[PKG8>[R] ... + (Dependencies that don't exist are left out of the output. For example, if -there are no ``_LIB_OPTIONAL_DEP_PACKAGES`` dependencies, then that line -is not printed.) +there are no extra test dependencies, then ``_TEST_DEFINED_DEPENDENCIES`` +will not be printed.) To also see the direct forward/downstream dependencies for each package, also include:: @@ -459,8 +453,8 @@ Enable a set of packages .. __ENABLE_TESTS: -To enable an package ```` (and optionally also its tests -and examples), configure with:: +To enable a package ```` (and optionally also its tests and +examples), configure with:: -D _ENABLE_=ON \ -D _ENABLE_ALL_OPTIONAL_PACKAGES=ON \ @@ -471,15 +465,19 @@ as all packages that ```` can use. All of the package's optional "can use" upstream dependent packages are enabled with ``-D_ENABLE_ALL_OPTIONAL_PACKAGES=ON``. However, ``-D_ENABLE_TESTS=ON`` will only enable tests and examples for -```` (or any other packages specifically enabled). +```` (and any other packages explicitly enabled). -If a TriBITS package ```` has subpackages (e.g. ````, -````, etc.), then enabling the package is equivalent to setting:: +If a TriBITS package ```` has subpackages (e.g. subpackages +````, ````, ...), then enabling the package is equivalent to enabling +all of the required **and optional** subpackagses:: -D _ENABLE_=ON \ -D _ENABLE_=ON \ ... +(In this case, the parent package's optional subpackages are enabled +regardless the value of ``_ENABLE_ALL_OPTIONAL_PACKAGES``.) + However, a TriBITS subpackage will only be enabled if it is not already disabled either explicitly or implicitly. @@ -494,9 +492,6 @@ statement in an input ```*.cmake`` options files. However, setting ``-DXXX_ENABLE_YYY=TRUE`` and ``-DXXX_ENABLE_YYY=FALSE`` is allowed and will be interpreted correctly.. -NOTE: Setting ``_ENABLE_TESTS=ON`` also causes -``_ENABLE_EXAMPLES=ON`` to be set by default as well. - Enable or disable tests for specific packages +++++++++++++++++++++++++++++++++++++++++++++ @@ -517,7 +512,8 @@ packages. If one wants to enable a package along with the enable of other packages, but not the test suite for that package, then one can use a "exclude-list" -appraoch to disable the tests for that package by configuring with:: +appraoch to disable the tests for that package by configuring with, for +example:: -D _ENABLE_=ON \ -D _ENABLE_=ON \ @@ -527,12 +523,12 @@ appraoch to disable the tests for that package by configuring with:: The above will enable the package test suites for ```` and ```` but **not** for ```` (or any other -packages that might get implicitly enabled). One might use this if one wants -to build and install package ```` but does not want to -build and run the test suite for that package. +packages that might get implicitly enabled). One might use this approch if +one wants to build and install package ```` but does not +want to build and run the test suite for that package. Alternatively, one can use an "include-list" appraoch to enable packages and -only enable tests for specific packages. For example, configuring with:: +only enable tests for specific packages, for example, configuring with:: -D _ENABLE_=ON \ -D _ENABLE_TESTS=ON \ @@ -558,7 +554,7 @@ Enable to test all effects of changing a given package(s) .. __ENABLE_ALL_FORWARD_DEP_PACKAGES: -To enable an package ```` to test it and all of its +To enable a package ```` to test it and all of its down-stream packages, configure with:: -D _ENABLE_=ON \ @@ -568,8 +564,9 @@ down-stream packages, configure with:: The above set of arguments will result in package ```` and all packages that depend on ```` to be enabled and have all of their tests turned on. Tests will not be enabled in packages that do not -depend on ```` in this case. This speeds up and robustifies -pre-push testing. +depend (at least implicitly) on ```` in this case. This +speeds up and robustifies testing for changes in specific packages (like in +per-merge testing in a continuous integration process). NOTE: setting ``_ENABLE_ALL_FORWARD_DEP_PACKAGES=ON`` also automatically sets and overrides `_ENABLE_ALL_OPTIONAL_PACKAGES`_ to @@ -580,7 +577,7 @@ packages for testing purposes unless you are enabling all optional packages.) Enable all packages (and optionally all tests) ++++++++++++++++++++++++++++++++++++++++++++++ -To enable all defined packages and subpackages add the configure option:: +To enable all defined packages, add the configure option:: -D _ENABLE_ALL_PACKAGES=ON \ @@ -589,13 +586,12 @@ packages, add the configure option:: -D _ENABLE_TESTS=ON \ -Specific packages can be disabled (i.e. "black-listed") by adding +Specific packages can be disabled (i.e. "exclude-listed") by adding ``_ENABLE_=OFF``. This will also disable all packages that depend on ````. Note, all examples are also enabled by default when setting -``_ENABLE_TESTS=ON`` (and so examples are considered a subset of the -tests). +``_ENABLE_TESTS=ON``. By default, setting ``_ENABLE_ALL_PACKAGES=ON`` only enables primary tested (PT) packages and code. To have this also enable all secondary tested @@ -613,50 +609,58 @@ details. Disable a package and all its dependencies ++++++++++++++++++++++++++++++++++++++++++ -To disable an package and all of the packages that depend on it, add the -configure options:: +To disable a package and all of the packages that depend on it, add the +configure option:: -D _ENABLE_=OFF For example:: - -D _ENABLE_=ON \ + -D _ENABLE_=ON \ -D _ENABLE_ALL_OPTIONAL_PACKAGES=ON \ - -D _ENABLE_=ON \ + -D _ENABLE_=OFF \ -will enable ```` and all of the packages that it depends on except -for ```` and all of its forward dependencies. +will enable ```` and all of the packages that it depends on +except for ```` and all of its forward dependencies. -If a TriBITS package ```` has subpackages (e.g. ````, -````, etc.), then disabling the package is equivalent to setting:: +If a TriBITS package ```` has subpackages (e.g. a parent +package with subpackages ````, ````, ...), then disabling the parent +package is equivalent to disabling all of the required and optional +subpackages:: -D _ENABLE_=OFF \ -D _ENABLE_=OFF \ ... -The disable of the subpackage is this case will override any enables. +The disable of the subpackages in this case will override any enables. + +.. __DISABLE_ENABLED_FORWARD_DEP_PACKAGES: If a disabled package is a required dependency of some explicitly enabled -downstream package, then the configure will error out if -``_DISABLE_ENABLED_FORWARD_DEP_PACKAGES=OFF``. Otherwise, a WARNING -will be printed and the downstream package will be disabled and configuration -will continue. +downstream package, then the configure will error out if:: + + -D _DISABLE_ENABLED_FORWARD_DEP_PACKAGES=OFF \ + +is set. Otherwise, if ``_DISABLE_ENABLED_FORWARD_DEP_PACKAGES=ON``, +a ``NOTE`` will be printed and the downstream package will be disabled and +configuration will continue. Remove all package enables in the cache +++++++++++++++++++++++++++++++++++++++ To wipe the set of package enables in the ``CMakeCache.txt`` file so they can -be reset again from scratch, configure with:: +be reset again from scratch, re-configure with:: - $ ./-do-confiugre -D _UNENABLE_ENABLED_PACKAGES=TRUE + $ cmake -D _UNENABLE_ENABLED_PACKAGES=TRUE . This option will set to empty '' all package enables, leaving all other cache variables as they are. You can then reconfigure with a new set of package enables for a different set of packages. This allows you to avoid more -expensive configure time checks and to preserve other cache variables that you -have set and don't want to loose. For example, one would want to do this to -avoid compiler and TPL checks. +expensive configure time checks (like the standard CMake compiler checks) and +to preserve other cache variables that you have set and don't want to loose. +For example, one would want to do this to avoid more expensive compiler and +TPL checks. Selecting compiler and linker options @@ -1595,27 +1599,70 @@ NOTE: Newer versions of CMake may automatically determine when these options need to be turned on so watch for that in looking at the build lines. +External Packages/Third-Party Library (TPL) support +--------------------------------------------------- + +A set of external packages/third-party libraries (TPL) can be enabled and +disabled and the locations of those can be specified at configure time (if +they are not found in the default path). + + Enabling support for an optional Third-Party Library (TPL) ----------------------------------------------------------- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -To enable a given TPL, set:: +To enable a given external packages/TPL, set:: -D TPL_ENABLE_=ON where ```` = ``BLAS``, ``LAPACK`` ``Boost``, ``Netcdf``, etc. +(Requires TPLs for enabled package will automatically be enabled.) The full list of TPLs that is defined and can be enabled is shown by doing a configure with CMake and then grepping the configure output for ``Final set of -.* TPLs``. The set of TPL names listed in ``'Final set of enabled external packages/TPLs'`` and -``'Final set of non-enabled external packages/TPLs'`` gives the full list of TPLs that can be -enabled (or disabled). +.* TPLs``. The set of TPL names listed in ``'Final set of enabled external +packages/TPLs'`` and ``'Final set of non-enabled external packages/TPLs'`` +gives the full list of TPLs that can be enabled (or disabled). + +Optional package-specific support for a TPL can be turned off by setting:: + + -D _ENABLE_=OFF + +This gives the user full control over what TPLs are supported by which package +independent of whether the TPL is enabled or not. + +Support for an optional TPL can also be turned on implicitly by setting:: + + -D _ENABLE_=ON + +where ```` is a TriBITS package that has an optional +dependency on ````. That will result in setting +``TPL_ENABLE_=ON`` internally (but not set in the cache) if +``TPL_ENABLE_=OFF`` is not already set. + + +Specifying the location of the parts of an enabled external package/TPL ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +Once an external package/TPL is enabled, the parts of that TPL must be found. +For many external packages/TPLs, this will be done automatically by searching +the environment paths. + +Some external packages/TPLs are specified with a call to +``find_package()`` (see CMake documentation for +``find_package()``). Many other external packages/TPLs use a legacy TriBITS +system that locates the parts using the CMake commands ``find_file()`` and +``find_library()`` as described below. + +Every defined external package/TPL uses a specification provided in a +``FindTPL.cmake`` module file. This file describes how the package +is found in a way that provides modern CMake IMPORTED targets (including the +``::all_libs`` target) that is used by the downstream packages. Some TPLs require only libraries (e.g. Fortran libraries like BLAS or LAPACK), some TPL require only include directories, and some TPLs require both. -Each TPL specification is defined in a ``FindTPL.cmake`` module file. -The job of each of these of these module files is to set the CMake cache -variables: +For ``FindTPL.cmake`` files using the legacy TriBITS TPL system, a +TPL is fully specified through the following cache variables: * ``TPL__INCLUDE_DIRS:PATH``: List of paths to header files for the TPL (if the TPL supplies header files). @@ -1623,8 +1670,8 @@ variables: * ``TPL__LIBRARIES:PATH``: List of (absolute) paths to libraries, ordered as they will be on the link line (of the TPL supplies libraries). -These variables are the only variables that are actually used in the CMake -build system. Therefore, one can set these two variables as CMake cache +These variables are the only variables are used to create IMPORTED CMake +targets for the TPL. One can set these two variables as CMake cache variables, for ``SomeTPL`` for example, with:: -D TPL_SomeTPL_INCLUDE_DIRS="${LIB_BASE}/include/a;${LIB_BASE}/include/b" \ @@ -1634,7 +1681,7 @@ Using this approach, one can be guaranteed that these libraries and these include directories and will used in the compile and link lines for the packages that depend on this TPL ``SomeTPL``. -**WARNING:** When specifying ``TPL__INCLUDE_DIRS`` and/or +**NOTE:** When specifying ``TPL__INCLUDE_DIRS`` and/or ``TPL__LIBRARIES``, the build system will use these without question. It will **not** check for the existence of these directories or files so make sure that these files and directories exist before these are used in the @@ -1642,29 +1689,31 @@ compiles and links. (This can actually be a feature in rare cases the libraries and header files don't actually get created until after the configure step is complete but before the build step.) -**WARNING:** It is **not recommended** to specify the TPLs libraries as just a set -of link options as, for example:: +**NOTE:** It is generally *not recommended* to specify the TPLs libraries as +just a set of link options as, for example:: TPL_SomeTPL_LIBRARIES="-L/some/dir;-llib1;-llib2;..." -This is not compatible with proper CMake usage and it not guaranteed to be -supported for all use cases or all platforms. (CMake really wants to have -full library paths when linking.) +But this is supported as long as this link line contains only link library +directories and library names. (Link options that are not order-sensitive are +also supported like ``-mkl``.) When the variables ``TPL__INCLUDE_DIRS`` and ``TPL__LIBRARIES`` are not specified, then most ``FindTPL.cmake`` modules use a default find operation. Some will -call ``find_package()`` internally by default and some may implement -the default find in some other way. To know for sure, see the documentation -for the specific TPL (e.g. looking in the ``FindTPL.cmake`` file to -be sure). NOTE: if a given ``FindTPL.cmake`` would use -``find_package()`` by default, this can be disabled by configuring -with:: +call ``find_package()`` internally by default and some may +implement the default find in some other way. To know for sure, see the +documentation for the specific external package/TPL (e.g. looking in the +``FindTPL.cmake`` file to be sure). NOTE: if a given +``FindTPL.cmake`` will use ``find_package()`` by +default, this can be disabled by configuring with:: -D_ALLOW_PACKAGE_PREFIND=OFF -Most TPLs, however, use a standard system for finding include directories -and/or libraries based on the function +(Not all ``FindTPL.cmake`` files support this option.) + +Many ``FindTPL.cmake`` files, use the legacy TriBITS TPL system for +finding include directories and/or libraries based on the function `tribits_tpl_find_include_dirs_and_libraries()`_. These simple standard ``FindTPL.cmake`` modules specify a set of header files and/or libraries that must be found. The directories where these header files and @@ -1684,9 +1733,9 @@ library files are looked for are specified using the CMake cache variables: files will be searched for using ``find_library()``, for each library, in order. -Most ``FindTPL.cmake`` modules will define a default set of libraries -to look for and therefore ``_LIBRARY_NAMES`` can typically be left -off. +Most of these ``FindTPL.cmake`` modules will define a default set of +libraries to look for and therefore ``_LIBRARY_NAMES`` can typically +be left off. Therefore, to find the same set of libraries for ``SimpleTPL`` shown above, one would specify:: @@ -1698,30 +1747,14 @@ override that using:: -D SomeTPL_LIBRARY_NAMES="lib1;lib2" -Therefore, this is in fact the preferred way to specify the libraries for a -TPL. +Therefore, this is in fact the preferred way to specify the libraries for +these legacy TriBITS TPLs. In order to allow a TPL that normally requires one or more libraries to ignore the libraries, one can set ``_LIBRARY_NAMES`` to empty, for example:: -D _LIBRARY_NAMES="" -Optional package-specific support for a TPL can be turned off by setting:: - - -D _ENABLE_=OFF - -This gives the user full control over what TPLs are supported by which package -independent of whether the TPL is enabled or not. - -Support for an optional TPL can also be turned on implicitly by setting:: - - -D _ENABLE_=ON - -where ```` is a TriBITS package that has an optional -dependency on ````. That will result in setting -``TPL_ENABLE_=ON`` internally (but not set in the cache) if -``TPL_ENABLE_=OFF`` is not already set. - If all the parts of a TPL are not found on an initial configure, the configure will error out with a helpful error message. In that case, one can change the variables ``_INCLUDE_DIRS``, ``_LIBRARY_NAMES``, and/or @@ -1731,14 +1764,6 @@ a complete configure from scratch which saves time. Or, one can avoid the find operations by directly setting ``TPL__INCLUDE_DIRS`` and ``TPL__LIBRARIES`` as described above. -**WARNING:** The cmake cache variable ``TPL__LIBRARY_DIRS`` does -**not** control where libraries are found. Instead, this variable is set -during the find processes and is not actually used in the CMake build system -at all. - -In summary, this gives the user complete and direct control in specifying -exactly what is used in the build process. - **TPL Example 1: Standard BLAS Library** Suppose one wants to find the standard BLAS library ``blas`` in the @@ -1842,7 +1867,7 @@ libraries in the right order by configuring with:: Adjusting upstream dependencies for a Third-Party Library (TPL) ---------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Some TPLs have dependencies on one or more upstream TPLs. These dependencies must be specified correctly for the compile and links to work correctly. The @@ -1857,34 +1882,38 @@ the upstream TPLs are enabled), set:: A dependency on an upstream TPL ```` will be set if the an upstream TPL ```` is actually enabled. -If any of the specified TPLs are listed after ```` in the -``TPLsList.cmake`` file or are not enabled, then a configure-time error will -occur. +If any of the specified dependent TPLs ```` are listed after +```` in the ``TPLsList.cmake`` file (or are not listed at all), then +a configure-time error will occur. To take complete control over what dependencies an TPL has, set:: -D _LIB_ENABLED_DEPENDENCIES=";;..." If the upstream TPLs listed here are not defined upstream and enabled TPLs, -then an error will occur. +then a configure-time error will occur. Disabling support for a Third-Party Library (TPL) --------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++ Disabling a TPL explicitly can be done using:: -D TPL_ENABLE_=OFF +This will result in the disabling of any direct or indirect downstream +packages that have a required dependency on ```` as described in +`Disable a package and all its dependencies`_. + NOTE: If a disabled TPL is a required dependency of some explicitly enabled downstream package, then the configure will error out if -_DISABLE_ENABLED_FORWARD_DEP_PACKAGES=OFF. Otherwise, a WARNING will -be printed and the downstream package will be disabled and configuration will -continue. +`_DISABLE_ENABLED_FORWARD_DEP_PACKAGES`_ ``= OFF``. Otherwise, a +NOTE will be printed and the downstream package will be disabled and +configuration will continue. Disabling tentatively enabled TPLs ----------------------------------- +++++++++++++++++++++++++++++++++++ To disable a tentatively enabled TPL, set:: @@ -1908,7 +1937,7 @@ also want to explicitly disable the TPL as shown above. Require all TPL libraries be found ----------------------------------- +++++++++++++++++++++++++++++++++++ By default, some TPLs don't require that all of the libraries listed in ``_LIBRARY_NAMES`` be found. To change this behavior so that all @@ -1920,7 +1949,7 @@ This makes the configure process catch more mistakes with the env. Disable warnings from TPL header files --------------------------------------- +++++++++++++++++++++++++++++++++++++++ To disable warnings coming from included TPL header files for C and C++ code, set:: @@ -1939,9 +1968,8 @@ project is pulling in module files from TPLs. xSDK Configuration Options -------------------------- -The configure of will adhere to the xSDK configuration standard -(todo: put in reference to final document) simply by setting the CMake cache -variable:: +The configure of will adhere to the `xSDK Community Package +Policies`_ simply by setting the CMake cache variable:: -D USE_XSDK_DEFAULTS=TRUE @@ -2887,13 +2915,19 @@ package directories. In development mode, the failure to find a package directory is usually a programming error (i.e. a miss-spelled package directory name). But in a tarball release of the project, package directories may be purposefully missing (see `Creating a tarball of the source tree`_) and -must be ignored. When building from a reduced source tarball created from the +must be ignored. + +When building from a reduced source tarball created from the development sources, set:: - -D _ASSERT_MISSING_PACKAGES=OFF + -D _ASSERT_DEFINED_DEPENDENCIES=OFF + +or to ``IGNORE``. (valid values include ``FATAL_ERROR``, ``SEND_ERROR``, +``WARNING``, ``NOTICE``, ``IGNORE`` and ``OFF``) Setting this ``OFF`` will cause the TriBITS CMake configure to simply ignore -any missing packages and turn off all dependencies on these missing packages. +any undefined packages and turn off all dependencies on these missing +packages. Another type of checking is for optional inserted/external packages (e.g. packages who's source can optionally be included and is flagged with @@ -2904,27 +2938,29 @@ printed by configuring with:: -D _WARN_ABOUT_MISSING_EXTERNAL_PACKAGES=TRUE -These warnings (starting with 'NOTE', not 'WARNING' that would otherwise -trigger warnings in CDash) about missing inserted/external packages will print -regardless of the setting for ``_ASSERT_MISSING_PACKAGES``. +These warnings starting with 'NOTE' (not starting with 'WARNING' that would +otherwise trigger warnings in CDash) about missing inserted/external packages +will print regardless of the setting for +``_ASSERT_DEFINED_DEPENDENCIES``. Finally, ``_ENABLE_DEVELOPMENT_MODE=ON`` results in a number of checks for invalid usage of TriBITS in the project's ``CMakeLists.txt`` files -and will abort configure with a fatal error on the first check failure. This -is appropriate for development mode when a project is clean of all such -invalid usage patterns but there are times when it makes sense to report these -check failures in different ways (such as when upgrading TriBITS in a project -that has some invalid usage patterns that just happen work but may be +and will, by default, abort configure with a fatal error on the first failed +check. This is appropriate for development mode when a project is clean of all +such invalid usage patterns but there are times when it makes sense to report +these check failures in different ways (such as when upgrading TriBITS in a +project that has some invalid usage patterns that just happen work but may be disallowed in future versions of TriBITS). To change how these invalid usage checks are handled, set:: -D _ASSERT_CORRECT_TRIBITS_USAGE= -where ```` can be 'FATAL_ERROR', 'SEND_ERROR', 'WARNING', or -'IGNORE'. +where ```` can be ``FATAL_ERROR``, ``SEND_ERROR``, ``WARNING``, +``IGNORE`` or ``OFF`` (where ``IGNORE`` or ``OFF`` avoids any error reporting +or warnings). For ``_ENABLE_DEVELOPMENT_MODE=OFF``, the default for -``_ASSERT_CORRECT_TRIBITS_USAGE`` is actually set to ``IGNORE``. +``_ASSERT_CORRECT_TRIBITS_USAGE`` is set to ``IGNORE``. Building (Makefile generator) @@ -4048,10 +4084,10 @@ generators on your system). NOTE: When configuring from an untarred source tree that has missing packages, one must configure with:: - -D _ASSERT_MISSING_PACKAGES=OFF + -D _ASSERT_DEFINED_DEPENDENCIES=OFF Otherwise, TriBITS will error out complaining about missing packages. (Note -that ``_ASSERT_MISSING_PACKAGES`` will default to ```OFF``` in +that ``_ASSERT_DEFINED_DEPENDENCIES`` will default to ```OFF``` in release mode, i.e. ``_ENABLE_DEVELOPMENT_MODE==OFF``.) @@ -4302,4 +4338,6 @@ dashboard``. .. _TriBITS TribitsExampleApp Tests: https://github.com/TriBITSPub/TriBITS/blob/master/test/core/ExamplesUnitTests/TribitsExampleApp_Tests.cmake +.. _xSDK Community Package Policies: https://doi.org/10.6084/m9.figshare.4495136 + .. LocalWords: templated instantiation Makefiles CMake diff --git a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableAllPackages.txt b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableAllPackages.txt index 07c2c9d87e59..da111da02420 100644 --- a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableAllPackages.txt +++ b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableAllPackages.txt @@ -8,10 +8,13 @@ Enabling all packages that are not currently disabled because of \ -- Setting Trilinos_ENABLE_ThyraEpetra=ON -- Setting Trilinos_ENABLE_Thyra=ON -Enabling all remaining required TPLs for current set of enabled packages ... +Enabling all required (and optional since Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES=ON) upstream packages for current set of enabled packages +(Trilinos_ENABLE_SECONDARY_TESTED_CODE=OFF) ... --- Setting TPL_ENABLE_BLAS=ON because it is required by the enabled package Teuchos --- Setting TPL_ENABLE_LAPACK=ON because it is required by the enabled package Teuchos +-- NOTE: Not Setting Trilinos_ENABLE_ThyraGoodStuff=ON even though Thyra has an optional dependence on ThyraGoodStuff because Trilinos_ENABLE_SECONDARY_TESTED_CODE=OFF +-- NOTE: Not Setting Trilinos_ENABLE_ThyraEpetraExt=ON even though Thyra has an optional dependence on ThyraEpetraExt because Trilinos_ENABLE_SECONDARY_TESTED_CODE=OFF +-- Setting TPL_ENABLE_BLAS=ON because Epetra has a required dependence on BLAS +-- Setting TPL_ENABLE_LAPACK=ON because Epetra has a required dependence on LAPACK Final set of enabled top-level packages: Teuchos RTOp Epetra Thyra 4 Final set of enabled packages: Teuchos RTOp Epetra ThyraCoreLibs ThyraEpetra Thyra 6 diff --git a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyraEpetra_EnableTests.txt b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyraEpetra_EnableTests.txt index 9ad431f62a25..0d3f79b5ccd8 100644 --- a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyraEpetra_EnableTests.txt +++ b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyraEpetra_EnableTests.txt @@ -21,11 +21,8 @@ Enabling all required (and optional since Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES= -- Setting Trilinos_ENABLE_ThyraCoreLibs=ON because ThyraEpetra has a required dependence on ThyraCoreLibs -- Setting Trilinos_ENABLE_Teuchos=ON because ThyraCoreLibs has a required dependence on Teuchos -- Setting Trilinos_ENABLE_RTOp=ON because ThyraCoreLibs has a required dependence on RTOp - -Enabling all remaining required TPLs for current set of enabled packages ... - --- Setting TPL_ENABLE_BLAS=ON because it is required by the enabled package Teuchos --- Setting TPL_ENABLE_LAPACK=ON because it is required by the enabled package Teuchos +-- Setting TPL_ENABLE_BLAS=ON because Epetra has a required dependence on BLAS +-- Setting TPL_ENABLE_LAPACK=ON because Epetra has a required dependence on LAPACK Enabling the shell of non-enabled parent packages (mostly for show) that have at least one subpackage enabled ... diff --git a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests.txt b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests.txt index 46e1cdc7ae5c..c66d07690338 100644 --- a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests.txt +++ b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests.txt @@ -40,17 +40,14 @@ Enabling all required (and optional since Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES= -- Setting Trilinos_ENABLE_Epetra=ON because ThyraEpetra has a required dependence on Epetra -- Setting Trilinos_ENABLE_Teuchos=ON because ThyraCoreLibs has a required dependence on Teuchos -- Setting Trilinos_ENABLE_RTOp=ON because ThyraCoreLibs has a required dependence on RTOp +-- Setting TPL_ENABLE_BLAS=ON because Epetra has a required dependence on BLAS +-- Setting TPL_ENABLE_LAPACK=ON because Epetra has a required dependence on LAPACK Enabling all optional intra-package enables _ENABLE_ that are not currently disabled if both sets of packages are enabled ... -- Setting Thyra_ENABLE_ThyraEpetra=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraEpetra=ON -Enabling all remaining required TPLs for current set of enabled packages ... - --- Setting TPL_ENABLE_BLAS=ON because it is required by the enabled package Teuchos --- Setting TPL_ENABLE_LAPACK=ON because it is required by the enabled package Teuchos - Final set of enabled top-level packages: Teuchos RTOp Epetra Thyra 4 Final set of enabled packages: Teuchos RTOp Epetra ThyraCoreLibs ThyraEpetra Thyra 6 Final set of non-enabled top-level packages: Triutils EpetraExt 2 diff --git a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST.txt b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST.txt index 00efe417fd24..3aa2f7a337f0 100644 --- a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST.txt +++ b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST.txt @@ -40,27 +40,38 @@ Enabling all required (and optional since Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES= -- Setting Trilinos_ENABLE_Teuchos=ON because ThyraCoreLibs has a required dependence on Teuchos -- Setting Trilinos_ENABLE_RTOp=ON because ThyraCoreLibs has a required dependence on RTOp -- Setting Trilinos_ENABLE_Triutils=ON because EpetraExt has an optional dependence on Triutils +-- Setting TPL_ENABLE_BLAS=ON because Epetra has a required dependence on BLAS +-- Setting TPL_ENABLE_LAPACK=ON because Epetra has a required dependence on LAPACK Enabling all optional intra-package enables _ENABLE_ that are \ not currently disabled if both sets of packages are enabled ... --- Setting EpetraExt_ENABLE_Triutils=ON since Trilinos_ENABLE_EpetraExt=ON \ - AND Trilinos_ENABLE_Triutils=ON --- Setting Thyra_ENABLE_ThyraGoodStuff=ON since Trilinos_ENABLE_Thyra=ON \ - AND Trilinos_ENABLE_ThyraGoodStuff=ON --- Setting Thyra_ENABLE_ThyraEpetra=ON since Trilinos_ENABLE_Thyra=ON \ - AND Trilinos_ENABLE_ThyraEpetra=ON --- Setting Thyra_ENABLE_ThyraEpetraExt=ON since Trilinos_ENABLE_Thyra=ON \ - AND Trilinos_ENABLE_ThyraEpetraExt=ON - -Enabling all remaining required TPLs for current set of enabled packages ... - --- Setting TPL_ENABLE_BLAS=ON because it is required by the enabled package Teuchos --- Setting TPL_ENABLE_LAPACK=ON because it is required by the enabled package Teuchos - -Enabling all optional package TPL support _ENABLE_ not currently disabled for enabled TPLs ... - --- Setting Teuchos_ENABLE_Boost=ON since TPL_ENABLE_Boost=ON +-- Setting Teuchos_ENABLE_BLAS=ON since Trilinos_ENABLE_Teuchos=ON AND TPL_ENABLE_BLAS=ON +-- Setting Teuchos_ENABLE_LAPACK=ON since Trilinos_ENABLE_Teuchos=ON AND TPL_ENABLE_LAPACK=ON +-- Setting Teuchos_ENABLE_Boost=ON since Trilinos_ENABLE_Teuchos=ON AND TPL_ENABLE_Boost=ON +-- NOT setting Teuchos_ENABLE_MPI=ON since MPI is NOT enabled at this point! +-- Setting RTOp_ENABLE_Teuchos=ON since Trilinos_ENABLE_RTOp=ON AND Trilinos_ENABLE_Teuchos=ON +-- Setting Epetra_ENABLE_BLAS=ON since Trilinos_ENABLE_Epetra=ON AND TPL_ENABLE_BLAS=ON +-- Setting Epetra_ENABLE_LAPACK=ON since Trilinos_ENABLE_Epetra=ON AND TPL_ENABLE_LAPACK=ON +-- NOT setting Epetra_ENABLE_MPI=ON since MPI is NOT enabled at this point! +-- Setting Triutils_ENABLE_Epetra=ON since Trilinos_ENABLE_Triutils=ON AND Trilinos_ENABLE_Epetra=ON +-- Setting EpetraExt_ENABLE_Teuchos=ON since Trilinos_ENABLE_EpetraExt=ON AND Trilinos_ENABLE_Teuchos=ON +-- Setting EpetraExt_ENABLE_Epetra=ON since Trilinos_ENABLE_EpetraExt=ON AND Trilinos_ENABLE_Epetra=ON +-- Setting EpetraExt_ENABLE_Triutils=ON since Trilinos_ENABLE_EpetraExt=ON AND Trilinos_ENABLE_Triutils=ON +-- NOT setting EpetraExt_ENABLE_UMFPACK=ON since UMFPACK is NOT enabled at this point! +-- NOT setting EpetraExt_ENABLE_AMD=ON since AMD is NOT enabled at this point! +-- NOT setting EpetraExt_ENABLE_PETSC=ON since PETSC is NOT enabled at this point! +-- Setting ThyraCoreLibs_ENABLE_Teuchos=ON since Trilinos_ENABLE_ThyraCoreLibs=ON AND Trilinos_ENABLE_Teuchos=ON +-- Setting ThyraCoreLibs_ENABLE_RTOp=ON since Trilinos_ENABLE_ThyraCoreLibs=ON AND Trilinos_ENABLE_RTOp=ON +-- Setting ThyraGoodStuff_ENABLE_ThyraCoreLibs=ON since Trilinos_ENABLE_ThyraGoodStuff=ON AND Trilinos_ENABLE_ThyraCoreLibs=ON +-- Setting ThyraEpetra_ENABLE_Epetra=ON since Trilinos_ENABLE_ThyraEpetra=ON AND Trilinos_ENABLE_Epetra=ON +-- Setting ThyraEpetra_ENABLE_ThyraCoreLibs=ON since Trilinos_ENABLE_ThyraEpetra=ON AND Trilinos_ENABLE_ThyraCoreLibs=ON +-- Setting ThyraEpetraExt_ENABLE_ThyraEpetra=ON since Trilinos_ENABLE_ThyraEpetraExt=ON AND Trilinos_ENABLE_ThyraEpetra=ON +-- Setting ThyraEpetraExt_ENABLE_EpetraExt=ON since Trilinos_ENABLE_ThyraEpetraExt=ON AND Trilinos_ENABLE_EpetraExt=ON +-- Setting Thyra_ENABLE_ThyraCoreLibs=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraCoreLibs=ON +-- Setting Thyra_ENABLE_ThyraGoodStuff=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraGoodStuff=ON +-- Setting Thyra_ENABLE_ThyraEpetra=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraEpetra=ON +-- Setting Thyra_ENABLE_ThyraEpetraExt=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraEpetraExt=ON Final set of enabled top-level packages: Teuchos RTOp Epetra Triutils EpetraExt Thyra 6 Final set of enabled packages: Teuchos RTOp Epetra Triutils EpetraExt ThyraCoreLibs \ diff --git a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST_RequiredOnly.txt b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST_RequiredOnly.txt index 3647d4d81d82..268535389cf3 100644 --- a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST_RequiredOnly.txt +++ b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST_RequiredOnly.txt @@ -47,25 +47,37 @@ Enabling all required upstream packages for current set of \ dependence on Teuchos -- Setting Trilinos_ENABLE_RTOp=ON because ThyraCoreLibs has a required \ dependence on RTOp +-- Setting TPL_ENABLE_BLAS=ON because Epetra has a required dependence on BLAS +-- Setting TPL_ENABLE_LAPACK=ON because Epetra has a required dependence on LAPACK Enabling all optional intra-package enables _ENABLE_ \ that are not currently disabled if both sets of packages are enabled ... --- Setting Thyra_ENABLE_ThyraGoodStuff=ON since Trilinos_ENABLE_Thyra=ON \ - AND Trilinos_ENABLE_ThyraGoodStuff=ON --- Setting Thyra_ENABLE_ThyraEpetra=ON since Trilinos_ENABLE_Thyra=ON \ - AND Trilinos_ENABLE_ThyraEpetra=ON --- Setting Thyra_ENABLE_ThyraEpetraExt=ON since Trilinos_ENABLE_Thyra=ON \ - AND Trilinos_ENABLE_ThyraEpetraExt=ON - -Enabling all remaining required TPLs for current set of enabled packages ... - --- Setting TPL_ENABLE_BLAS=ON because it is required by the enabled package Teuchos --- Setting TPL_ENABLE_LAPACK=ON because it is required by the enabled package Teuchos - -Enabling all optional package TPL support _ENABLE_ not currently disabled for enabled TPLs ... - --- Setting Teuchos_ENABLE_Boost=ON since TPL_ENABLE_Boost=ON +-- Setting Teuchos_ENABLE_BLAS=ON since Trilinos_ENABLE_Teuchos=ON AND TPL_ENABLE_BLAS=ON +-- Setting Teuchos_ENABLE_LAPACK=ON since Trilinos_ENABLE_Teuchos=ON AND TPL_ENABLE_LAPACK=ON +-- Setting Teuchos_ENABLE_Boost=ON since Trilinos_ENABLE_Teuchos=ON AND TPL_ENABLE_Boost=ON +-- NOT setting Teuchos_ENABLE_MPI=ON since MPI is NOT enabled at this point! +-- Setting RTOp_ENABLE_Teuchos=ON since Trilinos_ENABLE_RTOp=ON AND Trilinos_ENABLE_Teuchos=ON +-- Setting Epetra_ENABLE_BLAS=ON since Trilinos_ENABLE_Epetra=ON AND TPL_ENABLE_BLAS=ON +-- Setting Epetra_ENABLE_LAPACK=ON since Trilinos_ENABLE_Epetra=ON AND TPL_ENABLE_LAPACK=ON +-- NOT setting Epetra_ENABLE_MPI=ON since MPI is NOT enabled at this point! +-- Setting EpetraExt_ENABLE_Teuchos=ON since Trilinos_ENABLE_EpetraExt=ON AND Trilinos_ENABLE_Teuchos=ON +-- Setting EpetraExt_ENABLE_Epetra=ON since Trilinos_ENABLE_EpetraExt=ON AND Trilinos_ENABLE_Epetra=ON +-- NOT setting EpetraExt_ENABLE_Triutils=ON since Triutils is NOT enabled at this point! +-- NOT setting EpetraExt_ENABLE_UMFPACK=ON since UMFPACK is NOT enabled at this point! +-- NOT setting EpetraExt_ENABLE_AMD=ON since AMD is NOT enabled at this point! +-- NOT setting EpetraExt_ENABLE_PETSC=ON since PETSC is NOT enabled at this point! +-- Setting ThyraCoreLibs_ENABLE_Teuchos=ON since Trilinos_ENABLE_ThyraCoreLibs=ON AND Trilinos_ENABLE_Teuchos=ON +-- Setting ThyraCoreLibs_ENABLE_RTOp=ON since Trilinos_ENABLE_ThyraCoreLibs=ON AND Trilinos_ENABLE_RTOp=ON +-- Setting ThyraGoodStuff_ENABLE_ThyraCoreLibs=ON since Trilinos_ENABLE_ThyraGoodStuff=ON AND Trilinos_ENABLE_ThyraCoreLibs=ON +-- Setting ThyraEpetra_ENABLE_Epetra=ON since Trilinos_ENABLE_ThyraEpetra=ON AND Trilinos_ENABLE_Epetra=ON +-- Setting ThyraEpetra_ENABLE_ThyraCoreLibs=ON since Trilinos_ENABLE_ThyraEpetra=ON AND Trilinos_ENABLE_ThyraCoreLibs=ON +-- Setting ThyraEpetraExt_ENABLE_ThyraEpetra=ON since Trilinos_ENABLE_ThyraEpetraExt=ON AND Trilinos_ENABLE_ThyraEpetra=ON +-- Setting ThyraEpetraExt_ENABLE_EpetraExt=ON since Trilinos_ENABLE_ThyraEpetraExt=ON AND Trilinos_ENABLE_EpetraExt=ON +-- Setting Thyra_ENABLE_ThyraCoreLibs=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraCoreLibs=ON +-- Setting Thyra_ENABLE_ThyraGoodStuff=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraGoodStuff=ON +-- Setting Thyra_ENABLE_ThyraEpetra=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraEpetra=ON +-- Setting Thyra_ENABLE_ThyraEpetraExt=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraEpetraExt=ON Final set of enabled top-level packages: Teuchos RTOp Epetra EpetraExt Thyra 5 Final set of enabled packages: Teuchos RTOp Epetra EpetraExt ThyraCoreLibs ThyraGoodStuff ThyraEpetra ThyraEpetraExt Thyra 9 diff --git a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/ExpectedDependencies.txt b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/ExpectedDependencies.txt index 3d636a3b981a..51dbaaa44879 100644 --- a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/ExpectedDependencies.txt +++ b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/ExpectedDependencies.txt @@ -15,73 +15,96 @@ Package dependencies information: -- Trilinos_DEFINED_PACKAGES: MPI BLAS LAPACK Boost UMFPACK AMD PETSC Teuchos RTOp Epetra Triutils EpetraExt ThyraCoreLibs ThyraGoodStuff ThyraCrazyStuff ThyraEpetra ThyraEpetraExt Thyra -- Trilinos_NUM_DEFINED_PACKAGES='18' --- Teuchos_LIB_REQUIRED_DEP_TPLS: BLAS LAPACK --- Teuchos_LIB_OPTIONAL_DEP_TPLS: Boost MPI +-- MPI_FORWARD_LIB_DEFINED_DEPENDENCIES: Teuchos[O] Epetra[O] --- RTOp_LIB_REQUIRED_DEP_PACKAGES: Teuchos +-- BLAS_FORWARD_LIB_DEFINED_DEPENDENCIES: LAPACK[R] Teuchos[R] Epetra[R] --- Epetra_LIB_REQUIRED_DEP_TPLS: BLAS LAPACK --- Epetra_LIB_OPTIONAL_DEP_TPLS: MPI +-- LAPACK_LIB_DEFINED_DEPENDENCIES: BLAS[R] +-- LAPACK_FORWARD_LIB_DEFINED_DEPENDENCIES: Teuchos[R] Epetra[R] --- Triutils_LIB_REQUIRED_DEP_PACKAGES: Epetra +-- Boost_FORWARD_LIB_DEFINED_DEPENDENCIES: Teuchos[O] --- EpetraExt_LIB_REQUIRED_DEP_PACKAGES: Teuchos Epetra --- EpetraExt_LIB_OPTIONAL_DEP_PACKAGES: Triutils --- EpetraExt_LIB_OPTIONAL_DEP_TPLS: UMFPACK AMD PETSC +-- UMFPACK_FORWARD_LIB_DEFINED_DEPENDENCIES: EpetraExt[O] --- ThyraCoreLibs_LIB_REQUIRED_DEP_PACKAGES: Teuchos RTOp +-- AMD_FORWARD_LIB_DEFINED_DEPENDENCIES: EpetraExt[O] --- ThyraGoodStuff_LIB_REQUIRED_DEP_PACKAGES: ThyraCoreLibs +-- PETSC_FORWARD_LIB_DEFINED_DEPENDENCIES: EpetraExt[O] --- ThyraCrazyStuff_LIB_REQUIRED_DEP_PACKAGES: ThyraGoodStuff +-- Teuchos_LIB_DEFINED_DEPENDENCIES: BLAS[R] LAPACK[R] Boost[O] MPI[O] +-- Teuchos_FORWARD_LIB_DEFINED_DEPENDENCIES: RTOp[R] EpetraExt[R] ThyraCoreLibs[R] --- ThyraEpetra_LIB_REQUIRED_DEP_PACKAGES: Epetra ThyraCoreLibs +-- RTOp_LIB_DEFINED_DEPENDENCIES: Teuchos[R] +-- RTOp_FORWARD_LIB_DEFINED_DEPENDENCIES: ThyraCoreLibs[R] --- ThyraEpetraExt_LIB_REQUIRED_DEP_PACKAGES: ThyraEpetra EpetraExt +-- Epetra_LIB_DEFINED_DEPENDENCIES: BLAS[R] LAPACK[R] MPI[O] +-- Epetra_FORWARD_LIB_DEFINED_DEPENDENCIES: Triutils[R] EpetraExt[R] ThyraEpetra[R] --- Thyra_LIB_REQUIRED_DEP_PACKAGES: ThyraCoreLibs --- Thyra_LIB_OPTIONAL_DEP_PACKAGES: ThyraGoodStuff ThyraCrazyStuff ThyraEpetra ThyraEpetraExt +-- Triutils_LIB_DEFINED_DEPENDENCIES: Epetra[R] +-- Triutils_FORWARD_LIB_DEFINED_DEPENDENCIES: EpetraExt[O] -Dumping direct dependencies for each package ... +-- EpetraExt_LIB_DEFINED_DEPENDENCIES: Teuchos[R] Epetra[R] Triutils[O] UMFPACK[O] AMD[O] PETSC[O] +-- EpetraExt_FORWARD_LIB_DEFINED_DEPENDENCIES: ThyraEpetraExt[R] --- MPI_LIB_DEFINED_DEPENDENCIES: +-- ThyraCoreLibs_LIB_DEFINED_DEPENDENCIES: Teuchos[R] RTOp[R] +-- ThyraCoreLibs_FORWARD_LIB_DEFINED_DEPENDENCIES: ThyraGoodStuff[R] ThyraEpetra[R] Thyra[R] --- BLAS_LIB_DEFINED_DEPENDENCIES: +-- ThyraGoodStuff_LIB_DEFINED_DEPENDENCIES: ThyraCoreLibs[R] +-- ThyraGoodStuff_FORWARD_LIB_DEFINED_DEPENDENCIES: ThyraCrazyStuff[R] Thyra[O] --- LAPACK_LIB_DEFINED_DEPENDENCIES: +-- ThyraCrazyStuff_LIB_DEFINED_DEPENDENCIES: ThyraGoodStuff[R] +-- ThyraCrazyStuff_FORWARD_LIB_DEFINED_DEPENDENCIES: Thyra[O] --- Boost_LIB_DEFINED_DEPENDENCIES: +-- ThyraEpetra_LIB_DEFINED_DEPENDENCIES: Epetra[R] ThyraCoreLibs[R] +-- ThyraEpetra_FORWARD_LIB_DEFINED_DEPENDENCIES: ThyraEpetraExt[R] Thyra[O] --- UMFPACK_LIB_DEFINED_DEPENDENCIES: +-- ThyraEpetraExt_LIB_DEFINED_DEPENDENCIES: ThyraEpetra[R] EpetraExt[R] +-- ThyraEpetraExt_FORWARD_LIB_DEFINED_DEPENDENCIES: Thyra[O] --- AMD_LIB_DEFINED_DEPENDENCIES: +-- Thyra_LIB_DEFINED_DEPENDENCIES: ThyraCoreLibs[R] ThyraGoodStuff[O] ThyraCrazyStuff[O] ThyraEpetra[O] ThyraEpetraExt[O] --- PETSC_LIB_DEFINED_DEPENDENCIES: +Dumping direct enabled dependencies for each package ... --- Teuchos_LIB_ENABLED_DEPENDENCIES: BLAS LAPACK --- Teuchos_LIB_DEFINED_DEPENDENCIES: BLAS LAPACK Boost MPI +-- MPI: No enabled dependencies! --- RTOp_LIB_ENABLED_DEPENDENCIES: Teuchos --- RTOp_LIB_DEFINED_DEPENDENCIES: Teuchos +-- BLAS: No enabled dependencies! --- Epetra_LIB_ENABLED_DEPENDENCIES: BLAS LAPACK --- Epetra_LIB_DEFINED_DEPENDENCIES: BLAS LAPACK MPI +-- LAPACK_LIB_ENABLED_DEPENDENCIES: BLAS[R] --- Triutils_LIB_DEFINED_DEPENDENCIES: Epetra +-- Boost: No enabled dependencies! --- EpetraExt_LIB_DEFINED_DEPENDENCIES: Teuchos Epetra Triutils UMFPACK AMD PETSC +-- UMFPACK: No enabled dependencies! --- ThyraCoreLibs_LIB_ENABLED_DEPENDENCIES: Teuchos RTOp --- ThyraCoreLibs_LIB_DEFINED_DEPENDENCIES: Teuchos RTOp +-- AMD: No enabled dependencies! --- ThyraGoodStuff_LIB_DEFINED_DEPENDENCIES: ThyraCoreLibs +-- PETSC: No enabled dependencies! --- ThyraCrazyStuff_LIB_DEFINED_DEPENDENCIES: ThyraGoodStuff +-- Teuchos_LIB_ENABLED_DEPENDENCIES: BLAS[R] LAPACK[R] --- ThyraEpetra_LIB_ENABLED_DEPENDENCIES: Epetra ThyraCoreLibs --- ThyraEpetra_LIB_DEFINED_DEPENDENCIES: Epetra ThyraCoreLibs +-- RTOp_LIB_ENABLED_DEPENDENCIES: Teuchos[R] --- ThyraEpetraExt_LIB_DEFINED_DEPENDENCIES: ThyraEpetra EpetraExt +-- Epetra_LIB_ENABLED_DEPENDENCIES: BLAS[R] LAPACK[R] --- Thyra_LIB_ENABLED_DEPENDENCIES: ThyraCoreLibs ThyraEpetra --- Thyra_LIB_DEFINED_DEPENDENCIES: ThyraCoreLibs ThyraGoodStuff ThyraCrazyStuff ThyraEpetra ThyraEpetraExt +-- Triutils: No enabled dependencies! + +-- EpetraExt: No enabled dependencies! + +-- ThyraCoreLibs_LIB_ENABLED_DEPENDENCIES: Teuchos[R] RTOp[R] + +-- ThyraGoodStuff: No enabled dependencies! + +-- ThyraCrazyStuff: No enabled dependencies! + +-- ThyraEpetra_LIB_ENABLED_DEPENDENCIES: Epetra[R] ThyraCoreLibs[R] + +-- ThyraEpetraExt: No enabled dependencies! + +-- Thyra_LIB_ENABLED_DEPENDENCIES: ThyraCoreLibs[R] ThyraEpetra[O] + +Setting up export dependencies for all enabled packages ... + +-- Teuchos: No library dependencies! +-- RTOp_FULL_ENABLED_DEP_PACKAGES: Teuchos +-- Epetra: No library dependencies! +-- ThyraCoreLibs_FULL_ENABLED_DEP_PACKAGES: RTOp Teuchos +-- ThyraEpetra_FULL_ENABLED_DEP_PACKAGES: ThyraCoreLibs Epetra RTOp Teuchos +-- Thyra_FULL_ENABLED_DEP_PACKAGES: ThyraEpetra ThyraCoreLibs Epetra RTOp Teuchos diff --git a/cmake/tribits/doc/guides/TribitsCoreDetailedReference.rst b/cmake/tribits/doc/guides/TribitsCoreDetailedReference.rst index 50a99b926381..e5ef0fa6625c 100644 --- a/cmake/tribits/doc/guides/TribitsCoreDetailedReference.rst +++ b/cmake/tribits/doc/guides/TribitsCoreDetailedReference.rst @@ -61,6 +61,7 @@ The global project-level TriBITS options for which defaults can be provided by a given TriBITS project are: * `${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE`_ +* `${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES`_ * `${PROJECT_NAME}_C_Standard`_ * `${PROJECT_NAME}_CHECK_FOR_UNPARSED_ARGUMENTS`_ * `${PROJECT_NAME}_CONFIGURE_OPTIONS_FILE_APPEND`_ @@ -120,6 +121,25 @@ These options are described below. in the project's base `/ProjectName.cmake`_ file. + +.. _${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES: + +**${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES** + + To set ``${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES`` a different default, + set:: + + set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_DEFAULT ) + + in the project's base `/ProjectName.cmake`_ file, where + ```` can be ``FATAL_ERROR``, ``SEND_ERROR``, ``WARNING``, + ``NOTICE`` or ``IGNORE`` + + Otherwise, the default is ``WARNING`` when + ``${PROJECT_NAME}_ENABLE_DEVELOPMENT_MODE`` is ``ON`` and if ``IGNORE`` if + ``${PROJECT_NAME}_ENABLE_DEVELOPMENT_MODE`` is ``OFF``. + + .. _${PROJECT_NAME}_C_Standard: **${PROJECT_NAME}_C_Standard** @@ -349,11 +369,12 @@ These options are described below. to ``OFF`` when creating a release (see `Project and Repository Versioning and Release Mode`_). When ``${PROJECT_NAME}_ENABLE_DEVELOPMENT_MODE`` is ``ON``, several other variables are given defaults appropriate for - development mode. For example, ``${PROJECT_NAME}_ASSERT_MISSING_PACKAGES`` - is set to ``ON`` by default in development mode but is set to ``OFF`` by - default in release mode. In addition, strong compiler warnings are enabled - by default in development mode but are disabled by default in release mode. - This variable also affects the behavior of `tribits_set_st_for_dev_mode()`_. + development mode. For example, + ``${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES`` is set to ``FATAL_ERROR`` by + default in development mode but is set to ``IGNORE`` by default in release + mode. In addition, strong compiler warnings are enabled by default in + development mode but are disabled by default in release mode. This variable + also affects the behavior of `tribits_set_st_for_dev_mode()`_. .. _${PROJECT_NAME}_ENABLE_Fortran: diff --git a/cmake/tribits/doc/guides/TribitsGuidesBody.rst b/cmake/tribits/doc/guides/TribitsGuidesBody.rst index f6ab1b1b733f..876566808da4 100644 --- a/cmake/tribits/doc/guides/TribitsGuidesBody.rst +++ b/cmake/tribits/doc/guides/TribitsGuidesBody.rst @@ -1780,6 +1780,8 @@ defined: the package is in relation to other packages. NOTE: This variable is **only** defined if the package is actually enabled! + .. _${PACKAGE_NAME}_PARENT_REPOSITORY: + ``${PACKAGE_NAME}_PARENT_REPOSITORY`` The name of the package's parent repository. This can be used by a @@ -2161,8 +2163,8 @@ version will be used all of the downstream packages that uses it. Also, by defining a TriBITS TPL, automatic enable/disable logic will be applied as described in `Package Dependencies and Enable/Disable Logic`_. For example, if an external package/TPL is explicitly disabled, all of the downstream -packages that depend on it will be automatically disabled as well (see `TPL -disable triggers auto-disables of downstream dependencies`_). +packages that depend on it will be automatically disabled as well (see +`Package disable triggers auto-disables of downstream dependencies`_). .. _Globally unique TriBITS TPL names: @@ -3361,21 +3363,20 @@ system are: 6) `EX TPLs given default unset enable/disable state`_ 7) `Required TPLs are auto-enabled for enabled packages`_ 8) `Optional TPLs only enabled explicitly by the user`_ -9) `TPL disable triggers auto-disables of downstream dependencies`_ -10) `Disables trump enables where there is a conflict`_ -11) `Enable/disable of parent package is enable/disable for subpackages`_ -12) `Enable/disable of parent package tests/examples is enable/disable for subpackages tests/examples`_ -13) `Subpackage enable does not auto-enable the parent package`_ -14) `Support for optional package/TPL is enabled by default`_ -15) `Support for optional package can be explicitly disabled`_ -16) `Explicit enable of optional package/TPL support auto-enables package/TPL`_ -17) `ST packages only auto-enabled if ST code is enabled`_ -18) `_ENABLE_ALL_FORWARD_DEP_PACKAGES enables downstream packages/tests`_ -19) `_ENABLE_ALL_PACKAGES enables all PT (cond. ST) packages`_ -20) `_ENABLE_TESTS only enables explicitly enabled package tests`_ -21) `If no packages are enabled, nothing will get built`_ -22) `TriBITS prints all enables and disables to stdout`_ -23) `TriBITS auto-enables/disables done using non-cache local variables`_ +9) `Disables trump enables where there is a conflict`_ +10) `Enable/disable of parent package is enable/disable for subpackages`_ +11) `Enable/disable of parent package tests/examples is enable/disable for subpackages tests/examples`_ +12) `Subpackage enable does not auto-enable the parent package`_ +13) `Support for optional package/TPL is enabled by default`_ +14) `Support for optional package can be explicitly disabled`_ +15) `Explicit enable of optional package/TPL support auto-enables package/TPL`_ +16) `ST packages only auto-enabled if ST code is enabled`_ +17) `_ENABLE_ALL_FORWARD_DEP_PACKAGES enables downstream packages/tests`_ +18) `_ENABLE_ALL_PACKAGES enables all PT (cond. ST) packages`_ +19) `_ENABLE_TESTS only enables explicitly enabled package tests`_ +20) `If no packages are enabled, nothing will get built`_ +21) `TriBITS prints all enables and disables to stdout`_ +22) `TriBITS auto-enables/disables done using non-cache local variables`_ In more detail, these rules/behaviors are: @@ -3443,15 +3444,16 @@ In more detail, these rules/behaviors are: .. _Package disable triggers auto-disables of downstream dependencies: -4) **Package disable triggers auto-disables of downstream dependencies**: - Any package ```` can be explicitly **disabled** by the - user by setting the cache variable - ``${PROJECT_NAME}_ENABLE_=OFF`` - (e.g. ``Trilinos_ENABLE_Teuchos=OFF``). When an package is explicitly - disabled, it will result in the disable of all `downstream`_ packages - that have required dependency on it. It will also disable optional support - for the disabled packages in downstream packages that list it as an - optional dependency. For an example, see `Explicit disable of a package`_. +4) **Package disable triggers auto-disables of downstream dependencies**: Any + package ```` can be explicitly **disabled** by the user by + setting the cache variable ``${PROJECT_NAME}_ENABLE_=OFF`` + (or ``TPL_ENABLE_=OFF`` for an external package/TPL) + (e.g. ``Trilinos_ENABLE_Teuchos=OFF``, ``TPL_ENABLE_BLAS=OFF``). When an + package is explicitly disabled, it will result in the disable of all + dependent `downstream`_ external packages/TPLs and internal packages that + have required dependency on it. It will also disable optional support for + the disabled packages in downstream packages that list it as an optional + dependency. For an example, see `Explicit disable of a package`_. .. _PT/ST TPLs given default unset enable/disable state: @@ -3505,24 +3507,9 @@ In more detail, these rules/behaviors are: ``TPL_ENABLE_Boost=ON``. For an example, see `Explicit enable of a package, its tests, an optional TPL, with ST enabled`_. -.. _TPL disable triggers auto-disables of downstream dependencies: - -9) **TPL disable triggers auto-disables of downstream dependencies**: Any TPLs - that are explicitly disabled (i.e. ``TPL_ENABLE_=OFF``) will - result in the disable of all `downstream`_ dependent packages that have a - required dependency on the TPL. For example, if the user sets - ``TPL_ENABLE_LAPACK=OFF``, then this will result in the disable of packages - ``Teuchos`` and ``Epetra``, and all of the required packages downstream - from them. Also, the explicitly disabled TPL will result in the disable of - optional support in all downstream packages. For example, if the user sets - ``TPL_ENABLE_MPI=OFF``, then TriBITS will automatically set - ``Teuchos_ENABLE_MPI=OFF`` and ``Epetra_ENABLE_MPI=OFF``. For examples, - see `Explicit disable of an optional TPL`_ and `Explicit disable of a - required TPL`_. - .. _Disables trump enables where there is a conflict: -10) **Disables trump enables where there is a conflict** and TriBITS will +9) **Disables trump enables where there is a conflict** and TriBITS will never override a disable in order to satisfy some dependency. For example, if the user sets ``Trilinos_ENABLE_Teuchos=OFF`` and ``Trilinos_ENABLE_RTOp=ON``, then TriBITS will **not** override the @@ -3553,7 +3540,7 @@ In more detail, these rules/behaviors are: .. _Enable/disable of parent package is enable/disable for subpackages: -11) **Enable/disable of parent package is enable/disable for subpackages**: An +10) **Enable/disable of parent package is enable/disable for subpackages**: An explicit enable/disable of a top-level parent package with subpackages with ``${PROJECT_NAME}_ENABLE_=(ON|OFF)`` is equivalent to the explicit enable/disable of all of the parent package's subpackages. @@ -3576,7 +3563,7 @@ In more detail, these rules/behaviors are: .. _Enable/disable of parent package tests/examples is enable/disable for subpackages tests/examples: -12) **Enable/disable of parent package tests/examples is enable/disable for +11) **Enable/disable of parent package tests/examples is enable/disable for subpackages tests/examples**: Setting ``_ENABLE_TESTS=[ON|OFF]`` is equivalent to setting the default for ``_ENABLE_TESTS=[ON|OFF]`` for each @@ -3590,7 +3577,7 @@ In more detail, these rules/behaviors are: .. _Subpackage enable does not auto-enable the parent package: -13) **Subpackage enable does not auto-enable the parent package**: Enabling an +12) **Subpackage enable does not auto-enable the parent package**: Enabling an package that is a subpackage does **not** automatically enable the parent package (except for at the very end, mostly just for show). For example, enabling the package ``ThyraEpetra`` does not result in enable @@ -3613,7 +3600,7 @@ In more detail, these rules/behaviors are: .. _Support for optional package/TPL is enabled by default: -14) **Support for optional package/TPL is enabled by default**: For an package +13) **Support for optional package/TPL is enabled by default**: For an package ```` with an optional dependency on an `upstream`_ package or TPL ````, TriBITS will automatically set the intra-enable variable @@ -3630,7 +3617,7 @@ In more detail, these rules/behaviors are: .. _Support for optional package can be explicitly disabled: -15) **Support for optional package can be explicitly disabled:** Even +14) **Support for optional package can be explicitly disabled:** Even though TriBITS will automatically set ``_ENABLE_=ON`` by default if ```` and ```` are both @@ -3650,7 +3637,7 @@ In more detail, these rules/behaviors are: .. _Explicit enable of optional package/TPL support auto-enables package/TPL: -16) **Explicit enable of optional package/TPL support auto-enables +15) **Explicit enable of optional package/TPL support auto-enables package/TPL**: If the user explicitly enables the TriBITS package ```` and explicitly sets ``_ENABLE_=ON`` on input, @@ -3670,7 +3657,7 @@ In more detail, these rules/behaviors are: .. _ST packages only auto-enabled if ST code is enabled: -17) **ST packages only auto-enabled if ST code is enabled**: TriBITS will +16) **ST packages only auto-enabled if ST code is enabled**: TriBITS will only enable an optional ``ST`` package when ``${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES=ON`` if ``${PROJECT_NAME}_SECONDARY_TESTED_CODE=ON`` is also set. Otherwise, when @@ -3689,7 +3676,7 @@ In more detail, these rules/behaviors are: .. __ENABLE_ALL_FORWARD_DEP_PACKAGES enables downstream packages/tests: -18) **_ENABLE_ALL_FORWARD_DEP_PACKAGES enables downstream packages/tests**: +17) **_ENABLE_ALL_FORWARD_DEP_PACKAGES enables downstream packages/tests**: Setting the user cache-variable ``${PROJECT_NAME}_ENABLE_ALL_FORWARD_PACKAGES=ON`` will result in the `downstream`_ ``PT`` packages and tests to be enabled (and all ``PT`` @@ -3707,7 +3694,7 @@ In more detail, these rules/behaviors are: .. __ENABLE_ALL_PACKAGES enables all PT (cond. ST) packages: -19) **_ENABLE_ALL_PACKAGES enables all PT (cond. ST) packages**: +18) **_ENABLE_ALL_PACKAGES enables all PT (cond. ST) packages**: Setting the user cache-variable ``${PROJECT_NAME}_ENABLE_ALL_PACKAGES=ON`` will result in the enable of all ``PT`` packages when ``${PROJECT_NAME}_SECONDARY_TESTED_CODE=OFF`` and all ``PT`` and ``ST`` @@ -3726,7 +3713,7 @@ In more detail, these rules/behaviors are: .. __ENABLE_TESTS only enables explicitly enabled package tests: -20) **_ENABLE_TESTS only enables explicitly enabled package +19) **_ENABLE_TESTS only enables explicitly enabled package tests**: Setting ``${PROJECT_NAME}_ENABLE_TESTS=ON`` will **only enable tests for explicitly enabled packages** on input. For example, configuring with ``Trilinos_ENABLE_RTOp=ON`` and @@ -3741,7 +3728,7 @@ In more detail, these rules/behaviors are: .. _If no packages are enabled, nothing will get built: -21) **If no packages are enabled, nothing will get built**: Most TriBITS +20) **If no packages are enabled, nothing will get built**: Most TriBITS projects are set up such that if the user does not explicitly enable at least one package in some way, then nothing will be enabled or built. In this case, when ``${PROJECT_NAME}_ALLOW_NO_PACKAGES=TRUE`` a warning @@ -3755,7 +3742,7 @@ In more detail, these rules/behaviors are: .. _TriBITS prints all enables and disables to stdout: -22) **TriBITS prints all enables and disables to stdout**: TriBITS prints out +21) **TriBITS prints all enables and disables to stdout**: TriBITS prints out (to ``cmake`` stdout) the initial set of enables/disables on input, prints a line whenever it sets (or overrides) an enable or disable, and prints out the final set of enables/disables. Therefore, the user just needs to @@ -3768,7 +3755,7 @@ In more detail, these rules/behaviors are: .. _TriBITS auto-enables/disables done using non-cache local variables: -23) **TriBITS auto-enables/disables done using non-cache local variables**: +22) **TriBITS auto-enables/disables done using non-cache local variables**: TriBITS setting (or overrides) of enable/disable cache variables are done by setting local non-cache variables at the top project-level scope (i.e. the ``/CMakeLists.txt`` file scope). This is done so diff --git a/cmake/tribits/doc/guides/TribitsSystemMacroFunctionDocTemplate.rst b/cmake/tribits/doc/guides/TribitsSystemMacroFunctionDocTemplate.rst index e42125762328..a8c9f53d216a 100644 --- a/cmake/tribits/doc/guides/TribitsSystemMacroFunctionDocTemplate.rst +++ b/cmake/tribits/doc/guides/TribitsSystemMacroFunctionDocTemplate.rst @@ -13,8 +13,9 @@ understand the internals of TriBITS. @FUNCTION: tribits_abort_on_missing_package() + @FUNCTION: tribits_abort_on_self_dep() + @MACRO: tribits_adjust_package_enables() + -@FUNCTION: tribits_append_forward_dep_packages() + +@MACRO: tribits_append_forward_dep_packages() + @MACRO: tribits_assert_read_dependency_vars() + +@FUNCTION: tribits_dump_package_dependencies_info() + @FUNCTION: tribits_extpkg_add_find_upstream_dependencies_str() + @FUNCTION: tribits_extpkg_create_all_libs_target() + @FUNCTION: tribits_extpkg_install_config_file() + @@ -22,7 +23,10 @@ understand the internals of TriBITS. @FUNCTION: tribits_extpkg_process_libraries_list() + @MACRO: tribits_extpkg_setup_enabled_dependencies() + @FUNCTION: tribits_extpkg_write_config_version_file() + -@FUNCTION: tribits_dump_package_dependencies_info() + +@FUNCTION: tribits_get_sublist_disabled() + +@FUNCTION: tribits_get_sublist_enabled() + +@FUNCTION: tribits_get_sublist_nondisabled() + +@FUNCTION: tribits_get_sublist_nonenabled() + @FUNCTION: tribits_print_initial_dependency_info() + @FUNCTION: tribits_print_tentatively_enabled_tpls() + @MACRO: tribits_parse_subpackages_append_packages_add_options() + @@ -42,7 +46,7 @@ understand the internals of TriBITS. @MACRO: tribits_read_subpackage_deps_file_add_to_graph() + @MACRO: tribits_read_toplevel_package_deps_files_add_to_graph() + @MACRO: tribits_save_off_dependency_vars() + -@FUNCTION: tribits_set_dep_packages() + +@MACRO: tribits_set_dep_packages() + @FUNCTION: tribits_trace_file_processing() + @FUNCTION: tribits_write_package_client_export_files_install_targets() + @MACRO: tribits_write_xml_dependency_files() + diff --git a/cmake/tribits/doc/guides/UtilsMacroFunctionDocTemplate.rst b/cmake/tribits/doc/guides/UtilsMacroFunctionDocTemplate.rst index f5c4cf3970d2..d7d18c8d7e39 100644 --- a/cmake/tribits/doc/guides/UtilsMacroFunctionDocTemplate.rst +++ b/cmake/tribits/doc/guides/UtilsMacroFunctionDocTemplate.rst @@ -39,6 +39,10 @@ @FUNCTION: timer_get_raw_seconds() + @FUNCTION: timer_get_rel_seconds() + @FUNCTION: timer_print_rel_time() + +@FUNCTION: tribits_add_enum_cache_var() + +@FUNCTION: tribits_deprecated() + +@FUNCTION: tribits_deprecated_command() + +@MACRO: tribits_create_reverse_list() + @FUNCTION: tribits_strip_quotes_from_str() + @FUNCTION: unittest_compare_const() + @FUNCTION: unittest_has_substr_const() + diff --git a/cmake/tribits/doc/guides/users_guide/TribitsUsersGuide.rst b/cmake/tribits/doc/guides/users_guide/TribitsUsersGuide.rst index 96d44b9e9abe..be4cee320ff3 100644 --- a/cmake/tribits/doc/guides/users_guide/TribitsUsersGuide.rst +++ b/cmake/tribits/doc/guides/users_guide/TribitsUsersGuide.rst @@ -106,3 +106,5 @@ Appendix .. _tribits_read_all_project_deps_files_create_deps_graph(): TribitsMaintainersGuide.html#tribits-read-all-project-deps-files-create-deps-graph .. _${PACKAGE_NAME}_LIB_DEFINED_DEPENDENCIES: TribitsMaintainersGuide.html#package-name-lib-enabled-dependencies + +.. _${PACKAGE_NAME}_TEST_DEFINED_DEPENDENCIES: TribitsMaintainersGuide.html#package-name-test-enabled-dependencies diff --git a/cmake/tribits/examples/MockTrilinos/TPLsList.cmake b/cmake/tribits/examples/MockTrilinos/TPLsList.cmake index 7e9335cf2908..e83c918dce24 100644 --- a/cmake/tribits/examples/MockTrilinos/TPLsList.cmake +++ b/cmake/tribits/examples/MockTrilinos/TPLsList.cmake @@ -10,6 +10,7 @@ tribits_repository_define_tpls( ADOLC cmake/TPLs/ ST ADIC cmake/TPLs/ EX TVMET cmake/TPLs/ ST + #Zlib cmake/TPLs/ PT # Listed in zoltan/cmake/Dependencies.cmake! y12m cmake/TPLs/ ST SuperLUDist cmake/TPLs/ ST SuperLU cmake/TPLs/ ST diff --git a/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLLAPACKDependencies.cmake b/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLLAPACKDependencies.cmake new file mode 100644 index 000000000000..0256dbbfd4dd --- /dev/null +++ b/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLLAPACKDependencies.cmake @@ -0,0 +1,2 @@ +tribits_extpkg_define_dependencies( LAPACK + DEPENDENCIES BLAS) diff --git a/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLParMETISDependencies.cmake b/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLParMETISDependencies.cmake new file mode 100644 index 000000000000..d999aca2b2ae --- /dev/null +++ b/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLParMETISDependencies.cmake @@ -0,0 +1,2 @@ +tribits_extpkg_define_dependencies( ParMETIS + DEPENDENCIES METIS) diff --git a/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDependencies.cmake b/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDependencies.cmake new file mode 100644 index 000000000000..47a938258d0d --- /dev/null +++ b/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDependencies.cmake @@ -0,0 +1,2 @@ +tribits_extpkg_define_dependencies( SuperLU + DEPENDENCIES ParMETIS BLAS) diff --git a/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDistDependencies.cmake b/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDistDependencies.cmake new file mode 100644 index 000000000000..d0419545d2cd --- /dev/null +++ b/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDistDependencies.cmake @@ -0,0 +1,2 @@ +tribits_extpkg_define_dependencies( SuperLUDist + DEPENDENCIES ParMETIS BLAS) diff --git a/cmake/tribits/examples/MockTrilinos/packages/zoltan/cmake/Dependencies.cmake b/cmake/tribits/examples/MockTrilinos/packages/zoltan/cmake/Dependencies.cmake index 06261248bff8..5d3bfcfe0062 100644 --- a/cmake/tribits/examples/MockTrilinos/packages/zoltan/cmake/Dependencies.cmake +++ b/cmake/tribits/examples/MockTrilinos/packages/zoltan/cmake/Dependencies.cmake @@ -37,6 +37,12 @@ # ************************************************************************ # @HEADER +if (SHOW_INVALID_TPL_NAME_ERROR) + set(Zlib_str Zlib) +else() + set(Zlib_str "") +endif() + tribits_package_define_dependencies( - LIB_OPTIONAL_TPLS MPI ParMETIS Scotch Zlib + LIB_OPTIONAL_TPLS MPI ParMETIS Scotch ${Zlib_str} ) diff --git a/cmake/tribits/examples/ReducedMockTrilinos/TPLsList.cmake b/cmake/tribits/examples/ReducedMockTrilinos/TPLsList.cmake index 542b88f79412..4de9acf2a02c 100644 --- a/cmake/tribits/examples/ReducedMockTrilinos/TPLsList.cmake +++ b/cmake/tribits/examples/ReducedMockTrilinos/TPLsList.cmake @@ -1,8 +1,8 @@ tribits_repository_define_tpls( - MPI "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" PT - BLAS "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" PT - LAPACK "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" PT - Boost "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" ST + MPI "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" PT + BLAS "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" PT + LAPACK "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" PT + Boost cmake/TPLs/ ST UMFPACK cmake/TPLs/ ST AMD cmake/TPLs/ EX PETSC "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" ST diff --git a/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/PackagesList.cmake b/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/PackagesList.cmake new file mode 100644 index 000000000000..41002b84335d --- /dev/null +++ b/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/PackagesList.cmake @@ -0,0 +1,3 @@ +tribits_repository_define_packages( + DependsOnLAPACK . PT + ) diff --git a/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/TPLsList.cmake b/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/TPLsList.cmake new file mode 100644 index 000000000000..e85baf197743 --- /dev/null +++ b/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/TPLsList.cmake @@ -0,0 +1 @@ +tribits_repository_define_tpls() diff --git a/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/cmake/Dependencies.cmake b/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/cmake/Dependencies.cmake new file mode 100644 index 000000000000..3f688dcd49e9 --- /dev/null +++ b/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/cmake/Dependencies.cmake @@ -0,0 +1,3 @@ +tribits_package_define_dependencies( + LIB_REQUIRED_TPLS LAPACK + ) diff --git a/cmake/tribits/examples/TribitsExampleApp/AppHelperFuncs.cmake b/cmake/tribits/examples/TribitsExampleApp/AppHelperFuncs.cmake index 471f33eb2d20..bfd38d81577b 100644 --- a/cmake/tribits/examples/TribitsExampleApp/AppHelperFuncs.cmake +++ b/cmake/tribits/examples/TribitsExampleApp/AppHelperFuncs.cmake @@ -65,7 +65,6 @@ macro(getTribitsExProjStuffForAppByProject) message(" TribitsExProj_DIR = ${TribitsExProj_DIR}") message(" TribitsExProj_VERSION = ${TribitsExProj_VERSION}") message(" TribitsExProj_PACKAGE_LIST = ${TribitsExProj_PACKAGE_LIST}") - message(" TribitsExProj_TPL_LIST = ${TribitsExProj_TPL_LIST}") message(" TribitsExProj_BUILD_SHARED_LIBS = ${TribitsExProj_BUILD_SHARED_LIBS}") message("End of TribitsExProj details\n") @@ -139,7 +138,7 @@ endfunction() # function(getExpectedAppDepsStr expectedDepsStrOut) - if ("SimpleTpl" IN_LIST SimpleCxx_TPL_LIST) + if (TARGET SimpleTpl::all_libs) set(simpleCxxDeps "simpletpl ") else() set(simpleCxxDeps "") diff --git a/cmake/tribits/examples/TribitsOldSimpleExampleApp/CMakeLists.txt b/cmake/tribits/examples/TribitsOldSimpleExampleApp/CMakeLists.txt index 34302ee7b669..b0d9d5d0699b 100644 --- a/cmake/tribits/examples/TribitsOldSimpleExampleApp/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsOldSimpleExampleApp/CMakeLists.txt @@ -52,11 +52,14 @@ target_include_directories(app enable_testing() -if ("SimpleTpl" IN_LIST TribitsExProj_TPL_LIST) +if ("SimpleTpl" IN_LIST TribitsExProj_TPL_LIST OR TARGET SimpleTpl::all_libs) set(simpleCxxDeps "simpletpl headeronlytpl") else() set(simpleCxxDeps "headeronlytpl") endif() +# NOTE: Above, TribitsExProj_TPL_LIST does not exist in new TriBITS so to make +# this work for new TriBITS as well, we need to check for target +# SimpleTpl::all_libs. Small price to pay for progress! add_test(NAME util_test COMMAND util) set_tests_properties(util_test PROPERTIES diff --git a/cmake/tribits/examples/TribitsSimpleExampleApp/CMakeLists.txt b/cmake/tribits/examples/TribitsSimpleExampleApp/CMakeLists.txt index 425e0717cdde..58725b4fc565 100644 --- a/cmake/tribits/examples/TribitsSimpleExampleApp/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsSimpleExampleApp/CMakeLists.txt @@ -39,7 +39,7 @@ target_link_libraries(app PRIVATE TribitsExProj::all_selected_libs) enable_testing() -if ("SimpleTpl" IN_LIST TribitsExProj_TPL_LIST) +if (TARGET SimpleTpl::all_libs) set(simpleCxxDeps "simpletpl headeronlytpl") else() set(simpleCxxDeps "headeronlytpl") From 67e32ad9db2a4f0801979000f949fd8d56359f5c Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 09:16:53 -0700 Subject: [PATCH 02/78] GTest: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- commonTools/gtest/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commonTools/gtest/CMakeLists.txt b/commonTools/gtest/CMakeLists.txt index 210d6218c186..72535fe88c20 100644 --- a/commonTools/gtest/CMakeLists.txt +++ b/commonTools/gtest/CMakeLists.txt @@ -5,7 +5,7 @@ SET(${PACKAGE_NAME}_SKIP_INSTALL FALSE CACHE BOOL ADD_DEFINITIONS(-DGTEST_HAS_PTHREAD=0) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/gtest/gtest.h From 0d6c68c3b51ba1581fadaa7b96281a7d4dc37ab6 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 09:21:10 -0700 Subject: [PATCH 03/78] Adelus: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/adelus/example/CMakeLists.txt | 2 +- packages/adelus/src/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/adelus/example/CMakeLists.txt b/packages/adelus/example/CMakeLists.txt index 3fdcc9bfa670..de56f780fc00 100644 --- a/packages/adelus/example/CMakeLists.txt +++ b/packages/adelus/example/CMakeLists.txt @@ -54,7 +54,7 @@ PROJECT(my_Adelus_driver C CXX) ADD_DEFINITIONS(-DKKVIEW_API) -INCLUDE_DIRECTORIES(${Trilinos_INCLUDE_DIRS} ${Trilinos_TPL_INCLUDE_DIRS}) +TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_INCLUDE_DIRS} ${Trilinos_TPL_INCLUDE_DIRS}) LINK_DIRECTORIES(${Trilinos_LIBRARY_DIRS} ${Trilinos_TPL_LIBRARY_DIRS}) ADD_EXECUTABLE(adelus_driver adelus_driver.cpp) diff --git a/packages/adelus/src/CMakeLists.txt b/packages/adelus/src/CMakeLists.txt index 81717dd70d3b..3228959e7b45 100644 --- a/packages/adelus/src/CMakeLists.txt +++ b/packages/adelus/src/CMakeLists.txt @@ -21,13 +21,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # Core files From ee3b74e1ad98de94ea2a11e924dd66a93064b82a Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 09:21:44 -0700 Subject: [PATCH 04/78] Amesos: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/amesos/src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/amesos/src/CMakeLists.txt b/packages/amesos/src/CMakeLists.txt index ac5445e53316..74fe29686dfb 100644 --- a/packages/amesos/src/CMakeLists.txt +++ b/packages/amesos/src/CMakeLists.txt @@ -20,7 +20,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -30,7 +30,7 @@ SET(HEADERS ${HEADERS} # support files # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES ${SOURCES} Amesos_Status.cpp From f046b633535289cbdece20af79df1ff15b4e6225 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 09:23:59 -0700 Subject: [PATCH 05/78] Amesos2: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/amesos2/src/CMakeLists.txt | 22 +++++++++---------- .../amesos2/src/KLU2/Source/CMakeLists.txt | 16 +++++++------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/amesos2/src/CMakeLists.txt b/packages/amesos2/src/CMakeLists.txt index 0504cf45a19a..49725393f27a 100644 --- a/packages/amesos2/src/CMakeLists.txt +++ b/packages/amesos2/src/CMakeLists.txt @@ -60,7 +60,7 @@ SET(SOURCES "") ASSERT_DEFINED(PROJECT_SOURCE_DIR) -INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) # If we use Trilinos_version then "make install" will fail. #APPEND_SET(HEADERS @@ -69,7 +69,7 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) # Set headers (for IDEs and installing) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -78,14 +78,14 @@ APPEND_SET(HEADERS # NOTE: Above, we add the XXX_config.h file so that MS Visual Studio # will know to include this file in the dependency analysis -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/basker) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/KLU2/Include) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/KLU2/Source) -INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/AMD/Include) -INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/COLAMD/Include) -INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/BTF/Include) -INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/UFconfig) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/basker) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/KLU2/Include) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/KLU2/Source) +TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/AMD/Include) +TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/COLAMD/Include) +TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/BTF/Include) +TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/UFconfig) APPEND_SET(HEADERS Amesos2.hpp @@ -258,7 +258,7 @@ IF (${PACKAGE_NAME}_ENABLE_Basker) Amesos2_Basker.cpp ) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/basker) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/basker) APPEND_SET(HEADERS basker/basker.hpp basker/basker_decl.hpp diff --git a/packages/amesos2/src/KLU2/Source/CMakeLists.txt b/packages/amesos2/src/KLU2/Source/CMakeLists.txt index bb834a60373e..cd0c09eddeac 100644 --- a/packages/amesos2/src/KLU2/Source/CMakeLists.txt +++ b/packages/amesos2/src/KLU2/Source/CMakeLists.txt @@ -61,11 +61,11 @@ SET(SOURCES "") ASSERT_DEFINED(PROJECT_SOURCE_DIR) -INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) # Set headers (for IDEs and installing) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -74,12 +74,12 @@ APPEND_SET(HEADERS # NOTE: Above, we add the XXX_config.h file so that MS Visual Studio # will know to include this file in the dependency analysis -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Include) -INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/AMD/Include) -INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/COLAMD/Include) -INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/BTF/Include) -INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/UFconfig) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Include) +TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/AMD/Include) +TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/COLAMD/Include) +TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/BTF/Include) +TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/UFconfig) APPEND_SET(HEADERS klu2_analyze_given.hpp From 16500d123dc74929625de1d5149e8121584c29e5 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 09:24:32 -0700 Subject: [PATCH 06/78] Anasazi: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/anasazi/epetra/src-rbgen/CMakeLists.txt | 4 ++-- packages/anasazi/epetra/src/CMakeLists.txt | 4 ++-- packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt | 4 ++-- packages/anasazi/src-rbgen/CMakeLists.txt | 2 +- packages/anasazi/src/CMakeLists.txt | 8 ++++---- packages/anasazi/test/CMakeLists.txt | 2 +- packages/anasazi/test/OrthoManager/CMakeLists.txt | 2 +- packages/anasazi/thyra/src/CMakeLists.txt | 4 ++-- packages/anasazi/tpetra/src/CMakeLists.txt | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/anasazi/epetra/src-rbgen/CMakeLists.txt b/packages/anasazi/epetra/src-rbgen/CMakeLists.txt index e656ed7342d6..7e81360f6fb9 100644 --- a/packages/anasazi/epetra/src-rbgen/CMakeLists.txt +++ b/packages/anasazi/epetra/src-rbgen/CMakeLists.txt @@ -12,8 +12,8 @@ SET(HEADERS "") SET(NOINSTALLHEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src-rbgen) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src-rbgen) # Abstract headers APPEND_SET(HEADERS diff --git a/packages/anasazi/epetra/src/CMakeLists.txt b/packages/anasazi/epetra/src/CMakeLists.txt index 31808b60d7cc..ccfdd298d0a8 100644 --- a/packages/anasazi/epetra/src/CMakeLists.txt +++ b/packages/anasazi/epetra/src/CMakeLists.txt @@ -19,7 +19,7 @@ CONFIGURE_FILE("${Trilinos_SOURCE_DIR}/packages/Trilinos_DLLExportMacro.h.in" SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}epetra_DLLExportMacro.h @@ -29,7 +29,7 @@ APPEND_SET(HEADERS # Core Files # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS AnasaziEpetraAdapter.hpp diff --git a/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt b/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt index 4f8634ddb410..0677098dd017 100644 --- a/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt +++ b/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt @@ -19,7 +19,7 @@ CONFIGURE_FILE("${Trilinos_SOURCE_DIR}/packages/Trilinos_DLLExportMacro.h.in" SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}epetra_ModeLaplace_DLLExportMacro.h ) @@ -28,7 +28,7 @@ APPEND_SET(HEADERS # Core Files # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS BlockPCGSolver.h diff --git a/packages/anasazi/src-rbgen/CMakeLists.txt b/packages/anasazi/src-rbgen/CMakeLists.txt index d27665c2de73..b7aa155894f1 100644 --- a/packages/anasazi/src-rbgen/CMakeLists.txt +++ b/packages/anasazi/src-rbgen/CMakeLists.txt @@ -12,7 +12,7 @@ SET(HEADERS "") SET(NOINSTALLHEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Abstract headers APPEND_SET(HEADERS diff --git a/packages/anasazi/src/CMakeLists.txt b/packages/anasazi/src/CMakeLists.txt index 2442699c34d5..d882ecc53cec 100644 --- a/packages/anasazi/src/CMakeLists.txt +++ b/packages/anasazi/src/CMakeLists.txt @@ -36,7 +36,7 @@ CONFIGURE_FILE("${Trilinos_SOURCE_DIR}/packages/Trilinos_DLLExportMacro.h.in" SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -47,7 +47,7 @@ SET(HEADERS ${HEADERS} # Core Files # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS AnasaziBasicEigenproblem.hpp @@ -149,7 +149,7 @@ APPEND_SET(HEADERS ASSERT_DEFINED(Anasazi_ENABLE_ThyraCore) IF (Anasazi_ENABLE_ThyraCore) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../thyra/src) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../thyra/src) APPEND_SET(HEADERS ../thyra/src/AnasaziThyraAdapter.hpp ../thyra/src/AnasaziThyraDebugAdapter.hpp @@ -158,7 +158,7 @@ ENDIF() ASSERT_DEFINED(Anasazi_ENABLE_Tpetra) IF (Anasazi_ENABLE_Tpetra) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../tpetra/src) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../tpetra/src) # The AnasaziTpetraAdapter headers are already pulled in by # <./packages/anasazi/tpetra/src/CMakeLists.txt>. ENDIF() diff --git a/packages/anasazi/test/CMakeLists.txt b/packages/anasazi/test/CMakeLists.txt index 2c9310b768e6..51adf9fd4f96 100644 --- a/packages/anasazi/test/CMakeLists.txt +++ b/packages/anasazi/test/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/MVOPTester) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/MVOPTester) ADD_SUBDIRECTORY(MVOPTester) ADD_SUBDIRECTORY(OrthoManager) diff --git a/packages/anasazi/test/OrthoManager/CMakeLists.txt b/packages/anasazi/test/OrthoManager/CMakeLists.txt index 06826bd9a689..99da387d570e 100644 --- a/packages/anasazi/test/OrthoManager/CMakeLists.txt +++ b/packages/anasazi/test/OrthoManager/CMakeLists.txt @@ -6,7 +6,7 @@ IF (${PACKAGE_NAME}_ENABLE_Triutils) # FIXME (mfh 04 Aug 2010) IF ({${PACKAGE_NAME}_ENABLE_COMPLEX) - INCLUDE_DIRECTORIES(../MVOPTester) + TRIBITS_INCLUDE_DIRECTORIES(../MVOPTester) TRIBITS_ADD_EXECUTABLE_AND_TEST( OrthoManagerComplexTester diff --git a/packages/anasazi/thyra/src/CMakeLists.txt b/packages/anasazi/thyra/src/CMakeLists.txt index 2f59e80fa9e4..796154d065d6 100644 --- a/packages/anasazi/thyra/src/CMakeLists.txt +++ b/packages/anasazi/thyra/src/CMakeLists.txt @@ -17,7 +17,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -27,7 +27,7 @@ SET(HEADERS ${HEADERS} # Core Files # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS AnasaziBasicEigenproblem.hpp diff --git a/packages/anasazi/tpetra/src/CMakeLists.txt b/packages/anasazi/tpetra/src/CMakeLists.txt index 37be72368a39..6660448f0b39 100644 --- a/packages/anasazi/tpetra/src/CMakeLists.txt +++ b/packages/anasazi/tpetra/src/CMakeLists.txt @@ -15,13 +15,13 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # # Core Files # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS AnasaziTpetraAdapter.hpp From f6cca4cc55de9f34d5928b559021a7d80702378a Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 09:24:58 -0700 Subject: [PATCH 07/78] AztecOO: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/aztecoo/src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/aztecoo/src/CMakeLists.txt b/packages/aztecoo/src/CMakeLists.txt index 4e9738592059..b27c6f58a3b4 100644 --- a/packages/aztecoo/src/CMakeLists.txt +++ b/packages/aztecoo/src/CMakeLists.txt @@ -27,13 +27,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # C files From 3dcb92dd9444979ed78d7123ab3c98b1778c7a6d Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 09:26:34 -0700 Subject: [PATCH 08/78] Belos: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/belos/doc/parameterList/CMakeLists.txt | 2 +- packages/belos/epetra/src/CMakeLists.txt | 4 ++-- packages/belos/kokkos/example/CMakeLists.txt | 2 +- packages/belos/kokkos/src/CMakeLists.txt | 4 ++-- packages/belos/kokkos/test/CMakeLists.txt | 2 +- packages/belos/src/CMakeLists.txt | 4 ++-- packages/belos/test/GCRODR/CMakeLists.txt | 4 ++-- packages/belos/tpetra/src/CMakeLists.txt | 4 ++-- packages/belos/xpetra/src/CMakeLists.txt | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/belos/doc/parameterList/CMakeLists.txt b/packages/belos/doc/parameterList/CMakeLists.txt index b307d66ad464..b5d958c7f771 100644 --- a/packages/belos/doc/parameterList/CMakeLists.txt +++ b/packages/belos/doc/parameterList/CMakeLists.txt @@ -2,7 +2,7 @@ IF (${PACKAGE_NAME}_ENABLE_Tpetra) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../tpetra/src ) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../tpetra/src ) # Create the ValidParameters executable TRIBITS_ADD_EXECUTABLE( diff --git a/packages/belos/epetra/src/CMakeLists.txt b/packages/belos/epetra/src/CMakeLists.txt index 1f9c2c6a29d4..0f658527713c 100644 --- a/packages/belos/epetra/src/CMakeLists.txt +++ b/packages/belos/epetra/src/CMakeLists.txt @@ -15,13 +15,13 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # # Core Files # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS BelosEpetraAdapter.hpp diff --git a/packages/belos/kokkos/example/CMakeLists.txt b/packages/belos/kokkos/example/CMakeLists.txt index b493959ea9af..2539e714db0c 100644 --- a/packages/belos/kokkos/example/CMakeLists.txt +++ b/packages/belos/kokkos/example/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${Belos_SOURCE_DIR}/kokkos/src) +TRIBITS_INCLUDE_DIRECTORIES(${Belos_SOURCE_DIR}/kokkos/src) TRIBITS_ADD_EXECUTABLE_AND_TEST( Kokkos_BlockGmresEx diff --git a/packages/belos/kokkos/src/CMakeLists.txt b/packages/belos/kokkos/src/CMakeLists.txt index 4d8c6851c1f1..3308e7f45a4d 100644 --- a/packages/belos/kokkos/src/CMakeLists.txt +++ b/packages/belos/kokkos/src/CMakeLists.txt @@ -15,13 +15,13 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # # Core Files # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS BelosKokkosAdapter.hpp diff --git a/packages/belos/kokkos/test/CMakeLists.txt b/packages/belos/kokkos/test/CMakeLists.txt index 2a37af1bd697..68b112e0894f 100644 --- a/packages/belos/kokkos/test/CMakeLists.txt +++ b/packages/belos/kokkos/test/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${Belos_SOURCE_DIR}/kokkos/src) +TRIBITS_INCLUDE_DIRECTORIES(${Belos_SOURCE_DIR}/kokkos/src) TRIBITS_ADD_EXECUTABLE_AND_TEST( KokkosMVOPTest diff --git a/packages/belos/src/CMakeLists.txt b/packages/belos/src/CMakeLists.txt index 664dc48f770f..36df2b008ce6 100644 --- a/packages/belos/src/CMakeLists.txt +++ b/packages/belos/src/CMakeLists.txt @@ -13,13 +13,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # CORE APPEND_SET(HEADERS diff --git a/packages/belos/test/GCRODR/CMakeLists.txt b/packages/belos/test/GCRODR/CMakeLists.txt index db62c961fb79..fe9e1488a034 100644 --- a/packages/belos/test/GCRODR/CMakeLists.txt +++ b/packages/belos/test/GCRODR/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../MVOPTester) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../MVOPTester) ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Triutils) IF (${PACKAGE_NAME}_ENABLE_Triutils) @@ -8,7 +8,7 @@ IF (${PACKAGE_NAME}_ENABLE_Triutils) ASSERT_DEFINED(Teuchos_ENABLE_COMPLEX) IF(Teuchos_ENABLE_COMPLEX) - INCLUDE_DIRECTORIES(../MVOPTester) + TRIBITS_INCLUDE_DIRECTORIES(../MVOPTester) TRIBITS_ADD_EXECUTABLE_AND_TEST( gcrodr_complex_hb diff --git a/packages/belos/tpetra/src/CMakeLists.txt b/packages/belos/tpetra/src/CMakeLists.txt index e0062875cc05..0abb87db2e00 100644 --- a/packages/belos/tpetra/src/CMakeLists.txt +++ b/packages/belos/tpetra/src/CMakeLists.txt @@ -15,13 +15,13 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # # Core Files # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS BelosMultiVecTraits_Tpetra.hpp diff --git a/packages/belos/xpetra/src/CMakeLists.txt b/packages/belos/xpetra/src/CMakeLists.txt index 65897f3b1a0d..b72027256ee8 100644 --- a/packages/belos/xpetra/src/CMakeLists.txt +++ b/packages/belos/xpetra/src/CMakeLists.txt @@ -15,13 +15,13 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # # Core Files # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS BelosXpetraAdapter.hpp From d61e69ee051d7548ec8835bfd66086122bbb9224 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 09:30:43 -0700 Subject: [PATCH 09/78] SuiteSparse: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- .../SuiteSparse/src/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/common/auxiliarySoftware/SuiteSparse/src/CMakeLists.txt b/packages/common/auxiliarySoftware/SuiteSparse/src/CMakeLists.txt index 76cdf26bc963..a358b6f5e84a 100644 --- a/packages/common/auxiliarySoftware/SuiteSparse/src/CMakeLists.txt +++ b/packages/common/auxiliarySoftware/SuiteSparse/src/CMakeLists.txt @@ -21,14 +21,14 @@ SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/AMD/Include) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/BTF/Include) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/CAMD/Include) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/CCOLAMD/Include) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/COLAMD/Include) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/KLU/Include) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/UFconfig) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/AMD/Include) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/BTF/Include) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/CAMD/Include) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/CCOLAMD/Include) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/COLAMD/Include) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/KLU/Include) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/UFconfig) file(GLOB AMD_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/AMD/Include/*.h) file(GLOB BTF_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/BTF/Include/*.h) From 766ad63563a66b8302ad1493a390a250e30b3f84 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 09:31:35 -0700 Subject: [PATCH 10/78] Compadre: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/compadre/examples/CMakeLists.tribits.cmake | 2 +- packages/compadre/src/CMakeLists.tribits.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/compadre/examples/CMakeLists.tribits.cmake b/packages/compadre/examples/CMakeLists.tribits.cmake index a6ee5a92d0ef..523f31cae25d 100644 --- a/packages/compadre/examples/CMakeLists.tribits.cmake +++ b/packages/compadre/examples/CMakeLists.tribits.cmake @@ -1,4 +1,4 @@ -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) #tribits_add_executable( # UnitTests diff --git a/packages/compadre/src/CMakeLists.tribits.cmake b/packages/compadre/src/CMakeLists.tribits.cmake index c714908c844c..8a7511905816 100644 --- a/packages/compadre/src/CMakeLists.tribits.cmake +++ b/packages/compadre/src/CMakeLists.tribits.cmake @@ -11,13 +11,13 @@ bob_config_header(${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_Config.h ${PACKAGE set(HEADERS "") set(SOURCES "") -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) set(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_Config.h ) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) append_glob(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) list(REMOVE_ITEM HEADERS From f6d909193335b8fd4b4b4455a3015053dd98b5aa Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 09:36:11 -0700 Subject: [PATCH 11/78] Domi: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/domi/doc/parameterList/CMakeLists.txt | 2 +- packages/domi/src/CMakeLists.txt | 4 ++-- packages/domi/test/MDArray/CMakeLists.txt | 2 +- packages/domi/test/MDComm/CMakeLists.txt | 2 +- packages/domi/test/MDMap/CMakeLists.txt | 2 +- packages/domi/test/MDVector/CMakeLists.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/domi/doc/parameterList/CMakeLists.txt b/packages/domi/doc/parameterList/CMakeLists.txt index eb835efbac0a..6a5d03b56fde 100644 --- a/packages/domi/doc/parameterList/CMakeLists.txt +++ b/packages/domi/doc/parameterList/CMakeLists.txt @@ -42,7 +42,7 @@ # *********************************************************************** # @HEADER -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Create the ValidParameters executable TRIBITS_ADD_EXECUTABLE( diff --git a/packages/domi/src/CMakeLists.txt b/packages/domi/src/CMakeLists.txt index 31e31e2a08d3..91776dfcb0e2 100644 --- a/packages/domi/src/CMakeLists.txt +++ b/packages/domi/src/CMakeLists.txt @@ -73,8 +73,8 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) # # Set the include directories -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # Define the header and source files (and directories) diff --git a/packages/domi/test/MDArray/CMakeLists.txt b/packages/domi/test/MDArray/CMakeLists.txt index cb78a965ddcf..7874d2c5e660 100644 --- a/packages/domi/test/MDArray/CMakeLists.txt +++ b/packages/domi/test/MDArray/CMakeLists.txt @@ -44,7 +44,7 @@ #INCLUDE(TribitsCopyFilesToBinaryDir) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Unit test the Slice class TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/domi/test/MDComm/CMakeLists.txt b/packages/domi/test/MDComm/CMakeLists.txt index 721542809a95..c2aa3f3f66ba 100644 --- a/packages/domi/test/MDComm/CMakeLists.txt +++ b/packages/domi/test/MDComm/CMakeLists.txt @@ -44,7 +44,7 @@ #INCLUDE(TribitsCopyFilesToBinaryDir) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Create the MDComm unit test executable TRIBITS_ADD_EXECUTABLE( diff --git a/packages/domi/test/MDMap/CMakeLists.txt b/packages/domi/test/MDMap/CMakeLists.txt index f464419e7dcb..a18f050171c9 100644 --- a/packages/domi/test/MDMap/CMakeLists.txt +++ b/packages/domi/test/MDMap/CMakeLists.txt @@ -44,7 +44,7 @@ #INCLUDE(TribitsCopyFilesToBinaryDir) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Create the MDMap unit test executable TRIBITS_ADD_EXECUTABLE( diff --git a/packages/domi/test/MDVector/CMakeLists.txt b/packages/domi/test/MDVector/CMakeLists.txt index d497e29ea175..dfec34d53a32 100644 --- a/packages/domi/test/MDVector/CMakeLists.txt +++ b/packages/domi/test/MDVector/CMakeLists.txt @@ -44,7 +44,7 @@ #INCLUDE(TribitsCopyFilesToBinaryDir) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Create the MDVector unit test executable TRIBITS_ADD_EXECUTABLE( From 073459e2234ea07d35ad6a40ae7af7227c684258 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 10:00:26 -0700 Subject: [PATCH 12/78] Epetra: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/epetra/CMakeLists.txt | 2 +- packages/epetra/src/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/epetra/CMakeLists.txt b/packages/epetra/CMakeLists.txt index 91727f9c3167..72e200ce0acf 100644 --- a/packages/epetra/CMakeLists.txt +++ b/packages/epetra/CMakeLists.txt @@ -70,7 +70,7 @@ IF(TPL_ENABLE_MKL) OFF ) IF(Epetra_ENABLE_MKL_SPARSE) - INCLUDE_DIRECTORIES(${TPL_MKL_INCLUDE_DIRS}) + TRIBITS_INCLUDE_DIRECTORIES(${TPL_MKL_INCLUDE_DIRS}) TRIBITS_ADD_OPTION_AND_DEFINE(${PACKAGE_NAME}_DISABLE_MKL_SPARSE_MM Epetra_DISABLE_MKL_SPARSE_MM diff --git a/packages/epetra/src/CMakeLists.txt b/packages/epetra/src/CMakeLists.txt index 508dd7e27ff9..427a313a2901 100644 --- a/packages/epetra/src/CMakeLists.txt +++ b/packages/epetra/src/CMakeLists.txt @@ -26,7 +26,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) # Set the base Trilinos directory in order to find Trilinos_version.h ASSERT_DEFINED(PROJECT_SOURCE_DIR) -INCLUDE_DIRECTORIES(${Trilinos_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_BINARY_DIR}) SET(CURRENT_PACKAGE EPETRA) CONFIGURE_FILE("${Trilinos_SOURCE_DIR}/packages/Trilinos_DLLExportMacro.h.in" @@ -39,14 +39,14 @@ CONFIGURE_FILE("${Trilinos_SOURCE_DIR}/packages/Trilinos_DLLExportMacro.h.in" SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_DLLExportMacro.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS ${HEADERS} Epetra_BLAS.h From cd3921a9dbd5637f1c1401819acc393716b540f9 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 10:00:59 -0700 Subject: [PATCH 13/78] EpetraExt: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/epetraext/src/CMakeLists.txt | 26 +++++++++++++------------- packages/epetraext/test/CMakeLists.txt | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/epetraext/src/CMakeLists.txt b/packages/epetraext/src/CMakeLists.txt index 0e0b05695f51..f74358217703 100644 --- a/packages/epetraext/src/CMakeLists.txt +++ b/packages/epetraext/src/CMakeLists.txt @@ -20,12 +20,12 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS ${HEADERS} EpetraExt_ConfigDefs.h @@ -50,7 +50,7 @@ SET(SOURCES ${SOURCES} IF (${PACKAGE_NAME}_BUILD_TRANSFORM) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/transform) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/transform) SET(HEADERS ${HEADERS} transform/EpetraExt_SubCopy_CrsMatrix.h @@ -121,7 +121,7 @@ ENDIF() IF (${PACKAGE_NAME}_BUILD_BTF) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/btf) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/btf) SET(HEADERS ${HEADERS} btf/EpetraExt_BTF_CrsGraph.h @@ -157,7 +157,7 @@ ENDIF() IF (${PACKAGE_NAME}_BUILD_INOUT) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/inout) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/inout) SET(HEADERS ${HEADERS} inout/EpetraExt_mmio.h @@ -217,7 +217,7 @@ ENDIF() IF (${PACKAGE_NAME}_BUILD_COLORING) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/coloring) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/coloring) SET(HEADERS ${HEADERS} coloring/EpetraExt_MapColoring.h @@ -238,7 +238,7 @@ ENDIF() IF (${PACKAGE_NAME}_BUILD_MATLAB) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/matlab) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/matlab) SET(HEADERS ${HEADERS} matlab/EpetraExt_MatlabEngine.h @@ -262,7 +262,7 @@ ENDIF() IF (${PACKAGE_NAME}_BUILD_MODEL_EVALUATOR) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/model_evaluator) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/model_evaluator) SET(HEADERS ${HEADERS} model_evaluator/EpetraExt_ModelEvaluator.h @@ -283,7 +283,7 @@ ENDIF() IF (${PACKAGE_NAME}_BUILD_BLOCK) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/block) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/block) SET(HEADERS ${HEADERS} block/EpetraExt_BlockCrsMatrix.h @@ -328,7 +328,7 @@ ENDIF() IF (${PACKAGE_NAME}_BUILD_RESTRICT) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/restrict) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/restrict) SET(HEADERS ${HEADERS} restrict/EpetraExt_RestrictedMultiVectorWrapper.h @@ -348,7 +348,7 @@ ENDIF() IF (${PACKAGE_NAME}_USING_PETSC) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/petsc) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/petsc) SET(HEADERS ${HEADERS} petsc/EpetraExt_PETScAIJMatrix.h @@ -366,7 +366,7 @@ ENDIF() ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_HYPRE) IF (${PACKAGE_NAME}_ENABLE_HYPRE) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/hypre) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/hypre) SET(HEADERS ${HEADERS} hypre/EpetraExt_HypreIJMatrix.h @@ -386,7 +386,7 @@ IF (${PROJECT_NAME}_ENABLE_PyTrilinos) FIND_PACKAGE(PythonInclude REQUIRED) - INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) + TRIBITS_INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) ENDIF() diff --git a/packages/epetraext/test/CMakeLists.txt b/packages/epetraext/test/CMakeLists.txt index ec4c87c1dde7..d1793b2f99cb 100644 --- a/packages/epetraext/test/CMakeLists.txt +++ b/packages/epetraext/test/CMakeLists.txt @@ -1,7 +1,7 @@ # Compile against epetra_test_err.h in all tests? -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (${PACKAGE_NAME}_BUILD_TRANSFORM) From f155dc8a4f164d65438bcd13e7850fd5745f72b9 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 10:33:29 -0700 Subject: [PATCH 14/78] FEI: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/fei/base/CMakeLists.txt | 6 +++--- packages/fei/support-Trilinos/CMakeLists.txt | 6 +++--- packages/fei/unit_tests/CMakeLists.txt | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/fei/base/CMakeLists.txt b/packages/fei/base/CMakeLists.txt index abd14e3820ec..01e9f222e515 100644 --- a/packages/fei/base/CMakeLists.txt +++ b/packages/fei/base/CMakeLists.txt @@ -17,14 +17,14 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) # # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp *.h) diff --git a/packages/fei/support-Trilinos/CMakeLists.txt b/packages/fei/support-Trilinos/CMakeLists.txt index 381c2bc56fd6..30bcd746a3a8 100644 --- a/packages/fei/support-Trilinos/CMakeLists.txt +++ b/packages/fei/support-Trilinos/CMakeLists.txt @@ -17,8 +17,8 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -28,7 +28,7 @@ SET(HEADERS ${HEADERS} # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES *.cpp) diff --git a/packages/fei/unit_tests/CMakeLists.txt b/packages/fei/unit_tests/CMakeLists.txt index a35d476c0a2e..c76c624b2c01 100644 --- a/packages/fei/unit_tests/CMakeLists.txt +++ b/packages/fei/unit_tests/CMakeLists.txt @@ -1,10 +1,10 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../base) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../support-Trilinos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../base) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../support-Trilinos) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) From 63d7c63d09d3aa2a325590c07dc202774548994a Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 11:44:04 -0700 Subject: [PATCH 15/78] Galeri: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/galeri/src-epetra/CMakeLists.txt | 12 ++++++------ packages/galeri/src-xpetra/CMakeLists.txt | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/galeri/src-epetra/CMakeLists.txt b/packages/galeri/src-epetra/CMakeLists.txt index c6edd3204c2d..9237c6a51677 100644 --- a/packages/galeri/src-epetra/CMakeLists.txt +++ b/packages/galeri/src-epetra/CMakeLists.txt @@ -20,8 +20,8 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../headers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../headers) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -31,7 +31,7 @@ SET(HEADERS ${HEADERS} # src # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS ${HEADERS} ../headers/Galeri_ConfigDefs.h @@ -64,7 +64,7 @@ ENDIF() # src/Maps # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Maps) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Maps) SET(HEADERS ${HEADERS} Maps/Galeri_Linear.h @@ -79,7 +79,7 @@ SET(HEADERS ${HEADERS} # src/CrsMatrices # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/CRSMatrices) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/CRSMatrices) SET(HEADERS ${HEADERS} CrsMatrices/Galeri_BigCross2D.h @@ -113,7 +113,7 @@ SET(HEADERS ${HEADERS} # src/FiniteElements # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/FiniteElements) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/FiniteElements) SET(HEADERS ${HEADERS} FiniteElements/Galeri_AbstractGrid.h diff --git a/packages/galeri/src-xpetra/CMakeLists.txt b/packages/galeri/src-xpetra/CMakeLists.txt index 45ad6c367fe1..e407ea8ec3be 100644 --- a/packages/galeri/src-xpetra/CMakeLists.txt +++ b/packages/galeri/src-xpetra/CMakeLists.txt @@ -3,11 +3,11 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src-epetra) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../src-epetra) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../headers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src-epetra) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../src-epetra) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../headers) APPEND_SET(HEADERS From f12db50d674de650ee565ecdeab5c851dca43d12 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 11:44:34 -0700 Subject: [PATCH 16/78] Ifpack: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/ifpack/src/CMakeLists.txt | 12 ++++++------ packages/ifpack/test/AztecOO/CMakeLists.txt | 4 ++-- packages/ifpack/test/AztecOO_LL/CMakeLists.txt | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/ifpack/src/CMakeLists.txt b/packages/ifpack/src/CMakeLists.txt index 8d2f708abfec..0d0f320f675b 100644 --- a/packages/ifpack/src/CMakeLists.txt +++ b/packages/ifpack/src/CMakeLists.txt @@ -37,13 +37,13 @@ ENDIF () SET(HEADERS) SET(SOURCES) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS ${HEADERS} Ifpack_ConfigDefs.h @@ -187,7 +187,7 @@ ENDIF() IF (${PACKAGE_NAME}_ENABLE_Amesos) - INCLUDE_DIRECTORIES( + TRIBITS_INCLUDE_DIRECTORIES( ${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/AMD/Include ${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/UFconfig ) @@ -205,7 +205,7 @@ IF (${PACKAGE_NAME}_ENABLE_Amesos) ENDIF() IF (${PACKAGE_NAME}_ENABLE_Euclid) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/euclid) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/euclid) SET(HEADERS ${HEADERS} euclid/Euclid_dh.h @@ -275,7 +275,7 @@ IF (${PACKAGE_NAME}_ENABLE_Euclid) ENDIF() IF (${PACKAGE_NAME}_ENABLE_SUPPORTGRAPH) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/supportgraph) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/supportgraph) SET (HEADERS ${HEADERS} supportgraph/Ifpack_SupportGraph.h @@ -296,7 +296,7 @@ APPEND_SET(${PACKAGE_NAME}_EXPERIMENTAL_SOURCES ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Experimental) IF(${PACKAGE_NAME}_ENABLE_Experimental) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/supportgraph) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/supportgraph) # # Add experimental files to HEADERS and SOURCES. # diff --git a/packages/ifpack/test/AztecOO/CMakeLists.txt b/packages/ifpack/test/AztecOO/CMakeLists.txt index c147906de95c..746c9ee6d08c 100644 --- a/packages/ifpack/test/AztecOO/CMakeLists.txt +++ b/packages/ifpack/test/AztecOO/CMakeLists.txt @@ -1,8 +1,8 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) diff --git a/packages/ifpack/test/AztecOO_LL/CMakeLists.txt b/packages/ifpack/test/AztecOO_LL/CMakeLists.txt index cfb437736aac..f3f3042905c2 100644 --- a/packages/ifpack/test/AztecOO_LL/CMakeLists.txt +++ b/packages/ifpack/test/AztecOO_LL/CMakeLists.txt @@ -1,8 +1,8 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) From 872b8a51ff900e345bc3788c88b535a84bfe5006 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 11:44:55 -0700 Subject: [PATCH 17/78] Ifpack2: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/ifpack2/example/CMakeLists.txt | 2 +- packages/ifpack2/src/CMakeLists.txt | 2 +- .../ifpack2/test/belos/AdditiveSchwarzRILUK/CMakeLists.txt | 2 +- packages/ifpack2/test/belos/CMakeLists.txt | 2 +- packages/ifpack2/test/vanka/CMakeLists.txt | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/ifpack2/example/CMakeLists.txt b/packages/ifpack2/example/CMakeLists.txt index 803792c8dbea..5573b6591c92 100644 --- a/packages/ifpack2/example/CMakeLists.txt +++ b/packages/ifpack2/example/CMakeLists.txt @@ -1,5 +1,5 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) TRIBITS_ADD_EXECUTABLE( ex1 diff --git a/packages/ifpack2/src/CMakeLists.txt b/packages/ifpack2/src/CMakeLists.txt index d16b67b28e6c..5051c20a2361 100644 --- a/packages/ifpack2/src/CMakeLists.txt +++ b/packages/ifpack2/src/CMakeLists.txt @@ -196,7 +196,7 @@ TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # SupportGraph requires some TPLs and options to be enabled. IF (${PACKAGE_NAME}_ENABLE_Experimental AND ${PACKAGE_NAME}_ENABLE_Lemon AND ${PACKAGE_NAME}_ENABLE_Amesos2 AND ${PACKAGE_NAME}_ENABLE_Cholmod) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}/supportgraph) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/supportgraph) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/supportgraph) SET(HEADERS ${HEADERS} supportgraph/Ifpack2_SupportGraph_decl.hpp supportgraph/Ifpack2_SupportGraph_def.hpp diff --git a/packages/ifpack2/test/belos/AdditiveSchwarzRILUK/CMakeLists.txt b/packages/ifpack2/test/belos/AdditiveSchwarzRILUK/CMakeLists.txt index 0fc6e497d3e8..29e2017d892c 100644 --- a/packages/ifpack2/test/belos/AdditiveSchwarzRILUK/CMakeLists.txt +++ b/packages/ifpack2/test/belos/AdditiveSchwarzRILUK/CMakeLists.txt @@ -1,6 +1,6 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( AdditiveSchwarz_RILUK diff --git a/packages/ifpack2/test/belos/CMakeLists.txt b/packages/ifpack2/test/belos/CMakeLists.txt index 7117233c6a38..04a482a25812 100644 --- a/packages/ifpack2/test/belos/CMakeLists.txt +++ b/packages/ifpack2/test/belos/CMakeLists.txt @@ -1,6 +1,6 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) ADD_SUBDIRECTORY(AdditiveSchwarzRILUK) diff --git a/packages/ifpack2/test/vanka/CMakeLists.txt b/packages/ifpack2/test/vanka/CMakeLists.txt index ec5a59f299de..542cd4ae6a84 100644 --- a/packages/ifpack2/test/vanka/CMakeLists.txt +++ b/packages/ifpack2/test/vanka/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) TRIBITS_ADD_EXECUTABLE_AND_TEST( TomVankaTest From f2cd557fc8a7b863dc685942aa0e116d63217263 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 11:45:24 -0700 Subject: [PATCH 18/78] Intrepid: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/intrepid/src/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/intrepid/src/CMakeLists.txt b/packages/intrepid/src/CMakeLists.txt index 296bf127a750..c1958b25c4f4 100644 --- a/packages/intrepid/src/CMakeLists.txt +++ b/packages/intrepid/src/CMakeLists.txt @@ -17,13 +17,13 @@ TRIBITS_CONFIGURE_FILE(Intrepid_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/Intrepid_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # All headers @@ -37,7 +37,7 @@ APPEND_SET(HEADERS # Shared headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Shared) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Shared) APPEND_SET(HEADERS Shared/Intrepid_ArrayToolsDefCloneScale.hpp Shared/Intrepid_ArrayToolsDefContractions.hpp @@ -67,10 +67,10 @@ APPEND_SET(HEADERS # Discretization headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/Integration) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/FunctionSpaceTools) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/Basis) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/TensorProductSpaceTools) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/Integration) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/FunctionSpaceTools) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/Basis) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/TensorProductSpaceTools) APPEND_SET(HEADERS Discretization/Integration/Intrepid_AdaptiveSparseGridInterfaceDef.hpp @@ -220,7 +220,7 @@ APPEND_SET(HEADERS # Cell headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Cell) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Cell) APPEND_SET(HEADERS Cell/Intrepid_CellTools.hpp Cell/Intrepid_CellToolsDef.hpp From ee8e4fc079a09239095b57682cecc29dc0e30b5d Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 11:46:59 -0700 Subject: [PATCH 19/78] Intrepid2: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/intrepid2/perf-test/CMakeLists.txt | 2 +- packages/intrepid2/perf-test/ComputeBasis/CMakeLists.txt | 2 +- .../intrepid2/perf-test/ComputeBasis/Cuda/CMakeLists.txt | 4 ++-- .../intrepid2/perf-test/ComputeBasis/OpenMP/CMakeLists.txt | 4 ++-- .../intrepid2/perf-test/ComputeBasis/Serial/CMakeLists.txt | 4 ++-- packages/intrepid2/perf-test/DynRankView/CMakeLists.txt | 2 +- .../intrepid2/perf-test/DynRankView/Cuda/CMakeLists.txt | 4 ++-- .../intrepid2/perf-test/DynRankView/OpenMP/CMakeLists.txt | 4 ++-- .../intrepid2/perf-test/DynRankView/Serial/CMakeLists.txt | 4 ++-- packages/intrepid2/src/CMakeLists.txt | 6 +++--- packages/intrepid2/unit-test/Cell/CMakeLists.txt | 2 +- .../Discretization/Basis/DeRHAM_HEX_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/DeRHAM_QUAD_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/DeRHAM_TET_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/DeRHAM_TRI_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HCURL_HEX_I1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HCURL_HEX_In_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HCURL_QUAD_I1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HCURL_QUAD_In_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HCURL_TET_I1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HCURL_TET_In_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HCURL_TRI_I1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HCURL_TRI_In_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HCURL_WEDGE_I1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HDIV_HEX_I1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HDIV_HEX_In_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HDIV_QUAD_I1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HDIV_QUAD_In_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HDIV_TET_I1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HDIV_TET_In_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HDIV_TRI_I1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HDIV_TRI_In_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HDIV_WEDGE_I1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_HEX_C1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_HEX_C2_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_HEX_Cn_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_LINE_C1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_LINE_Cn_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_LINE_Cn_FEM_JACOBI/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_PYR_C1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_QUAD_C1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_QUAD_C2_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_QUAD_Cn_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_TET_C1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_TET_C2_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_TET_COMP12_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_TET_Cn_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_TET_Cn_FEM_ORTH/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_TRI_C1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_TRI_C2_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_TRI_Cn_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_TRI_Cn_FEM_ORTH/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_WEDGE_C1_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HGRAD_WEDGE_C2_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HVOL_C0_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HVOL_HEX_Cn_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HVOL_LINE_Cn_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HVOL_QUAD_Cn_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HVOL_TET_Cn_FEM/CMakeLists.txt | 2 +- .../Discretization/Basis/HVOL_TRI_Cn_FEM/CMakeLists.txt | 2 +- .../Discretization/FunctionSpaceTools/CMakeLists.txt | 2 +- .../unit-test/Discretization/Integration/CMakeLists.txt | 2 +- .../intrepid2/unit-test/MonolithicExecutable/CMakeLists.txt | 2 +- packages/intrepid2/unit-test/Orientation/CMakeLists.txt | 2 +- packages/intrepid2/unit-test/Projection/CMakeLists.txt | 2 +- .../intrepid2/unit-test/Shared/ArrayTools/CMakeLists.txt | 2 +- .../intrepid2/unit-test/Shared/PointTools/CMakeLists.txt | 2 +- packages/intrepid2/unit-test/Shared/Polylib/CMakeLists.txt | 2 +- .../unit-test/Shared/RealSpaceTools/CMakeLists.txt | 2 +- .../performance/StructuredIntegration/CMakeLists.txt | 2 +- 70 files changed, 78 insertions(+), 78 deletions(-) diff --git a/packages/intrepid2/perf-test/CMakeLists.txt b/packages/intrepid2/perf-test/CMakeLists.txt index 4c90c57ef130..1fc39aecf0d9 100644 --- a/packages/intrepid2/perf-test/CMakeLists.txt +++ b/packages/intrepid2/perf-test/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ADD_SUBDIRECTORY(ComputeBasis) ADD_SUBDIRECTORY(DynRankView) diff --git a/packages/intrepid2/perf-test/ComputeBasis/CMakeLists.txt b/packages/intrepid2/perf-test/ComputeBasis/CMakeLists.txt index 5ddadcc0cd50..9658e1232597 100644 --- a/packages/intrepid2/perf-test/ComputeBasis/CMakeLists.txt +++ b/packages/intrepid2/perf-test/ComputeBasis/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(Kokkos_ENABLE_SERIAL) ADD_SUBDIRECTORY(Serial) diff --git a/packages/intrepid2/perf-test/ComputeBasis/Cuda/CMakeLists.txt b/packages/intrepid2/perf-test/ComputeBasis/Cuda/CMakeLists.txt index 3efdb02678fa..cc34271a198c 100644 --- a/packages/intrepid2/perf-test/ComputeBasis/Cuda/CMakeLists.txt +++ b/packages/intrepid2/perf-test/ComputeBasis/Cuda/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES "") diff --git a/packages/intrepid2/perf-test/ComputeBasis/OpenMP/CMakeLists.txt b/packages/intrepid2/perf-test/ComputeBasis/OpenMP/CMakeLists.txt index 3efdb02678fa..cc34271a198c 100644 --- a/packages/intrepid2/perf-test/ComputeBasis/OpenMP/CMakeLists.txt +++ b/packages/intrepid2/perf-test/ComputeBasis/OpenMP/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES "") diff --git a/packages/intrepid2/perf-test/ComputeBasis/Serial/CMakeLists.txt b/packages/intrepid2/perf-test/ComputeBasis/Serial/CMakeLists.txt index 3efdb02678fa..cc34271a198c 100644 --- a/packages/intrepid2/perf-test/ComputeBasis/Serial/CMakeLists.txt +++ b/packages/intrepid2/perf-test/ComputeBasis/Serial/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES "") diff --git a/packages/intrepid2/perf-test/DynRankView/CMakeLists.txt b/packages/intrepid2/perf-test/DynRankView/CMakeLists.txt index 3c2750bb9190..69b55c972bed 100644 --- a/packages/intrepid2/perf-test/DynRankView/CMakeLists.txt +++ b/packages/intrepid2/perf-test/DynRankView/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(Kokkos_ENABLE_SERIAL) ADD_SUBDIRECTORY(Serial) diff --git a/packages/intrepid2/perf-test/DynRankView/Cuda/CMakeLists.txt b/packages/intrepid2/perf-test/DynRankView/Cuda/CMakeLists.txt index 458cb62315bb..048e49724335 100644 --- a/packages/intrepid2/perf-test/DynRankView/Cuda/CMakeLists.txt +++ b/packages/intrepid2/perf-test/DynRankView/Cuda/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES "") diff --git a/packages/intrepid2/perf-test/DynRankView/OpenMP/CMakeLists.txt b/packages/intrepid2/perf-test/DynRankView/OpenMP/CMakeLists.txt index 458cb62315bb..048e49724335 100644 --- a/packages/intrepid2/perf-test/DynRankView/OpenMP/CMakeLists.txt +++ b/packages/intrepid2/perf-test/DynRankView/OpenMP/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES "") diff --git a/packages/intrepid2/perf-test/DynRankView/Serial/CMakeLists.txt b/packages/intrepid2/perf-test/DynRankView/Serial/CMakeLists.txt index afcb274528dc..addaa1d469f1 100644 --- a/packages/intrepid2/perf-test/DynRankView/Serial/CMakeLists.txt +++ b/packages/intrepid2/perf-test/DynRankView/Serial/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES "") diff --git a/packages/intrepid2/src/CMakeLists.txt b/packages/intrepid2/src/CMakeLists.txt index 960310c600c2..cca7b476b23f 100644 --- a/packages/intrepid2/src/CMakeLists.txt +++ b/packages/intrepid2/src/CMakeLists.txt @@ -49,11 +49,11 @@ LIST(REMOVE_DUPLICATES INCDIRS) FOREACH(INCDIR ${INCDIRS}) ## MESSAGE( STATUS "INCDIR : " ${INCDIR} ) - INCLUDE_DIRECTORIES(${INCDIR}) + TRIBITS_INCLUDE_DIRECTORIES(${INCDIR}) ENDFOREACH() -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # D) Define the targets for package's library(s) diff --git a/packages/intrepid2/unit-test/Cell/CMakeLists.txt b/packages/intrepid2/unit-test/Cell/CMakeLists.txt index 06dac30b0010..3be30cf0436c 100644 --- a/packages/intrepid2/unit-test/Cell/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Cell/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_HEX_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_HEX_FEM/CMakeLists.txt index 5529d05453c5..b7f2c86eabc9 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_HEX_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_HEX_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_QUAD_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_QUAD_FEM/CMakeLists.txt index 0d28c5e10775..fdc7df24790b 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_QUAD_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_QUAD_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TET_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TET_FEM/CMakeLists.txt index f2e011f36049..67a01d904ea5 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TET_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TET_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TRI_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TRI_FEM/CMakeLists.txt index 17c83d7bb6fa..dc47f75c718f 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TRI_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TRI_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_I1_FEM/CMakeLists.txt index 945499ecaca3..9c85536c8f04 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_In_FEM/CMakeLists.txt index 46f1e06404ee..5e06a09eb454 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_I1_FEM/CMakeLists.txt index 8d312baa49a8..cb69d71df184 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_In_FEM/CMakeLists.txt index 75da846685f7..8755589ff621 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_I1_FEM/CMakeLists.txt index c55825a86240..f5d634954c8f 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_In_FEM/CMakeLists.txt index bc26f191637d..133b3a77868a 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_I1_FEM/CMakeLists.txt index 4444a2e23d59..76766346b5cf 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_In_FEM/CMakeLists.txt index c4eb3e10e148..5ce72d53a974 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_WEDGE_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_WEDGE_I1_FEM/CMakeLists.txt index f420d7c985f3..485e7dfdfadd 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_WEDGE_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_WEDGE_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_I1_FEM/CMakeLists.txt index 921df7b61e41..c8d281bcb49d 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_In_FEM/CMakeLists.txt index 5152c351ccc1..05d15e60e70f 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_I1_FEM/CMakeLists.txt index 36691f2b1336..bcda1ff0b32d 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_In_FEM/CMakeLists.txt index 52de5115eaee..a5b01981d6f6 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_I1_FEM/CMakeLists.txt index b69d69649f72..4ed14e31a822 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_In_FEM/CMakeLists.txt index 6bd08296ed5f..60a34963742f 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_I1_FEM/CMakeLists.txt index 2e91ea9296f6..cfa3c6d7ee13 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_In_FEM/CMakeLists.txt index fe86d0dd9382..0523c74171ea 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_WEDGE_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_WEDGE_I1_FEM/CMakeLists.txt index 1443291acc47..7d6c9a27cd75 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_WEDGE_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_WEDGE_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C1_FEM/CMakeLists.txt index a569545a2326..16379535b189 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C2_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C2_FEM/CMakeLists.txt index d73db74fc767..c55ac04519c7 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C2_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C2_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_Cn_FEM/CMakeLists.txt index c0fb7238f19d..d427a02830a1 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # test diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_C1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_C1_FEM/CMakeLists.txt index 66be084d1d27..8e83e5e79e80 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_C1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_C1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM/CMakeLists.txt index 0173946caa56..5c0294c42d18 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM_JACOBI/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM_JACOBI/CMakeLists.txt index adc0a21103ce..92a682bedd9c 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM_JACOBI/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM_JACOBI/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_PYR_C1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_PYR_C1_FEM/CMakeLists.txt index f5651ca47f51..c8d82611555d 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_PYR_C1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_PYR_C1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C1_FEM/CMakeLists.txt index e6361a704af9..a9044329174d 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C2_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C2_FEM/CMakeLists.txt index a94d9156036a..3df9f211f62d 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C2_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C2_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_Cn_FEM/CMakeLists.txt index cc98f0025934..83c91c7674f8 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # test diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C1_FEM/CMakeLists.txt index 45b3db19f768..52bc6c051780 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C2_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C2_FEM/CMakeLists.txt index 4696782c5f86..6c46e650c119 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C2_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C2_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_COMP12_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_COMP12_FEM/CMakeLists.txt index 2d8ee06a3274..ff36bd2c0a02 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_COMP12_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_COMP12_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM/CMakeLists.txt index 2d689462f31a..fc56c9ac745f 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # test diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM_ORTH/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM_ORTH/CMakeLists.txt index 7c39ab11b1e2..d6b9202d58f9 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM_ORTH/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM_ORTH/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C1_FEM/CMakeLists.txt index ff6f0df4d07e..9afb5b60d8b2 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C2_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C2_FEM/CMakeLists.txt index 4b2d6b4a5190..978408943f4b 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C2_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C2_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM/CMakeLists.txt index 39d5e30bd420..04cb1bcfc9ef 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # test diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM_ORTH/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM_ORTH/CMakeLists.txt index 4c5df63a6501..d13a115f40a8 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM_ORTH/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM_ORTH/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C1_FEM/CMakeLists.txt index 801c8242ed8d..7f8c1848100e 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C2_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C2_FEM/CMakeLists.txt index 933af0e02be4..9de6c70a099c 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C2_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C2_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_C0_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_C0_FEM/CMakeLists.txt index 8c5194b7e52e..35e9be038e07 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_C0_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_C0_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_HEX_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_HEX_Cn_FEM/CMakeLists.txt index 44f65705e1b0..4b64112810e0 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_HEX_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_HEX_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_LINE_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_LINE_Cn_FEM/CMakeLists.txt index 5bb953596def..5ff16a3809c5 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_LINE_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_LINE_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_QUAD_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_QUAD_Cn_FEM/CMakeLists.txt index da53d02dc7cd..9488b23dbbdc 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_QUAD_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_QUAD_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TET_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TET_Cn_FEM/CMakeLists.txt index 43b9c584caca..9cfc6eccf6c1 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TET_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TET_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TRI_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TRI_Cn_FEM/CMakeLists.txt index cb6063487996..512d8e2dcdc3 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TRI_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TRI_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/FunctionSpaceTools/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/FunctionSpaceTools/CMakeLists.txt index bc5626bfb86b..09ef41aa547f 100644 --- a/packages/intrepid2/unit-test/Discretization/FunctionSpaceTools/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/FunctionSpaceTools/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Integration/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Integration/CMakeLists.txt index 0936908bf589..e3b4f2fa13a2 100644 --- a/packages/intrepid2/unit-test/Discretization/Integration/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Integration/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/MonolithicExecutable/CMakeLists.txt b/packages/intrepid2/unit-test/MonolithicExecutable/CMakeLists.txt index 1b5019eb4b80..3b05fd70b8e2 100644 --- a/packages/intrepid2/unit-test/MonolithicExecutable/CMakeLists.txt +++ b/packages/intrepid2/unit-test/MonolithicExecutable/CMakeLists.txt @@ -4,7 +4,7 @@ #FILE(GLOB TEST_SOURCES "*.cpp" ${ETI_SOURCES} ) FILE(GLOB TEST_SOURCES "*.cpp") -INCLUDE_DIRECTORIES("../../assembly-examples") +TRIBITS_INCLUDE_DIRECTORIES("../../assembly-examples") TRIBITS_ADD_EXECUTABLE_AND_TEST( Intrepid2_Tests diff --git a/packages/intrepid2/unit-test/Orientation/CMakeLists.txt b/packages/intrepid2/unit-test/Orientation/CMakeLists.txt index e2c895af3c03..4ed6bae13257 100644 --- a/packages/intrepid2/unit-test/Orientation/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Orientation/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Projection/CMakeLists.txt b/packages/intrepid2/unit-test/Projection/CMakeLists.txt index 59edeef82e45..0dd72ae7ec25 100644 --- a/packages/intrepid2/unit-test/Projection/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Projection/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Shared/ArrayTools/CMakeLists.txt b/packages/intrepid2/unit-test/Shared/ArrayTools/CMakeLists.txt index fba6dceeb8be..b7fa5aca6a9d 100644 --- a/packages/intrepid2/unit-test/Shared/ArrayTools/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Shared/ArrayTools/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(Intrepid2_TEST_ETI_FILE "test_01;test_02;test_03;test_04;test_05") diff --git a/packages/intrepid2/unit-test/Shared/PointTools/CMakeLists.txt b/packages/intrepid2/unit-test/Shared/PointTools/CMakeLists.txt index 1e721c9ba703..08f122a52785 100644 --- a/packages/intrepid2/unit-test/Shared/PointTools/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Shared/PointTools/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(Intrepid2_TEST_ETI_FILE "test_01") diff --git a/packages/intrepid2/unit-test/Shared/Polylib/CMakeLists.txt b/packages/intrepid2/unit-test/Shared/Polylib/CMakeLists.txt index d251e33e3b5b..364cf1da008b 100644 --- a/packages/intrepid2/unit-test/Shared/Polylib/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Shared/Polylib/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(Intrepid2_TEST_ETI_FILE "test_01") diff --git a/packages/intrepid2/unit-test/Shared/RealSpaceTools/CMakeLists.txt b/packages/intrepid2/unit-test/Shared/RealSpaceTools/CMakeLists.txt index 7d54c87b93fb..c32dccfbd94b 100644 --- a/packages/intrepid2/unit-test/Shared/RealSpaceTools/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Shared/RealSpaceTools/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(Intrepid2_TEST_ETI_FILE "test_01") diff --git a/packages/intrepid2/unit-test/performance/StructuredIntegration/CMakeLists.txt b/packages/intrepid2/unit-test/performance/StructuredIntegration/CMakeLists.txt index 86db43427c93..9cd20e448e41 100644 --- a/packages/intrepid2/unit-test/performance/StructuredIntegration/CMakeLists.txt +++ b/packages/intrepid2/unit-test/performance/StructuredIntegration/CMakeLists.txt @@ -2,7 +2,7 @@ SET(SOURCES "") FILE(GLOB SOURCES *.cpp) -INCLUDE_DIRECTORIES("../../../assembly-examples") +TRIBITS_INCLUDE_DIRECTORIES("../../../assembly-examples") SET(LIBRARIES intrepid2) From d1f0b3d8b201b53ae27f38bc080a4b604ec5ef02 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 11:47:30 -0700 Subject: [PATCH 20/78] Isorropia: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/isorropia/src/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/isorropia/src/CMakeLists.txt b/packages/isorropia/src/CMakeLists.txt index 041a5f0dc60d..d275c4f717f2 100644 --- a/packages/isorropia/src/CMakeLists.txt +++ b/packages/isorropia/src/CMakeLists.txt @@ -21,13 +21,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS) SET(SOURCES) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS ${HEADERS} Isorropia_CostDescriber.hpp @@ -52,8 +52,8 @@ SET(SOURCES ${SOURCES} # src/epetra # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../utils) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../utils) SET(HEADERS ${HEADERS} epetra/Isorropia_EpetraCostDescriber.hpp @@ -85,7 +85,7 @@ SET(SOURCES ${SOURCES} # zoltan -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra/zoltanLib) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra/zoltanLib) SET(HEADERS ${HEADERS} epetra/zoltanLib/QueryObject.hpp From fc73a6dcb58608398b14f4c3ab45f21ef5e80f38 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 11:48:24 -0700 Subject: [PATCH 21/78] Komplex: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/komplex/src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/komplex/src/CMakeLists.txt b/packages/komplex/src/CMakeLists.txt index 21be6587708c..c27ce2b51a3f 100644 --- a/packages/komplex/src/CMakeLists.txt +++ b/packages/komplex/src/CMakeLists.txt @@ -20,13 +20,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # Core files From 26f3231184e7f788ec713b97b41164c075a966d8 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 11:49:19 -0700 Subject: [PATCH 22/78] Krino: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/krino/delete_small_elements/CMakeLists.txt | 6 +++--- packages/krino/krino/adaptivity_interface/CMakeLists.txt | 6 +++--- packages/krino/krino/krino_lib/CMakeLists.txt | 6 +++--- packages/krino/krino/master_element/CMakeLists.txt | 6 +++--- packages/krino/krino/parser/CMakeLists.txt | 6 +++--- packages/krino/krino/rebalance_utils/CMakeLists.txt | 6 +++--- packages/krino/krino/region/CMakeLists.txt | 6 +++--- packages/krino/krino/unit_tests/CMakeLists.txt | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/krino/delete_small_elements/CMakeLists.txt b/packages/krino/delete_small_elements/CMakeLists.txt index 864b989c454e..b87e219fe689 100644 --- a/packages/krino/delete_small_elements/CMakeLists.txt +++ b/packages/krino/delete_small_elements/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES_MAIN Akri_DeleteSmallElementsMain.cpp) diff --git a/packages/krino/krino/adaptivity_interface/CMakeLists.txt b/packages/krino/krino/adaptivity_interface/CMakeLists.txt index 1f9c7bc10dce..8fbe5842741e 100644 --- a/packages/krino/krino/adaptivity_interface/CMakeLists.txt +++ b/packages/krino/krino/adaptivity_interface/CMakeLists.txt @@ -1,9 +1,9 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES *.cpp) diff --git a/packages/krino/krino/krino_lib/CMakeLists.txt b/packages/krino/krino/krino_lib/CMakeLists.txt index 9be45250590e..0722c1a4f597 100644 --- a/packages/krino/krino/krino_lib/CMakeLists.txt +++ b/packages/krino/krino/krino_lib/CMakeLists.txt @@ -1,9 +1,9 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_OPTION_AND_DEFINE(TPL_ENABLE_yaml-cpp KRINO_HAVE_YAML diff --git a/packages/krino/krino/master_element/CMakeLists.txt b/packages/krino/krino/master_element/CMakeLists.txt index 423cb0f39762..f15d8cba3072 100644 --- a/packages/krino/krino/master_element/CMakeLists.txt +++ b/packages/krino/krino/master_element/CMakeLists.txt @@ -1,9 +1,9 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES *.cpp) diff --git a/packages/krino/krino/parser/CMakeLists.txt b/packages/krino/krino/parser/CMakeLists.txt index a744a59ec7f0..c8d17caa838e 100644 --- a/packages/krino/krino/parser/CMakeLists.txt +++ b/packages/krino/krino/parser/CMakeLists.txt @@ -1,9 +1,9 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES *.cpp) diff --git a/packages/krino/krino/rebalance_utils/CMakeLists.txt b/packages/krino/krino/rebalance_utils/CMakeLists.txt index 45489cb8d620..6d52e824d587 100644 --- a/packages/krino/krino/rebalance_utils/CMakeLists.txt +++ b/packages/krino/krino/rebalance_utils/CMakeLists.txt @@ -1,9 +1,9 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES *.cpp) diff --git a/packages/krino/krino/region/CMakeLists.txt b/packages/krino/krino/region/CMakeLists.txt index 50777ab818a5..1f7625ef3c3a 100644 --- a/packages/krino/krino/region/CMakeLists.txt +++ b/packages/krino/krino/region/CMakeLists.txt @@ -1,9 +1,9 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES *.cpp) diff --git a/packages/krino/krino/unit_tests/CMakeLists.txt b/packages/krino/krino/unit_tests/CMakeLists.txt index 3d92207e1423..a3fb6e6009fa 100644 --- a/packages/krino/krino/unit_tests/CMakeLists.txt +++ b/packages/krino/krino/unit_tests/CMakeLists.txt @@ -1,7 +1,7 @@ -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB SOURCES *.cpp) From ed7c3ff0bdde88d03f66f0d8f4f20b04d7ec4821 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 11:49:35 -0700 Subject: [PATCH 23/78] MiniTensor: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/minitensor/src/CMakeLists.txt | 2 +- packages/minitensor/test/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/minitensor/src/CMakeLists.txt b/packages/minitensor/src/CMakeLists.txt index 3d280f99d0bd..95bbe00345ea 100644 --- a/packages/minitensor/src/CMakeLists.txt +++ b/packages/minitensor/src/CMakeLists.txt @@ -1,5 +1,5 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS "") SET(SOURCES "") diff --git a/packages/minitensor/test/CMakeLists.txt b/packages/minitensor/test/CMakeLists.txt index 8bd0bac6bc7f..2fe9aeefe900 100644 --- a/packages/minitensor/test/CMakeLists.txt +++ b/packages/minitensor/test/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( Test_01 From 0f403d2dcb861153eb84963002565e27cd5af30b Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 11:50:14 -0700 Subject: [PATCH 24/78] ML: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/ml/matlab/CMakeLists.txt | 6 +++--- packages/ml/src/CMakeLists.txt | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/ml/matlab/CMakeLists.txt b/packages/ml/matlab/CMakeLists.txt index 570ad3648bd5..5d03ed431323 100644 --- a/packages/ml/matlab/CMakeLists.txt +++ b/packages/ml/matlab/CMakeLists.txt @@ -4,13 +4,13 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) if(TPL_ENABLE_MATLAB) - INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIRS}) + TRIBITS_INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIRS}) # Must glob the binary dir last to get all of the auto-generated headers SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/packages/ml/src/CMakeLists.txt b/packages/ml/src/CMakeLists.txt index 4201ff7553ce..c14e9e04eef8 100644 --- a/packages/ml/src/CMakeLists.txt +++ b/packages/ml/src/CMakeLists.txt @@ -27,7 +27,7 @@ TRIBITS_CONFIGURE_FILE(ml_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/ml_config.h @@ -37,14 +37,14 @@ SET(HEADERS ${HEADERS} # Core files # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Include) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Comm) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Coarsen) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/FEGrid) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Main) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Smoother) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Krylov) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Operator) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Include) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Comm) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Coarsen) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/FEGrid) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Main) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Smoother) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Krylov) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Operator) APPEND_SET(HEADERS Include/ml_defs.h @@ -164,11 +164,11 @@ APPEND_SET(SOURCES # util files # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utils) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/RefMaxwell) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/MatrixFree) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/MLAPI) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/LevelWrap) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utils) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/RefMaxwell) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/MatrixFree) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/MLAPI) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/LevelWrap) APPEND_SET(HEADERS Utils/ml_aztec_utils.h From f222f3e05428580caa10e4cc2c969b7af72d4979 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 11:53:43 -0700 Subject: [PATCH 25/78] Moertel: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/moertel/CMakeLists.txt | 2 +- packages/moertel/example/Hex3D/CMakeLists.txt | 2 +- .../moertel/example/TwoSquares/CMakeLists.txt | 2 +- packages/moertel/morkon/src/CMakeLists.txt | 56 +++++++++---------- .../moertel/morkon/unit_tests/CMakeLists.txt | 54 +++++++++--------- packages/moertel/src/mortar/CMakeLists.txt | 4 +- 6 files changed, 60 insertions(+), 60 deletions(-) diff --git a/packages/moertel/CMakeLists.txt b/packages/moertel/CMakeLists.txt index cc80a899198d..6a2be8f5bf90 100644 --- a/packages/moertel/CMakeLists.txt +++ b/packages/moertel/CMakeLists.txt @@ -180,7 +180,7 @@ IF(HAVE_MOERTEL_SEACAS) # Make sure SEACAS is available (we use the exodus support in SEACAS for this option) - INCLUDE_DIRECTORIES(${SEACAS_INCLUDE_DIRS}) + TRIBITS_INCLUDE_DIRECTORIES(${SEACAS_INCLUDE_DIRS}) ENDIF() diff --git a/packages/moertel/example/Hex3D/CMakeLists.txt b/packages/moertel/example/Hex3D/CMakeLists.txt index 74b207022d42..6a4290a4c09b 100644 --- a/packages/moertel/example/Hex3D/CMakeLists.txt +++ b/packages/moertel/example/Hex3D/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) IF(HAVE_MOERTEL_MPI) diff --git a/packages/moertel/example/TwoSquares/CMakeLists.txt b/packages/moertel/example/TwoSquares/CMakeLists.txt index 2f9ec20bbdab..8753484b046b 100644 --- a/packages/moertel/example/TwoSquares/CMakeLists.txt +++ b/packages/moertel/example/TwoSquares/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) IF(HAVE_MOERTEL_MPI) diff --git a/packages/moertel/morkon/src/CMakeLists.txt b/packages/moertel/morkon/src/CMakeLists.txt index 6ac5bf6405d9..b6d35ebe6130 100644 --- a/packages/moertel/morkon/src/CMakeLists.txt +++ b/packages/moertel/morkon/src/CMakeLists.txt @@ -1,37 +1,37 @@ # KokkosCore_config.h -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/kokkos/core/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/kokkos/core/src) # TpetraKernels_config.h -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/kernels/src) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/core/src) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/classic/src) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/classic/NodeAPI) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/kernels/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/core/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/classic/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/classic/NodeAPI) # TeuchosCore_config.h -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/teuchos/core/src) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/teuchos/kokkoscompat/src) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/teuchos/kokkoscomm/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/teuchos/core/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/teuchos/kokkoscompat/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/teuchos/kokkoscomm/src) # Other Kokkos includes needed -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/kokkos/core/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/kokkos/containers/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/kokkos/algorithms/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/kokkos/core/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/kokkos/containers/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/kokkos/algorithms/src) # Other Tpetra includes needed -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/kernels/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/kernels/src/impl) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/core/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/core/src/kokkos_refactor) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/classic/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/classic/NodeAPI) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/classic/LinAlg) - -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/core/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/parameterlist/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/kokkoscompat/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/comm/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/kokkoscomm/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/numerics/src) - -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/kernels/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/kernels/src/impl) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/core/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/core/src/kokkos_refactor) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/classic/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/classic/NodeAPI) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/classic/LinAlg) + +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/core/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/parameterlist/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/kokkoscompat/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/comm/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/kokkoscomm/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/numerics/src) + +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(INCLUDES mrk_api_classes.hpp diff --git a/packages/moertel/morkon/unit_tests/CMakeLists.txt b/packages/moertel/morkon/unit_tests/CMakeLists.txt index 055e19789418..d15eacc55d1d 100644 --- a/packages/moertel/morkon/unit_tests/CMakeLists.txt +++ b/packages/moertel/morkon/unit_tests/CMakeLists.txt @@ -1,39 +1,39 @@ # KokkosCore_config.h -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/kokkos/core/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/kokkos/core/src) # TpetraKernels_config.h -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/kernels/src) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/core/src) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/classic/src) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/classic/NodeAPI) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/kernels/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/core/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/classic/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/classic/NodeAPI) # TeuchosCore_config.h -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/teuchos/core/src) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/teuchos/kokkoscompat/src) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/teuchos/kokkoscomm/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/teuchos/core/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/teuchos/kokkoscompat/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/teuchos/kokkoscomm/src) # Other Kokkos includes needed -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/kokkos/core/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/kokkos/containers/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/kokkos/algorithms/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/kokkos/core/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/kokkos/containers/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/kokkos/algorithms/src) # Other Tpetra includes needed -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/kernels/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/kernels/src/impl) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/core/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/core/src/kokkos_refactor) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/classic/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/classic/NodeAPI) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/classic/LinAlg) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/kernels/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/kernels/src/impl) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/core/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/core/src/kokkos_refactor) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/classic/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/classic/NodeAPI) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/tpetra/classic/LinAlg) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/core/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/parameterlist/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/kokkoscompat/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/comm/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/kokkoscomm/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/numerics/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/core/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/parameterlist/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/kokkoscompat/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/comm/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/kokkoscomm/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/teuchos/numerics/src) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/moertel/morkon/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/packages/moertel/morkon/src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(INCLUDES mrk_api_classes.hpp diff --git a/packages/moertel/src/mortar/CMakeLists.txt b/packages/moertel/src/mortar/CMakeLists.txt index 5ee92df4080c..5266b2b29f4a 100644 --- a/packages/moertel/src/mortar/CMakeLists.txt +++ b/packages/moertel/src/mortar/CMakeLists.txt @@ -17,7 +17,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -27,7 +27,7 @@ SET(HEADERS ${HEADERS} # Core files # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS Moertel_Tolerances.hpp From b1b9310b542e20e8cf244542965a81125dd4bf30 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:25:14 -0700 Subject: [PATCH 26/78] MueLu: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/muelu/adapters/CMakeLists.txt | 6 +- .../muelu/doc/Tutorial/src/CMakeLists.txt | 2 +- .../muelu/doc/Tutorial/tex/CMakeLists.txt | 2 +- .../example/ParameterList/CMakeLists.txt | 2 +- .../example/advanced/blockcrs/CMakeLists.txt | 4 +- .../example/advanced/clone/CMakeLists.txt | 2 +- .../example/advanced/levelwrap/CMakeLists.txt | 4 +- .../example/advanced/memory/CMakeLists.txt | 2 +- .../advanced/multiplesolve/CMakeLists.txt | 4 +- .../advanced/separatesetups/CMakeLists.txt | 4 +- packages/muelu/example/basic/CMakeLists.txt | 6 +- packages/muelu/matlab/bin/CMakeLists.txt | 6 +- packages/muelu/matlab/src/CMakeLists.txt | 6 +- .../muelu/research/caglusa/CMakeLists.txt | 4 +- .../luc/region_algorithms/CMakeLists.txt | 4 +- .../research/max/AdditiveMG/CMakeLists.txt | 2 +- .../max/XpetraSplitting/CMakeLists.txt | 2 +- packages/muelu/research/q2q1/CMakeLists.txt | 2 +- .../research/regionMG/example/CMakeLists.txt | 6 +- .../research/regionMG/src/CMakeLists.txt | 2 +- .../regionMG/test/structured/CMakeLists.txt | 6 +- .../research/semicoarsening/CMakeLists.txt | 4 +- .../research/tawiesn/aria/CMakeLists.txt | 2 +- .../research/tawiesn/crada/CMakeLists.txt | 4 +- packages/muelu/src/CMakeLists.txt | 92 +++++++++---------- packages/muelu/src/Interface/CMakeLists.txt | 56 +++++------ packages/muelu/test/CMakeLists.txt | 2 +- .../muelu/test/blockedtransfer/CMakeLists.txt | 14 +-- .../muelu/test/convergence/CMakeLists.txt | 12 +-- packages/muelu/test/factories/CMakeLists.txt | 14 +-- packages/muelu/test/helmholtz/CMakeLists.txt | 14 +-- packages/muelu/test/interface/CMakeLists.txt | 12 +-- packages/muelu/test/longlong/CMakeLists.txt | 14 +-- packages/muelu/test/maxwell/CMakeLists.txt | 14 +-- packages/muelu/test/meshtying/CMakeLists.txt | 4 +- packages/muelu/test/mhdvanka/CMakeLists.txt | 14 +-- .../muelu/test/navierstokes/CMakeLists.txt | 6 +- packages/muelu/test/paramlist/CMakeLists.txt | 12 +-- .../test/perf_tests_kokkos/CMakeLists.txt | 6 +- .../muelu/test/permutation/CMakeLists.txt | 4 +- packages/muelu/test/profiling/CMakeLists.txt | 14 +-- packages/muelu/test/scaling/CMakeLists.txt | 14 +-- packages/muelu/test/simple1D/CMakeLists.txt | 14 +-- packages/muelu/test/structured/CMakeLists.txt | 14 +-- .../muelu/test/toggletransfer/CMakeLists.txt | 14 +-- packages/muelu/test/unit_tests/CMakeLists.txt | 26 +++--- .../test/unit_tests_kokkos/CMakeLists.txt | 24 ++--- .../muelu/test/vardofpernode/CMakeLists.txt | 14 +-- packages/muelu/test/viz/CMakeLists.txt | 14 +-- 49 files changed, 263 insertions(+), 263 deletions(-) diff --git a/packages/muelu/adapters/CMakeLists.txt b/packages/muelu/adapters/CMakeLists.txt index 1f9efe803376..1af97a7babac 100644 --- a/packages/muelu/adapters/CMakeLists.txt +++ b/packages/muelu/adapters/CMakeLists.txt @@ -8,7 +8,7 @@ SET(SOURCES "") # access explicit instantiation SET(BDIR ${CMAKE_CURRENT_BINARY_DIR}) IF(${PACKAGE_NAME}_ENABLE_EXPLICIT_INSTANTIATION) - INCLUDE_DIRECTORIES(${BDIR}/) + TRIBITS_INCLUDE_DIRECTORIES(${BDIR}/) APPEND_GLOB(HEADERS ${BDIR}/MueLu_ExplicitInstantiation.hpp) ENDIF() @@ -20,7 +20,7 @@ ENDIF() # IF (${PACKAGE_NAME}_ENABLE_Belos) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/belos) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/belos) APPEND_SET(HEADERS belos/BelosXpetraStatusTestGenResSubNorm.hpp @@ -34,7 +34,7 @@ ENDIF() # IF (${PACKAGE_NAME}_ENABLE_Epetra) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra) SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/aztecoo) APPEND_SET(HEADERS diff --git a/packages/muelu/doc/Tutorial/src/CMakeLists.txt b/packages/muelu/doc/Tutorial/src/CMakeLists.txt index f1653d41f6d5..4c396e99ff33 100644 --- a/packages/muelu/doc/Tutorial/src/CMakeLists.txt +++ b/packages/muelu/doc/Tutorial/src/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ASSERT_DEFINED( ${PACKAGE_NAME}_ENABLE_Amesos diff --git a/packages/muelu/doc/Tutorial/tex/CMakeLists.txt b/packages/muelu/doc/Tutorial/tex/CMakeLists.txt index bdfde0063170..d61c3f1428d6 100644 --- a/packages/muelu/doc/Tutorial/tex/CMakeLists.txt +++ b/packages/muelu/doc/Tutorial/tex/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) #TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/muelu/example/ParameterList/CMakeLists.txt b/packages/muelu/example/ParameterList/CMakeLists.txt index 2430cbe89016..d163d89b5407 100644 --- a/packages/muelu/example/ParameterList/CMakeLists.txt +++ b/packages/muelu/example/ParameterList/CMakeLists.txt @@ -1,5 +1,5 @@ INCLUDE(XpetraAddTest) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/packages/muelu/example/advanced/blockcrs/CMakeLists.txt b/packages/muelu/example/advanced/blockcrs/CMakeLists.txt index d094c2d2f2d1..ce5b5c7bdc69 100644 --- a/packages/muelu/example/advanced/blockcrs/CMakeLists.txt +++ b/packages/muelu/example/advanced/blockcrs/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests) # # Executables diff --git a/packages/muelu/example/advanced/clone/CMakeLists.txt b/packages/muelu/example/advanced/clone/CMakeLists.txt index 4f49291b897f..b42ba67ff7ca 100644 --- a/packages/muelu/example/advanced/clone/CMakeLists.txt +++ b/packages/muelu/example/advanced/clone/CMakeLists.txt @@ -1,5 +1,5 @@ INCLUDE(XpetraAddTest) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # Clone example diff --git a/packages/muelu/example/advanced/levelwrap/CMakeLists.txt b/packages/muelu/example/advanced/levelwrap/CMakeLists.txt index be4515d22c83..1735675b3c80 100644 --- a/packages/muelu/example/advanced/levelwrap/CMakeLists.txt +++ b/packages/muelu/example/advanced/levelwrap/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests) # # Executables diff --git a/packages/muelu/example/advanced/memory/CMakeLists.txt b/packages/muelu/example/advanced/memory/CMakeLists.txt index 811a0019602a..07e0c579b6fd 100644 --- a/packages/muelu/example/advanced/memory/CMakeLists.txt +++ b/packages/muelu/example/advanced/memory/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (${PACKAGE_NAME}_ENABLE_Tpetra) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/muelu/example/advanced/multiplesolve/CMakeLists.txt b/packages/muelu/example/advanced/multiplesolve/CMakeLists.txt index 6a57e891a446..3f3cc484efe2 100644 --- a/packages/muelu/example/advanced/multiplesolve/CMakeLists.txt +++ b/packages/muelu/example/advanced/multiplesolve/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests) # # Executables diff --git a/packages/muelu/example/advanced/separatesetups/CMakeLists.txt b/packages/muelu/example/advanced/separatesetups/CMakeLists.txt index 0307b6987b52..5b386f7467b5 100644 --- a/packages/muelu/example/advanced/separatesetups/CMakeLists.txt +++ b/packages/muelu/example/advanced/separatesetups/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests) TRIBITS_ADD_EXECUTABLE( diff --git a/packages/muelu/example/basic/CMakeLists.txt b/packages/muelu/example/basic/CMakeLists.txt index 246a8bd88d52..91a504716a8d 100644 --- a/packages/muelu/example/basic/CMakeLists.txt +++ b/packages/muelu/example/basic/CMakeLists.txt @@ -1,7 +1,7 @@ INCLUDE(XpetraAddTest) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../test/unit_tests) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../test/scaling) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../test/unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../test/scaling) # # Executables diff --git a/packages/muelu/matlab/bin/CMakeLists.txt b/packages/muelu/matlab/bin/CMakeLists.txt index 2e2d21f5251f..66a449b6cf91 100644 --- a/packages/muelu/matlab/bin/CMakeLists.txt +++ b/packages/muelu/matlab/bin/CMakeLists.txt @@ -5,11 +5,11 @@ INCLUDE(TrilinosCreateClientTemplateHeaders) SET(HEADERS_EXEC "") SET(SOURCES_EXEC "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) if(TPL_ENABLE_MATLAB) - INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIRS}) + TRIBITS_INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIRS}) # Must glob the binary dir last to get all of the auto-generated headers SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/packages/muelu/matlab/src/CMakeLists.txt b/packages/muelu/matlab/src/CMakeLists.txt index 3dae9ad48060..1f07082015a7 100644 --- a/packages/muelu/matlab/src/CMakeLists.txt +++ b/packages/muelu/matlab/src/CMakeLists.txt @@ -5,11 +5,11 @@ INCLUDE(TrilinosCreateClientTemplateHeaders) SET(HEADERS_LIB "") SET(SOURCES_LIB "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) if(TPL_ENABLE_MATLAB) - INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIRS}) + TRIBITS_INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIRS}) # Must glob the binary dir last to get all of the auto-generated headers SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/packages/muelu/research/caglusa/CMakeLists.txt b/packages/muelu/research/caglusa/CMakeLists.txt index 505c75bb88cb..6324f9b3cf83 100644 --- a/packages/muelu/research/caglusa/CMakeLists.txt +++ b/packages/muelu/research/caglusa/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../test/unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../test/unit_tests) IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2) diff --git a/packages/muelu/research/luc/region_algorithms/CMakeLists.txt b/packages/muelu/research/luc/region_algorithms/CMakeLists.txt index 440956cf038c..8fb8cca09a2f 100644 --- a/packages/muelu/research/luc/region_algorithms/CMakeLists.txt +++ b/packages/muelu/research/luc/region_algorithms/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests) # This test requires Tpetra, so it's only included if Tpetra is enabled IF (${PACKAGE_NAME}_ENABLE_Tpetra) #AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2) diff --git a/packages/muelu/research/max/AdditiveMG/CMakeLists.txt b/packages/muelu/research/max/AdditiveMG/CMakeLists.txt index 00611043b898..a636d67b2213 100644 --- a/packages/muelu/research/max/AdditiveMG/CMakeLists.txt +++ b/packages/muelu/research/max/AdditiveMG/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(SOURCES ${DIR}/*.cpp) diff --git a/packages/muelu/research/max/XpetraSplitting/CMakeLists.txt b/packages/muelu/research/max/XpetraSplitting/CMakeLists.txt index 28463736b8f1..50b89712ff45 100644 --- a/packages/muelu/research/max/XpetraSplitting/CMakeLists.txt +++ b/packages/muelu/research/max/XpetraSplitting/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(SOURCES ${DIR}/*.cpp) diff --git a/packages/muelu/research/q2q1/CMakeLists.txt b/packages/muelu/research/q2q1/CMakeLists.txt index 48fc85768d73..03c35f6d3df6 100644 --- a/packages/muelu/research/q2q1/CMakeLists.txt +++ b/packages/muelu/research/q2q1/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/packages/muelu/research/regionMG/example/CMakeLists.txt b/packages/muelu/research/regionMG/example/CMakeLists.txt index 8cccb054d398..664d3f69e935 100644 --- a/packages/muelu/research/regionMG/example/CMakeLists.txt +++ b/packages/muelu/research/regionMG/example/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src) # This test requires Tpetra and Amesos2, so it's only included if Tpetra is enabled IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Amesos2) diff --git a/packages/muelu/research/regionMG/src/CMakeLists.txt b/packages/muelu/research/regionMG/src/CMakeLists.txt index 48598c0c35e5..9b299b7a177d 100644 --- a/packages/muelu/research/regionMG/src/CMakeLists.txt +++ b/packages/muelu/research/regionMG/src/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(SOURCES ${DIR}/*.cpp) diff --git a/packages/muelu/research/regionMG/test/structured/CMakeLists.txt b/packages/muelu/research/regionMG/test/structured/CMakeLists.txt index 0f2c20246546..8623d19cf8e7 100644 --- a/packages/muelu/research/regionMG/test/structured/CMakeLists.txt +++ b/packages/muelu/research/regionMG/test/structured/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../../test/unit_tests) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../../test/unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) # This test requires Tpetra and Amesos2, so it's only included if Tpetra is enabled IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Amesos2) diff --git a/packages/muelu/research/semicoarsening/CMakeLists.txt b/packages/muelu/research/semicoarsening/CMakeLists.txt index 96c2e5134903..34e4236453f3 100644 --- a/packages/muelu/research/semicoarsening/CMakeLists.txt +++ b/packages/muelu/research/semicoarsening/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../test/unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../test/unit_tests) IF ((${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2) OR (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND ${PACKAGE_NAME}_ENABLE_Ifpack AND ${PACKAGE_NAME}_ENABLE_Amesos)) diff --git a/packages/muelu/research/tawiesn/aria/CMakeLists.txt b/packages/muelu/research/tawiesn/aria/CMakeLists.txt index 3fdff6e7ba36..0e2b399b98c7 100644 --- a/packages/muelu/research/tawiesn/aria/CMakeLists.txt +++ b/packages/muelu/research/tawiesn/aria/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/packages/muelu/research/tawiesn/crada/CMakeLists.txt b/packages/muelu/research/tawiesn/crada/CMakeLists.txt index 673ed34d321f..8cd24519d684 100644 --- a/packages/muelu/research/tawiesn/crada/CMakeLists.txt +++ b/packages/muelu/research/tawiesn/crada/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests) diff --git a/packages/muelu/src/CMakeLists.txt b/packages/muelu/src/CMakeLists.txt index 1b2c4cafe984..7e2a503d1bfd 100644 --- a/packages/muelu/src/CMakeLists.txt +++ b/packages/muelu/src/CMakeLists.txt @@ -20,62 +20,62 @@ SET(DIR ${CMAKE_CURRENT_SOURCE_DIR}) SET(BDIR ${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${DIR}) -INCLUDE_DIRECTORIES(${DIR}/Graph) -INCLUDE_DIRECTORIES(${DIR}/Graph/BrickAggregation) -INCLUDE_DIRECTORIES(${DIR}/Graph/Containers) -INCLUDE_DIRECTORIES(${DIR}/Graph/CoupledAggregation) -INCLUDE_DIRECTORIES(${DIR}/Graph/HybridAggregation) -INCLUDE_DIRECTORIES(${DIR}/Graph/MatrixTransformation) -INCLUDE_DIRECTORIES(${DIR}/Graph/PairwiseAggregation) -INCLUDE_DIRECTORIES(${DIR}/Graph/StructuredAggregation) -INCLUDE_DIRECTORIES(${DIR}/Graph/StructuredAggregation/coupled) -INCLUDE_DIRECTORIES(${DIR}/Graph/StructuredAggregation/uncoupled) -INCLUDE_DIRECTORIES(${DIR}/Graph/UncoupledAggregation) -INCLUDE_DIRECTORIES(${DIR}/Graph/UserAggregation) -INCLUDE_DIRECTORIES(${DIR}/Headers) -INCLUDE_DIRECTORIES(${DIR}/Interface) -INCLUDE_DIRECTORIES(${DIR}/Interface/FacadeClasses) -INCLUDE_DIRECTORIES(${DIR}/Misc) -INCLUDE_DIRECTORIES(${DIR}/MueCentral) -INCLUDE_DIRECTORIES(${DIR}/Operators) -INCLUDE_DIRECTORIES(${DIR}/Rebalancing) -INCLUDE_DIRECTORIES(${DIR}/Smoothers) -INCLUDE_DIRECTORIES(${DIR}/Transfers/BaseClass) -INCLUDE_DIRECTORIES(${DIR}/Transfers/BlackBox) -INCLUDE_DIRECTORIES(${DIR}/Smoothers/BlockedSmoothers) -INCLUDE_DIRECTORIES(${DIR}/Transfers/BlockedTransfers) -INCLUDE_DIRECTORIES(${DIR}/Transfers/Classical) -INCLUDE_DIRECTORIES(${DIR}/Transfers/Energy-Minimization) -INCLUDE_DIRECTORIES(${DIR}/Transfers/Energy-Minimization/Solvers) -INCLUDE_DIRECTORIES(${DIR}/Transfers/GeneralGeometric) -INCLUDE_DIRECTORIES(${DIR}/Transfers/Generic) -INCLUDE_DIRECTORIES(${DIR}/Transfers/Geometric-Interpolation) -INCLUDE_DIRECTORIES(${DIR}/Transfers/Matrix-Free) -INCLUDE_DIRECTORIES(${DIR}/Transfers/Petrov-Galerkin-SA) -INCLUDE_DIRECTORIES(${DIR}/Transfers/SemiCoarsen) -INCLUDE_DIRECTORIES(${DIR}/Transfers/Smoothed-Aggregation) -INCLUDE_DIRECTORIES(${DIR}/Transfers/User) -INCLUDE_DIRECTORIES(${DIR}/Utils) -INCLUDE_DIRECTORIES(${DIR}/Utils/ForwardDeclaration) -INCLUDE_DIRECTORIES(${DIR}/../adapters/xpetra) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Graph) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Graph/BrickAggregation) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Graph/Containers) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Graph/CoupledAggregation) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Graph/HybridAggregation) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Graph/MatrixTransformation) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Graph/PairwiseAggregation) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Graph/StructuredAggregation) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Graph/StructuredAggregation/coupled) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Graph/StructuredAggregation/uncoupled) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Graph/UncoupledAggregation) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Graph/UserAggregation) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Headers) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Interface) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Interface/FacadeClasses) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Misc) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/MueCentral) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Operators) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Rebalancing) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Transfers/BaseClass) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Transfers/BlackBox) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Smoothers/BlockedSmoothers) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Transfers/BlockedTransfers) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Transfers/Classical) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Transfers/Energy-Minimization) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Transfers/Energy-Minimization/Solvers) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Transfers/GeneralGeometric) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Transfers/Generic) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Transfers/Geometric-Interpolation) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Transfers/Matrix-Free) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Transfers/Petrov-Galerkin-SA) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Transfers/SemiCoarsen) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Transfers/Smoothed-Aggregation) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Transfers/User) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Utils) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Utils/ForwardDeclaration) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../adapters/xpetra) IF (${PACKAGE_NAME}_ENABLE_Epetra) - INCLUDE_DIRECTORIES(${DIR}/../adapters/epetra) + TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../adapters/epetra) ENDIF() IF (${PACKAGE_NAME}_ENABLE_Tpetra) - INCLUDE_DIRECTORIES(${DIR}/../adapters/tpetra) + TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../adapters/tpetra) ENDIF() IF (${PACKAGE_NAME}_ENABLE_AmgX) - INCLUDE_DIRECTORIES(${DIR}/../adapters/amgx) + TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../adapters/amgx) ENDIF() IF (${PACKAGE_NAME}_ENABLE_Intrepid2) - INCLUDE_DIRECTORIES(${DIR}/Transfers/PCoarsen) + TRIBITS_INCLUDE_DIRECTORIES(${DIR}/Transfers/PCoarsen) ENDIF() IF (${PACKAGE_NAME}_ENABLE_Experimental) - INCLUDE_DIRECTORIES(${DIR}/../research/regionMG/src) + TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../research/regionMG/src) ENDIF() IF (${PACKAGE_NAME}_ENABLE_Stratimikos) - INCLUDE_DIRECTORIES(${DIR}/../adapters/stratimikos) + TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../adapters/stratimikos) ENDIF() # Function to generate ETI (explicit template instantiation) files @@ -420,7 +420,7 @@ IF(${PACKAGE_NAME}_ENABLE_EXPLICIT_INSTANTIATION) APPEND_GLOB(SOURCES ${DIR}/Utils/ExplicitInstantiation/*.cpp) ENDIF() -INCLUDE_DIRECTORIES(${BDIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${BDIR}/) APPEND_GLOB(HEADERS ${BDIR}/*.hpp) # # Remove everything in the interface directory and add it to a list for muelu-interface instead diff --git a/packages/muelu/src/Interface/CMakeLists.txt b/packages/muelu/src/Interface/CMakeLists.txt index baf98dff3b5f..239d65d0a96f 100644 --- a/packages/muelu/src/Interface/CMakeLists.txt +++ b/packages/muelu/src/Interface/CMakeLists.txt @@ -20,36 +20,36 @@ SET(DIR ${CMAKE_CURRENT_SOURCE_DIR}) SET(BDIR ${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${DIR}) -INCLUDE_DIRECTORIES(${DIR}/../Graph) -INCLUDE_DIRECTORIES(${DIR}/../Graph/BrickAggregation) -INCLUDE_DIRECTORIES(${DIR}/../Graph/UncoupledAggregation) -INCLUDE_DIRECTORIES(${DIR}/../Graph/UserAggregation) -INCLUDE_DIRECTORIES(${DIR}/../Headers) -INCLUDE_DIRECTORIES(${DIR}/../Misc) -INCLUDE_DIRECTORIES(${DIR}/../MueCentral) -INCLUDE_DIRECTORIES(${DIR}/../Rebalancing) -INCLUDE_DIRECTORIES(${DIR}/../Smoothers) -INCLUDE_DIRECTORIES(${DIR}/../Transfers/BaseClass) -INCLUDE_DIRECTORIES(${DIR}/../Smoothers/BlockedSmoothers) -INCLUDE_DIRECTORIES(${DIR}/../Transfers/BlockedTransfers) -INCLUDE_DIRECTORIES(${DIR}/../Transfers/Generic) -INCLUDE_DIRECTORIES(${DIR}/../Transfers/Energy-Minimization) -INCLUDE_DIRECTORIES(${DIR}/../Transfers/Energy-Minimization/Solvers) -INCLUDE_DIRECTORIES(${DIR}/../Transfers/GeneralGeometric) -INCLUDE_DIRECTORIES(${DIR}/../Transfers/Geometric-Interpolation) -INCLUDE_DIRECTORIES(${DIR}/../Transfers/Matrix-Free) -INCLUDE_DIRECTORIES(${DIR}/../Transfers/Smoothed-Aggregation) -INCLUDE_DIRECTORIES(${DIR}/../Transfers/Petrov-Galerkin-SA) -INCLUDE_DIRECTORIES(${DIR}/../Transfers/User) -INCLUDE_DIRECTORIES(${DIR}/../Transfers/SemiCoarsen) -INCLUDE_DIRECTORIES(${DIR}/../Utils) -INCLUDE_DIRECTORIES(${DIR}/../Utils/ForwardDeclaration) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Graph) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Graph/BrickAggregation) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Graph/UncoupledAggregation) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Graph/UserAggregation) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Headers) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Misc) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../MueCentral) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Rebalancing) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Transfers/BaseClass) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Smoothers/BlockedSmoothers) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Transfers/BlockedTransfers) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Transfers/Generic) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Transfers/Energy-Minimization) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Transfers/Energy-Minimization/Solvers) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Transfers/GeneralGeometric) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Transfers/Geometric-Interpolation) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Transfers/Matrix-Free) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Transfers/Smoothed-Aggregation) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Transfers/Petrov-Galerkin-SA) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Transfers/User) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Transfers/SemiCoarsen) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Utils) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../Utils/ForwardDeclaration) if (${PACKAGE_NAME}_ENABLE_Tpetra) - INCLUDE_DIRECTORIES(${DIR}/../../adapters/tpetra) + TRIBITS_INCLUDE_DIRECTORIES(${DIR}/../../adapters/tpetra) ENDIF() -INCLUDE_DIRECTORIES(${DIR}/FacadeClasses) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/FacadeClasses) ############################################### @@ -71,7 +71,7 @@ APPEND_GLOB(SOURCES *.cpp) # TODO: make a loop TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}/ NOSIERRABJAM) -INCLUDE_DIRECTORIES(${BDIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${BDIR}/) APPEND_GLOB(HEADERS ${BDIR}/*.hpp) IF (${PACKAGE_NAME}_ENABLE_SPLIT_ETI_CPP_FILES) diff --git a/packages/muelu/test/CMakeLists.txt b/packages/muelu/test/CMakeLists.txt index 6eae5c3327be..beb4cf58e55f 100644 --- a/packages/muelu/test/CMakeLists.txt +++ b/packages/muelu/test/CMakeLists.txt @@ -63,6 +63,6 @@ ENDIF() TRIBITS_ADD_TEST_DIRECTORIES(structured) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) SET(SOURCES "") diff --git a/packages/muelu/test/blockedtransfer/CMakeLists.txt b/packages/muelu/test/blockedtransfer/CMakeLists.txt index b1218a10155c..a5faba3d2645 100644 --- a/packages/muelu/test/blockedtransfer/CMakeLists.txt +++ b/packages/muelu/test/blockedtransfer/CMakeLists.txt @@ -1,11 +1,11 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) TRIBITS_ADD_EXECUTABLE( BlockedTransfer diff --git a/packages/muelu/test/convergence/CMakeLists.txt b/packages/muelu/test/convergence/CMakeLists.txt index 2b68ac1af79a..30ee05fbd3af 100644 --- a/packages/muelu/test/convergence/CMakeLists.txt +++ b/packages/muelu/test/convergence/CMakeLists.txt @@ -13,12 +13,12 @@ ASSERT_DEFINED( #TODO: how to remove that? -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) diff --git a/packages/muelu/test/factories/CMakeLists.txt b/packages/muelu/test/factories/CMakeLists.txt index b53b3eb95a91..e06cf5bb9a12 100644 --- a/packages/muelu/test/factories/CMakeLists.txt +++ b/packages/muelu/test/factories/CMakeLists.txt @@ -1,11 +1,11 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/MueCentral) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/MueCentral) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) TRIBITS_ADD_EXECUTABLE_AND_TEST( simple-factory-request-mechanism diff --git a/packages/muelu/test/helmholtz/CMakeLists.txt b/packages/muelu/test/helmholtz/CMakeLists.txt index f904c472cef5..d03e1c642388 100644 --- a/packages/muelu/test/helmholtz/CMakeLists.txt +++ b/packages/muelu/test/helmholtz/CMakeLists.txt @@ -9,13 +9,13 @@ ASSERT_DEFINED( ${PACKAGE_NAME}_ENABLE_Zoltan2 ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) # mfh 18 Aug 2015: All of the Helmholtz examples require complex arithmetic. IF (${PACKAGE_NAME}_ENABLE_Zoltan2 AND HAVE_MUELU_COMPLEX) diff --git a/packages/muelu/test/interface/CMakeLists.txt b/packages/muelu/test/interface/CMakeLists.txt index fec5e09215cc..4c56100524e7 100644 --- a/packages/muelu/test/interface/CMakeLists.txt +++ b/packages/muelu/test/interface/CMakeLists.txt @@ -13,12 +13,12 @@ ASSERT_DEFINED( #TODO: how to remove that? -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) diff --git a/packages/muelu/test/longlong/CMakeLists.txt b/packages/muelu/test/longlong/CMakeLists.txt index 51be38a5b35d..b3fd30e4a040 100644 --- a/packages/muelu/test/longlong/CMakeLists.txt +++ b/packages/muelu/test/longlong/CMakeLists.txt @@ -13,13 +13,13 @@ ASSERT_DEFINED( #TODO: how to remove that? -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) INCLUDE(XpetraAddTest) diff --git a/packages/muelu/test/maxwell/CMakeLists.txt b/packages/muelu/test/maxwell/CMakeLists.txt index d58180faa6ff..307bf7ed4a56 100644 --- a/packages/muelu/test/maxwell/CMakeLists.txt +++ b/packages/muelu/test/maxwell/CMakeLists.txt @@ -4,13 +4,13 @@ ASSERT_DEFINED( ${PACKAGE_NAME}_ENABLE_ML ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) IF (${PACKAGE_NAME}_ENABLE_Amesos2) diff --git a/packages/muelu/test/meshtying/CMakeLists.txt b/packages/muelu/test/meshtying/CMakeLists.txt index 5dde94ba6ade..760a3da4c3d5 100644 --- a/packages/muelu/test/meshtying/CMakeLists.txt +++ b/packages/muelu/test/meshtying/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) # first ensure that these cmake boolean variables are defined ASSERT_DEFINED( diff --git a/packages/muelu/test/mhdvanka/CMakeLists.txt b/packages/muelu/test/mhdvanka/CMakeLists.txt index b501131600a0..21cb04cb75c9 100644 --- a/packages/muelu/test/mhdvanka/CMakeLists.txt +++ b/packages/muelu/test/mhdvanka/CMakeLists.txt @@ -1,11 +1,11 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/output) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/output) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) TRIBITS_ADD_EXECUTABLE( tomtest diff --git a/packages/muelu/test/navierstokes/CMakeLists.txt b/packages/muelu/test/navierstokes/CMakeLists.txt index 2d7664ae0b35..8673e2ef2a9a 100644 --- a/packages/muelu/test/navierstokes/CMakeLists.txt +++ b/packages/muelu/test/navierstokes/CMakeLists.txt @@ -1,7 +1,7 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Graph) # we need this line because this file is not on the header file List of MueLu -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Graph) # we need this line because this file is not on the header file List of MueLu +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) # first ensure that these cmake boolean variables are defined ASSERT_DEFINED( diff --git a/packages/muelu/test/paramlist/CMakeLists.txt b/packages/muelu/test/paramlist/CMakeLists.txt index c32323338e8c..d0c71a5737e3 100644 --- a/packages/muelu/test/paramlist/CMakeLists.txt +++ b/packages/muelu/test/paramlist/CMakeLists.txt @@ -1,10 +1,10 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) TRIBITS_ADD_EXECUTABLE_AND_TEST( paramlist diff --git a/packages/muelu/test/perf_tests_kokkos/CMakeLists.txt b/packages/muelu/test/perf_tests_kokkos/CMakeLists.txt index c3f04bf04fa8..80eca832585f 100644 --- a/packages/muelu/test/perf_tests_kokkos/CMakeLists.txt +++ b/packages/muelu/test/perf_tests_kokkos/CMakeLists.txt @@ -9,9 +9,9 @@ ASSERT_DEFINED( #TODO: how to remove that? -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) IF ((${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2) OR diff --git a/packages/muelu/test/permutation/CMakeLists.txt b/packages/muelu/test/permutation/CMakeLists.txt index d02db502ba16..ec8e4ea6ad2f 100644 --- a/packages/muelu/test/permutation/CMakeLists.txt +++ b/packages/muelu/test/permutation/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) IF(NOT HAVE_MUELU_COMPLEX AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND ${PACKAGE_NAME}_ENABLE_Epetra AND NOT ${PACKAGE_NAME}_ENABLE_Tpetra) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/muelu/test/profiling/CMakeLists.txt b/packages/muelu/test/profiling/CMakeLists.txt index ff51d98afc09..eb4753d8fd4c 100644 --- a/packages/muelu/test/profiling/CMakeLists.txt +++ b/packages/muelu/test/profiling/CMakeLists.txt @@ -1,11 +1,11 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/muelu/test/scaling/CMakeLists.txt b/packages/muelu/test/scaling/CMakeLists.txt index e97eb2f04c02..90f96702ced4 100644 --- a/packages/muelu/test/scaling/CMakeLists.txt +++ b/packages/muelu/test/scaling/CMakeLists.txt @@ -13,13 +13,13 @@ ASSERT_DEFINED( #TODO: how to remove that? -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2) SET(${PACKAGE_NAME}_HAVE_TPETRA_SOLVER_STACK YES) diff --git a/packages/muelu/test/simple1D/CMakeLists.txt b/packages/muelu/test/simple1D/CMakeLists.txt index 760f1e94a4a9..b0f041d5f5b4 100644 --- a/packages/muelu/test/simple1D/CMakeLists.txt +++ b/packages/muelu/test/simple1D/CMakeLists.txt @@ -1,11 +1,11 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) # first ensure that these cmake boolean variables are defined ASSERT_DEFINED( diff --git a/packages/muelu/test/structured/CMakeLists.txt b/packages/muelu/test/structured/CMakeLists.txt index 2d2866049dca..261747b373d8 100644 --- a/packages/muelu/test/structured/CMakeLists.txt +++ b/packages/muelu/test/structured/CMakeLists.txt @@ -4,13 +4,13 @@ ASSERT_DEFINED( ${PACKAGE_NAME}_ENABLE_Belos ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) IF (${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Amesos2) diff --git a/packages/muelu/test/toggletransfer/CMakeLists.txt b/packages/muelu/test/toggletransfer/CMakeLists.txt index 4f007fbd62c0..ebedcd346df1 100644 --- a/packages/muelu/test/toggletransfer/CMakeLists.txt +++ b/packages/muelu/test/toggletransfer/CMakeLists.txt @@ -1,11 +1,11 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) # first ensure that these cmake boolean variables are defined ASSERT_DEFINED( diff --git a/packages/muelu/test/unit_tests/CMakeLists.txt b/packages/muelu/test/unit_tests/CMakeLists.txt index 4e0d39dee01b..e1fa8f3b1ec4 100644 --- a/packages/muelu/test/unit_tests/CMakeLists.txt +++ b/packages/muelu/test/unit_tests/CMakeLists.txt @@ -1,16 +1,16 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/utils) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers/BlockedTransfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers/BlockedSmoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Utils) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../research/regionMG/src) - -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/utils) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers/BlockedTransfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers/BlockedSmoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Utils) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../research/regionMG/src) + +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) #TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.hpp) diff --git a/packages/muelu/test/unit_tests_kokkos/CMakeLists.txt b/packages/muelu/test/unit_tests_kokkos/CMakeLists.txt index 50d98c74d9b9..01ce3010ff33 100644 --- a/packages/muelu/test/unit_tests_kokkos/CMakeLists.txt +++ b/packages/muelu/test/unit_tests_kokkos/CMakeLists.txt @@ -1,16 +1,16 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/utils) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers/BlockedTransfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers/Matrix-Free) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers/BlockedSmoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/utils) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers/BlockedTransfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers/Matrix-Free) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers/BlockedSmoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) #TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.hpp) diff --git a/packages/muelu/test/vardofpernode/CMakeLists.txt b/packages/muelu/test/vardofpernode/CMakeLists.txt index 13206347e42d..1e4a61eccf37 100644 --- a/packages/muelu/test/vardofpernode/CMakeLists.txt +++ b/packages/muelu/test/vardofpernode/CMakeLists.txt @@ -1,10 +1,10 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) IF (${PACKAGE_NAME}_ENABLE_Belos) diff --git a/packages/muelu/test/viz/CMakeLists.txt b/packages/muelu/test/viz/CMakeLists.txt index 93cc44a45804..9e238347d25a 100644 --- a/packages/muelu/test/viz/CMakeLists.txt +++ b/packages/muelu/test/viz/CMakeLists.txt @@ -13,13 +13,13 @@ ASSERT_DEFINED( #TODO: how to remove that? -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Transfers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests) # # Tests From f49b2bedac3d2b8b2bae845ba7d54f1e3dc3ad82 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:26:06 -0700 Subject: [PATCH 27/78] NOX: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- .../examples/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt | 2 +- .../epetra/LOCA_ContinuationManager/CMakeLists.txt | 2 +- .../epetra/LOCA_ContinuationManager_xyzt/CMakeLists.txt | 2 +- packages/nox/examples/epetra/LOCA_Tcubed/CMakeLists.txt | 2 +- .../nox/examples/epetra/NOX_1DFEMNonlinear/CMakeLists.txt | 2 +- .../nox/examples/lapack/LOCA_1DFDPitchfork/CMakeLists.txt | 2 +- .../nox/examples/lapack/LOCA_Brusselator/CMakeLists.txt | 2 +- packages/nox/examples/lapack/LOCA_Chan/CMakeLists.txt | 2 +- .../nox/examples/lapack/NOX_SimpleExamples/CMakeLists.txt | 2 +- .../nox/examples/petsc/1DFiniteDifference/CMakeLists.txt | 2 +- packages/nox/examples/petsc/DS6.5.1/CMakeLists.txt | 2 +- packages/nox/src-epetra/CMakeLists.txt | 2 +- packages/nox/src-lapack/CMakeLists.txt | 2 +- packages/nox/src-loca/src-epetra/CMakeLists.txt | 4 ++-- packages/nox/src-loca/src-lapack/CMakeLists.txt | 2 +- packages/nox/src-loca/src-mf/CMakeLists.txt | 2 +- packages/nox/src-loca/src-thyra/CMakeLists.txt | 2 +- packages/nox/src-loca/src-tpetra/CMakeLists.txt | 4 ++-- packages/nox/src-loca/src/CMakeLists.txt | 2 +- packages/nox/src-petsc/CMakeLists.txt | 2 +- packages/nox/src/CMakeLists.txt | 8 ++++---- packages/nox/test/basic/CMakeLists.txt | 2 +- packages/nox/test/epetra/1Dfem/CMakeLists.txt | 2 +- packages/nox/test/epetra/Brusselator/CMakeLists.txt | 2 +- packages/nox/test/epetra/DS6.5.1/CMakeLists.txt | 2 +- .../test/epetra/FiniteDifferenceColoring/CMakeLists.txt | 2 +- packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt | 2 +- packages/nox/test/epetra/Thyra/CMakeLists.txt | 4 ++-- packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt | 2 +- packages/nox/test/tpetra/CMakeLists.txt | 2 +- packages/nox/test/utils/CMakeLists.txt | 2 +- 31 files changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/nox/examples/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt b/packages/nox/examples/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt index c3c6e396a06b..832c4daa494c 100644 --- a/packages/nox/examples/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt +++ b/packages/nox/examples/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA AND NOX_ENABLE_EpetraExt AND TPL_ENABLE_MPI) diff --git a/packages/nox/examples/epetra/LOCA_ContinuationManager/CMakeLists.txt b/packages/nox/examples/epetra/LOCA_ContinuationManager/CMakeLists.txt index c0d2722c0024..5820e146126e 100644 --- a/packages/nox/examples/epetra/LOCA_ContinuationManager/CMakeLists.txt +++ b/packages/nox/examples/epetra/LOCA_ContinuationManager/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # This example relies on the Amesos solver IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA AND NOX_ENABLE_Amesos) diff --git a/packages/nox/examples/epetra/LOCA_ContinuationManager_xyzt/CMakeLists.txt b/packages/nox/examples/epetra/LOCA_ContinuationManager_xyzt/CMakeLists.txt index b1fa6f50c3ce..fc6366703e28 100644 --- a/packages/nox/examples/epetra/LOCA_ContinuationManager_xyzt/CMakeLists.txt +++ b/packages/nox/examples/epetra/LOCA_ContinuationManager_xyzt/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA AND NOX_ENABLE_EpetraExt) diff --git a/packages/nox/examples/epetra/LOCA_Tcubed/CMakeLists.txt b/packages/nox/examples/epetra/LOCA_Tcubed/CMakeLists.txt index d8a3721f75a4..9d8199376673 100644 --- a/packages/nox/examples/epetra/LOCA_Tcubed/CMakeLists.txt +++ b/packages/nox/examples/epetra/LOCA_Tcubed/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA) diff --git a/packages/nox/examples/epetra/NOX_1DFEMNonlinear/CMakeLists.txt b/packages/nox/examples/epetra/NOX_1DFEMNonlinear/CMakeLists.txt index 3c3a48296777..909b6632dd7e 100644 --- a/packages/nox/examples/epetra/NOX_1DFEMNonlinear/CMakeLists.txt +++ b/packages/nox/examples/epetra/NOX_1DFEMNonlinear/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA) diff --git a/packages/nox/examples/lapack/LOCA_1DFDPitchfork/CMakeLists.txt b/packages/nox/examples/lapack/LOCA_1DFDPitchfork/CMakeLists.txt index 2ecdec568866..d8f87e1c03e6 100644 --- a/packages/nox/examples/lapack/LOCA_1DFDPitchfork/CMakeLists.txt +++ b/packages/nox/examples/lapack/LOCA_1DFDPitchfork/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK AND NOX_ENABLE_LOCA) diff --git a/packages/nox/examples/lapack/LOCA_Brusselator/CMakeLists.txt b/packages/nox/examples/lapack/LOCA_Brusselator/CMakeLists.txt index 8a68581f65f7..a78988a16a3e 100644 --- a/packages/nox/examples/lapack/LOCA_Brusselator/CMakeLists.txt +++ b/packages/nox/examples/lapack/LOCA_Brusselator/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK AND NOX_ENABLE_LOCA) diff --git a/packages/nox/examples/lapack/LOCA_Chan/CMakeLists.txt b/packages/nox/examples/lapack/LOCA_Chan/CMakeLists.txt index 30414383a55f..771ca84a7ada 100644 --- a/packages/nox/examples/lapack/LOCA_Chan/CMakeLists.txt +++ b/packages/nox/examples/lapack/LOCA_Chan/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK AND NOX_ENABLE_LOCA) diff --git a/packages/nox/examples/lapack/NOX_SimpleExamples/CMakeLists.txt b/packages/nox/examples/lapack/NOX_SimpleExamples/CMakeLists.txt index 899648f7e9eb..5d3920de2476 100644 --- a/packages/nox/examples/lapack/NOX_SimpleExamples/CMakeLists.txt +++ b/packages/nox/examples/lapack/NOX_SimpleExamples/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK) diff --git a/packages/nox/examples/petsc/1DFiniteDifference/CMakeLists.txt b/packages/nox/examples/petsc/1DFiniteDifference/CMakeLists.txt index 229f287a304a..004a0b1c7137 100644 --- a/packages/nox/examples/petsc/1DFiniteDifference/CMakeLists.txt +++ b/packages/nox/examples/petsc/1DFiniteDifference/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_PETSC) diff --git a/packages/nox/examples/petsc/DS6.5.1/CMakeLists.txt b/packages/nox/examples/petsc/DS6.5.1/CMakeLists.txt index 9383684f1924..5fc38002ddfa 100644 --- a/packages/nox/examples/petsc/DS6.5.1/CMakeLists.txt +++ b/packages/nox/examples/petsc/DS6.5.1/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_PETSC) diff --git a/packages/nox/src-epetra/CMakeLists.txt b/packages/nox/src-epetra/CMakeLists.txt index e3879c491bcd..2c9953cabbb2 100644 --- a/packages/nox/src-epetra/CMakeLists.txt +++ b/packages/nox/src-epetra/CMakeLists.txt @@ -3,7 +3,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Base library APPEND_SET(HEADERS diff --git a/packages/nox/src-lapack/CMakeLists.txt b/packages/nox/src-lapack/CMakeLists.txt index 712da34065e9..fc1801c2c9f7 100644 --- a/packages/nox/src-lapack/CMakeLists.txt +++ b/packages/nox/src-lapack/CMakeLists.txt @@ -3,7 +3,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS NOX_LAPACK.H diff --git a/packages/nox/src-loca/src-epetra/CMakeLists.txt b/packages/nox/src-loca/src-epetra/CMakeLists.txt index 4ec948ba9f18..0c6d382bf6e8 100644 --- a/packages/nox/src-loca/src-epetra/CMakeLists.txt +++ b/packages/nox/src-loca/src-epetra/CMakeLists.txt @@ -3,8 +3,8 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/continuation-manager) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/continuation-manager) # Base library APPEND_SET(HEADERS diff --git a/packages/nox/src-loca/src-lapack/CMakeLists.txt b/packages/nox/src-loca/src-lapack/CMakeLists.txt index 19b2cf21abed..2f1f586ee981 100644 --- a/packages/nox/src-loca/src-lapack/CMakeLists.txt +++ b/packages/nox/src-loca/src-lapack/CMakeLists.txt @@ -3,7 +3,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS LOCA_LAPACK.H diff --git a/packages/nox/src-loca/src-mf/CMakeLists.txt b/packages/nox/src-loca/src-mf/CMakeLists.txt index ab142002b8ce..87bd652e365c 100644 --- a/packages/nox/src-loca/src-mf/CMakeLists.txt +++ b/packages/nox/src-loca/src-mf/CMakeLists.txt @@ -3,7 +3,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # LOCA MF library APPEND_SET(HEADERS diff --git a/packages/nox/src-loca/src-thyra/CMakeLists.txt b/packages/nox/src-loca/src-thyra/CMakeLists.txt index 41cf4f4ecb7d..fb1a09225c08 100644 --- a/packages/nox/src-loca/src-thyra/CMakeLists.txt +++ b/packages/nox/src-loca/src-thyra/CMakeLists.txt @@ -3,7 +3,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Base library APPEND_SET(HEADERS diff --git a/packages/nox/src-loca/src-tpetra/CMakeLists.txt b/packages/nox/src-loca/src-tpetra/CMakeLists.txt index 51057d926940..50dd3a5f81db 100644 --- a/packages/nox/src-loca/src-tpetra/CMakeLists.txt +++ b/packages/nox/src-loca/src-tpetra/CMakeLists.txt @@ -1,8 +1,8 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src-thyra) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src-thyra) # Base library APPEND_SET(HEADERS diff --git a/packages/nox/src-loca/src/CMakeLists.txt b/packages/nox/src-loca/src/CMakeLists.txt index 2598a397759e..64375444c8a9 100644 --- a/packages/nox/src-loca/src/CMakeLists.txt +++ b/packages/nox/src-loca/src/CMakeLists.txt @@ -12,7 +12,7 @@ SET(HEADERS "") SET(NOINSTALLHEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Base headers APPEND_SET(HEADERS diff --git a/packages/nox/src-petsc/CMakeLists.txt b/packages/nox/src-petsc/CMakeLists.txt index d1051dd44e89..ad7fd9359291 100644 --- a/packages/nox/src-petsc/CMakeLists.txt +++ b/packages/nox/src-petsc/CMakeLists.txt @@ -3,7 +3,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Base library APPEND_SET(HEADERS diff --git a/packages/nox/src/CMakeLists.txt b/packages/nox/src/CMakeLists.txt index e7e037a8407a..9018b9a2db04 100644 --- a/packages/nox/src/CMakeLists.txt +++ b/packages/nox/src/CMakeLists.txt @@ -14,13 +14,13 @@ SET(HEADERS "") SET(NOINSTALLHEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_Config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Base headers APPEND_SET(HEADERS @@ -222,7 +222,7 @@ APPEND_SET(SOURCES ) IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA) - INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/src-thyra) + TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/src-thyra) APPEND_SET(HEADERS ${PACKAGE_SOURCE_DIR}/src-thyra/NOX_Thyra.H ${PACKAGE_SOURCE_DIR}/src-thyra/NOX_Thyra_Vector.H @@ -251,7 +251,7 @@ IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA) ENDIF() IF(NOX_ENABLE_KOKKOS_SOLVER_STACK) - INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/src-tpetra) + TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/src-tpetra) APPEND_SET(HEADERS ${PACKAGE_SOURCE_DIR}/src-tpetra/NOX_TpetraTypedefs.hpp ) diff --git a/packages/nox/test/basic/CMakeLists.txt b/packages/nox/test/basic/CMakeLists.txt index cabf1b57a991..b6646b71c4ce 100644 --- a/packages/nox/test/basic/CMakeLists.txt +++ b/packages/nox/test/basic/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( PrintUtils diff --git a/packages/nox/test/epetra/1Dfem/CMakeLists.txt b/packages/nox/test/epetra/1Dfem/CMakeLists.txt index 66fec4b773aa..a5f3e4757164 100644 --- a/packages/nox/test/epetra/1Dfem/CMakeLists.txt +++ b/packages/nox/test/epetra/1Dfem/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA) diff --git a/packages/nox/test/epetra/Brusselator/CMakeLists.txt b/packages/nox/test/epetra/Brusselator/CMakeLists.txt index 02dbf6233f08..dde9f3382f00 100644 --- a/packages/nox/test/epetra/Brusselator/CMakeLists.txt +++ b/packages/nox/test/epetra/Brusselator/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA) diff --git a/packages/nox/test/epetra/DS6.5.1/CMakeLists.txt b/packages/nox/test/epetra/DS6.5.1/CMakeLists.txt index e2181a932587..183767f2797b 100644 --- a/packages/nox/test/epetra/DS6.5.1/CMakeLists.txt +++ b/packages/nox/test/epetra/DS6.5.1/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA) diff --git a/packages/nox/test/epetra/FiniteDifferenceColoring/CMakeLists.txt b/packages/nox/test/epetra/FiniteDifferenceColoring/CMakeLists.txt index 73340414820e..d51fb2a3f5aa 100644 --- a/packages/nox/test/epetra/FiniteDifferenceColoring/CMakeLists.txt +++ b/packages/nox/test/epetra/FiniteDifferenceColoring/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_EpetraExt) diff --git a/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt b/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt index 0322d7f9060b..a63eab2144e3 100644 --- a/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt +++ b/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt @@ -3,7 +3,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS Basis.H diff --git a/packages/nox/test/epetra/Thyra/CMakeLists.txt b/packages/nox/test/epetra/Thyra/CMakeLists.txt index aa5e687c00e3..eae4ee012935 100644 --- a/packages/nox/test/epetra/Thyra/CMakeLists.txt +++ b/packages/nox/test/epetra/Thyra/CMakeLists.txt @@ -1,8 +1,8 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../utils) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../utils) ASSERT_DEFINED(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA NOX_ENABLE_Epetra NOX_ENABLE_EpetraExt diff --git a/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt b/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt index 28cd805859cf..d12b58f0839a 100644 --- a/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt +++ b/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt @@ -3,7 +3,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS ChanProblemInterface.H diff --git a/packages/nox/test/tpetra/CMakeLists.txt b/packages/nox/test/tpetra/CMakeLists.txt index a4c1150bd4d5..5334a5313c19 100644 --- a/packages/nox/test/tpetra/CMakeLists.txt +++ b/packages/nox/test/tpetra/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ASSERT_DEFINED(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA NOX_ENABLE_Tpetra diff --git a/packages/nox/test/utils/CMakeLists.txt b/packages/nox/test/utils/CMakeLists.txt index bb2c70f04e79..20b8649444e4 100644 --- a/packages/nox/test/utils/CMakeLists.txt +++ b/packages/nox/test/utils/CMakeLists.txt @@ -4,7 +4,7 @@ SET(HEADERS "") SET(SOURCES "") SET(TESTUTILS_DEPLIBS nox) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS NOX_TestError.H From 2421cceacbb942c5d6737cf6247d69c3822004e9 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:26:20 -0700 Subject: [PATCH 28/78] Pamgen: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/pamgen/src/CMakeLists.txt | 10 +++++----- packages/pamgen/test/rtc_test/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/pamgen/src/CMakeLists.txt b/packages/pamgen/src/CMakeLists.txt index 4f7d7942b496..136cefb55fff 100644 --- a/packages/pamgen/src/CMakeLists.txt +++ b/packages/pamgen/src/CMakeLists.txt @@ -18,7 +18,7 @@ SET(PE_SOURCES "") # Set headers (for IDEs and installing) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -27,10 +27,10 @@ SET(HEADERS ${HEADERS} # NOTE: Above, we add the XXX_config.h file so tht MS Visual Studio # will know to include this file in the dependency analysis -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/mesh_spec_lt) -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/extra_functions) -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/rtcompiler) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/mesh_spec_lt) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/extra_functions) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/rtcompiler) # # Core Files diff --git a/packages/pamgen/test/rtc_test/CMakeLists.txt b/packages/pamgen/test/rtc_test/CMakeLists.txt index 7aa0760a6859..ef2f5ec11942 100644 --- a/packages/pamgen/test/rtc_test/CMakeLists.txt +++ b/packages/pamgen/test/rtc_test/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/rtcompiler) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/rtcompiler) TRIBITS_ADD_EXECUTABLE_AND_TEST( rtc_test From 8d2594152ce3c39269ba82992b905125d46d458d Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:27:18 -0700 Subject: [PATCH 29/78] Panzer: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/panzer/adapters-ioss/src/CMakeLists.txt | 12 ++++++------ .../test/ioss_connmngr/CMakeLists.txt | 2 +- .../example/CurlLaplacianExample/CMakeLists.txt | 2 +- .../MixedCurlLaplacianExample/CMakeLists.txt | 2 +- .../example/MixedPoissonExample/CMakeLists.txt | 2 +- .../example/ModelEvaluator/CMakeLists.txt | 8 ++++---- .../example/PoissonExample/CMakeLists.txt | 2 +- .../example/PoissonInterfaceExample/CMakeLists.txt | 2 +- .../example/PoissonInterfaceTpetra/CMakeLists.txt | 2 +- .../example/assembly_engine/CMakeLists.txt | 8 ++++---- .../example/main_driver/CMakeLists.txt | 8 ++++---- .../example/square_mesh/CMakeLists.txt | 2 +- packages/panzer/adapters-stk/src/CMakeLists.txt | 12 ++++++------ .../test/assembly_engine/CMakeLists.txt | 8 ++++---- .../adapters-stk/test/bcstrategy/CMakeLists.txt | 6 +++--- .../test/evaluator_tests/CMakeLists.txt | 4 ++-- .../adapters-stk/test/face_to_elem/CMakeLists.txt | 2 +- .../test/face_to_element/CMakeLists.txt | 2 +- .../test/field_manager_builder/CMakeLists.txt | 8 ++++---- .../test/gather_scatter_evaluators/CMakeLists.txt | 8 ++++---- .../test/initial_condition_builder/CMakeLists.txt | 8 ++++---- .../test/ip_coordinates/CMakeLists.txt | 10 +++++----- .../adapters-stk/test/local_mesh/CMakeLists.txt | 2 +- .../test/model_evaluator/CMakeLists.txt | 8 ++++---- .../adapters-stk/test/node_normals/CMakeLists.txt | 2 +- .../test/panzer_workset_builder/CMakeLists.txt | 4 ++-- .../adapters-stk/test/periodic_bcs/CMakeLists.txt | 2 +- .../adapters-stk/test/projection/CMakeLists.txt | 4 ++-- .../test/response_library/CMakeLists.txt | 10 +++++----- .../test/sideset_overlap/CMakeLists.txt | 2 +- .../panzer/adapters-stk/test/solver/CMakeLists.txt | 8 ++++---- .../adapters-stk/test/stk_connmngr/CMakeLists.txt | 2 +- .../test/stk_interface_test/CMakeLists.txt | 2 +- .../test/transform_bc_names/CMakeLists.txt | 2 +- .../adapters-stk/tutorial/siamCse17/CMakeLists.txt | 2 +- .../adapters-stk/tutorial/step01/CMakeLists.txt | 2 +- .../adapters-stk/tutorial/step02/CMakeLists.txt | 2 +- packages/panzer/core/src/CMakeLists.txt | 4 ++-- packages/panzer/disc-fe/src/CMakeLists.txt | 14 +++++++------- .../disc-fe/test/closure_model/CMakeLists.txt | 2 +- .../test/closure_model_composite/CMakeLists.txt | 2 +- .../panzer/disc-fe/test/core_tests/CMakeLists.txt | 2 +- .../test/epetra_gatherscatter/CMakeLists.txt | 2 +- .../disc-fe/test/equation_set/CMakeLists.txt | 2 +- .../disc-fe/test/evaluator_tests/CMakeLists.txt | 2 +- .../panzer/disc-fe/test/la_factory/CMakeLists.txt | 4 ++-- .../panzer/disc-fe/test/local_mesh/CMakeLists.txt | 2 +- .../disc-fe/test/physics_block/CMakeLists.txt | 6 +++--- .../disc-fe/test/workset_tests/CMakeLists.txt | 2 +- .../example/CartesianScaling/CMakeLists.txt | 4 ++-- packages/panzer/dof-mgr/src/CMakeLists.txt | 6 +++--- .../dof-mgr/test/cartesian_topology/CMakeLists.txt | 2 +- .../dof-mgr/test/dofmngr_test/CMakeLists.txt | 2 +- .../panzer/dof-mgr/test/fe_assembly/CMakeLists.txt | 2 +- .../dof-mgr/test/field_pattern/CMakeLists.txt | 2 +- packages/panzer/expr-eval/src/CMakeLists.txt | 2 +- .../mini-em/example/BlockPrec/CMakeLists.txt | 2 +- packages/panzer/mini-em/src/CMakeLists.txt | 14 +++++++------- 58 files changed, 127 insertions(+), 127 deletions(-) diff --git a/packages/panzer/adapters-ioss/src/CMakeLists.txt b/packages/panzer/adapters-ioss/src/CMakeLists.txt index 1f6a7c366907..1387105f7168 100644 --- a/packages/panzer/adapters-ioss/src/CMakeLists.txt +++ b/packages/panzer/adapters-ioss/src/CMakeLists.txt @@ -3,15 +3,15 @@ SET(HEADERS "") SET(SOURCES "") TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.hpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.hpp ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/stk_interface) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/evaluators) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/responses) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/stk_interface) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/evaluators) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/responses) # auto generate headers, add to dependencies and include directories TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}) @@ -19,7 +19,7 @@ TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}) #TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}/evaluators) #TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}/responses) APPEND_GLOB(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/*.hpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) #APPEND_GLOB(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/stk_interface/*.hpp) diff --git a/packages/panzer/adapters-ioss/test/ioss_connmngr/CMakeLists.txt b/packages/panzer/adapters-ioss/test/ioss_connmngr/CMakeLists.txt index 1ec03a60bd3a..a428ec95122a 100644 --- a/packages/panzer/adapters-ioss/test/ioss_connmngr/CMakeLists.txt +++ b/packages/panzer/adapters-ioss/test/ioss_connmngr/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/example/CurlLaplacianExample/CMakeLists.txt b/packages/panzer/adapters-stk/example/CurlLaplacianExample/CMakeLists.txt index 728cd8b2c7fd..1ba16b9cdd28 100644 --- a/packages/panzer/adapters-stk/example/CurlLaplacianExample/CMakeLists.txt +++ b/packages/panzer/adapters-stk/example/CurlLaplacianExample/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(ASSEMBLY_EXAMPLE_SOURCES main.cpp diff --git a/packages/panzer/adapters-stk/example/MixedCurlLaplacianExample/CMakeLists.txt b/packages/panzer/adapters-stk/example/MixedCurlLaplacianExample/CMakeLists.txt index 70c5be73db9e..21a44dee18e9 100644 --- a/packages/panzer/adapters-stk/example/MixedCurlLaplacianExample/CMakeLists.txt +++ b/packages/panzer/adapters-stk/example/MixedCurlLaplacianExample/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(ASSEMBLY_EXAMPLE_SOURCES main.cpp diff --git a/packages/panzer/adapters-stk/example/MixedPoissonExample/CMakeLists.txt b/packages/panzer/adapters-stk/example/MixedPoissonExample/CMakeLists.txt index e4aa3541d186..19d7ed50f62c 100644 --- a/packages/panzer/adapters-stk/example/MixedPoissonExample/CMakeLists.txt +++ b/packages/panzer/adapters-stk/example/MixedPoissonExample/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(ASSEMBLY_EXAMPLE_SOURCES main.cpp diff --git a/packages/panzer/adapters-stk/example/ModelEvaluator/CMakeLists.txt b/packages/panzer/adapters-stk/example/ModelEvaluator/CMakeLists.txt index 37ba928eff14..15f146a451e8 100644 --- a/packages/panzer/adapters-stk/example/ModelEvaluator/CMakeLists.txt +++ b/packages/panzer/adapters-stk/example/ModelEvaluator/CMakeLists.txt @@ -1,8 +1,8 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/../disc-fe/test/equation_set) -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/../disc-fe/test/closure_model) -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/bcstrategy) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/../disc-fe/test/equation_set) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/../disc-fe/test/closure_model) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/bcstrategy) SET(main_driver_SOURCES main_driver.cpp diff --git a/packages/panzer/adapters-stk/example/PoissonExample/CMakeLists.txt b/packages/panzer/adapters-stk/example/PoissonExample/CMakeLists.txt index 134d31ee200b..0af208d764dd 100644 --- a/packages/panzer/adapters-stk/example/PoissonExample/CMakeLists.txt +++ b/packages/panzer/adapters-stk/example/PoissonExample/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(ASSEMBLY_EXAMPLE_SOURCES main.cpp diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceExample/CMakeLists.txt b/packages/panzer/adapters-stk/example/PoissonInterfaceExample/CMakeLists.txt index 49d23d26fc46..6ff12ed190a2 100644 --- a/packages/panzer/adapters-stk/example/PoissonInterfaceExample/CMakeLists.txt +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceExample/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(ASSEMBLY_EXAMPLE_SOURCES main.cpp) diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/CMakeLists.txt b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/CMakeLists.txt index e3a325ca6a21..8cf8e79a965d 100644 --- a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/CMakeLists.txt +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(ASSEMBLY_EXAMPLE_SOURCES main.cpp) diff --git a/packages/panzer/adapters-stk/example/assembly_engine/CMakeLists.txt b/packages/panzer/adapters-stk/example/assembly_engine/CMakeLists.txt index 318cf5d05ee8..46a682011b25 100644 --- a/packages/panzer/adapters-stk/example/assembly_engine/CMakeLists.txt +++ b/packages/panzer/adapters-stk/example/assembly_engine/CMakeLists.txt @@ -1,9 +1,9 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe//test/closure_model) -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/bcstrategy) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe//test/closure_model) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/bcstrategy) SET(ASSEMBLY_EXAMPLE_SOURCES assembly_driver.cpp diff --git a/packages/panzer/adapters-stk/example/main_driver/CMakeLists.txt b/packages/panzer/adapters-stk/example/main_driver/CMakeLists.txt index b59d306dc32c..a4b1af19e6ff 100644 --- a/packages/panzer/adapters-stk/example/main_driver/CMakeLists.txt +++ b/packages/panzer/adapters-stk/example/main_driver/CMakeLists.txt @@ -1,8 +1,8 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/closure_model) -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/bcstrategy) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/closure_model) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/bcstrategy) SET(main_driver_SOURCES main_driver.cpp diff --git a/packages/panzer/adapters-stk/example/square_mesh/CMakeLists.txt b/packages/panzer/adapters-stk/example/square_mesh/CMakeLists.txt index 818096cf6eaa..27a7b8108afc 100644 --- a/packages/panzer/adapters-stk/example/square_mesh/CMakeLists.txt +++ b/packages/panzer/adapters-stk/example/square_mesh/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(square_mesh_SOURCES square_mesh.cpp diff --git a/packages/panzer/adapters-stk/src/CMakeLists.txt b/packages/panzer/adapters-stk/src/CMakeLists.txt index b5eda637b7c5..a327060d0f81 100644 --- a/packages/panzer/adapters-stk/src/CMakeLists.txt +++ b/packages/panzer/adapters-stk/src/CMakeLists.txt @@ -3,15 +3,15 @@ SET(HEADERS "") SET(SOURCES "") TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.hpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.hpp ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/stk_interface) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/evaluators) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/responses) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/stk_interface) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/evaluators) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/responses) # auto generate headers, add to dependencies and include directories TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}) @@ -19,7 +19,7 @@ TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}/stk_interfac TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}/evaluators) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}/responses) APPEND_GLOB(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/*.hpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) APPEND_GLOB(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/stk_interface/*.hpp) diff --git a/packages/panzer/adapters-stk/test/assembly_engine/CMakeLists.txt b/packages/panzer/adapters-stk/test/assembly_engine/CMakeLists.txt index a0e9fc1e5555..99d5214a2148 100644 --- a/packages/panzer/adapters-stk/test/assembly_engine/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/assembly_engine/CMakeLists.txt @@ -1,10 +1,10 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/closure_model) -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/bcstrategy) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/closure_model) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/bcstrategy) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/bcstrategy/CMakeLists.txt b/packages/panzer/adapters-stk/test/bcstrategy/CMakeLists.txt index 66bd9dbce191..7e5e29d7de40 100644 --- a/packages/panzer/adapters-stk/test/bcstrategy/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/bcstrategy/CMakeLists.txt @@ -1,8 +1,8 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/closure_model) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/closure_model) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/evaluator_tests/CMakeLists.txt b/packages/panzer/adapters-stk/test/evaluator_tests/CMakeLists.txt index a8018bf928ee..6e43598e079b 100644 --- a/packages/panzer/adapters-stk/test/evaluator_tests/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/evaluator_tests/CMakeLists.txt @@ -1,7 +1,7 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/face_to_elem/CMakeLists.txt b/packages/panzer/adapters-stk/test/face_to_elem/CMakeLists.txt index cd9badce9db8..103b71ba5fbd 100644 --- a/packages/panzer/adapters-stk/test/face_to_elem/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/face_to_elem/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/face_to_element/CMakeLists.txt b/packages/panzer/adapters-stk/test/face_to_element/CMakeLists.txt index 2f4d51366ee2..74d0adeec371 100644 --- a/packages/panzer/adapters-stk/test/face_to_element/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/face_to_element/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/field_manager_builder/CMakeLists.txt b/packages/panzer/adapters-stk/test/field_manager_builder/CMakeLists.txt index c5b366b4f71f..b9e24323420b 100644 --- a/packages/panzer/adapters-stk/test/field_manager_builder/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/field_manager_builder/CMakeLists.txt @@ -1,10 +1,10 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/equation_set) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/closure_model) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/test/bcstrategy) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/equation_set) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/closure_model) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/test/bcstrategy) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/gather_scatter_evaluators/CMakeLists.txt b/packages/panzer/adapters-stk/test/gather_scatter_evaluators/CMakeLists.txt index 02651c69200d..abde8be5845b 100644 --- a/packages/panzer/adapters-stk/test/gather_scatter_evaluators/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/gather_scatter_evaluators/CMakeLists.txt @@ -1,10 +1,10 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/closure_model) -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/bcstrategy) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/closure_model) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/bcstrategy) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/initial_condition_builder/CMakeLists.txt b/packages/panzer/adapters-stk/test/initial_condition_builder/CMakeLists.txt index c71376de0c99..e13b75850969 100644 --- a/packages/panzer/adapters-stk/test/initial_condition_builder/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/initial_condition_builder/CMakeLists.txt @@ -1,9 +1,9 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/equation_set) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/closure_model) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/test/bcstrategy) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/equation_set) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/closure_model) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/test/bcstrategy) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/ip_coordinates/CMakeLists.txt b/packages/panzer/adapters-stk/test/ip_coordinates/CMakeLists.txt index 71143b748e95..bc5bcaf16a26 100644 --- a/packages/panzer/adapters-stk/test/ip_coordinates/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/ip_coordinates/CMakeLists.txt @@ -1,10 +1,10 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/equation_set) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/closure_model) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/test/response_library) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/test/bcstrategy) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/equation_set) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/closure_model) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/test/response_library) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/test/bcstrategy) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/local_mesh/CMakeLists.txt b/packages/panzer/adapters-stk/test/local_mesh/CMakeLists.txt index 85f5e0597a1e..adbad3bb4da8 100644 --- a/packages/panzer/adapters-stk/test/local_mesh/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/local_mesh/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/model_evaluator/CMakeLists.txt b/packages/panzer/adapters-stk/test/model_evaluator/CMakeLists.txt index f188d5060e21..2ab48a23520c 100644 --- a/packages/panzer/adapters-stk/test/model_evaluator/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/model_evaluator/CMakeLists.txt @@ -1,10 +1,10 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/closure_model) -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/bcstrategy) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/closure_model) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/bcstrategy) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/node_normals/CMakeLists.txt b/packages/panzer/adapters-stk/test/node_normals/CMakeLists.txt index b778a9ddbbab..40a364684028 100644 --- a/packages/panzer/adapters-stk/test/node_normals/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/node_normals/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/panzer_workset_builder/CMakeLists.txt b/packages/panzer/adapters-stk/test/panzer_workset_builder/CMakeLists.txt index 3d1383e18649..503ad31034df 100644 --- a/packages/panzer/adapters-stk/test/panzer_workset_builder/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/panzer_workset_builder/CMakeLists.txt @@ -1,7 +1,7 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/periodic_bcs/CMakeLists.txt b/packages/panzer/adapters-stk/test/periodic_bcs/CMakeLists.txt index 1e43d84b7d43..39aa347d7a59 100644 --- a/packages/panzer/adapters-stk/test/periodic_bcs/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/periodic_bcs/CMakeLists.txt @@ -1,6 +1,6 @@ IF(PANZER_HAVE_EPETRA) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/projection/CMakeLists.txt b/packages/panzer/adapters-stk/test/projection/CMakeLists.txt index f8f9e3ae8b7a..1a0f4a28962e 100644 --- a/packages/panzer/adapters-stk/test/projection/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/projection/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/response_library/CMakeLists.txt b/packages/panzer/adapters-stk/test/response_library/CMakeLists.txt index 9e6efc2f7e9f..89ac76147641 100644 --- a/packages/panzer/adapters-stk/test/response_library/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/response_library/CMakeLists.txt @@ -1,11 +1,11 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/equation_set) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/closure_model) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/response_library) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/test/bcstrategy) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/equation_set) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/closure_model) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/disc-fe/test/response_library) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/test/bcstrategy) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/sideset_overlap/CMakeLists.txt b/packages/panzer/adapters-stk/test/sideset_overlap/CMakeLists.txt index efc9686de6cb..c30017c4051a 100644 --- a/packages/panzer/adapters-stk/test/sideset_overlap/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/sideset_overlap/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/solver/CMakeLists.txt b/packages/panzer/adapters-stk/test/solver/CMakeLists.txt index ce0df1384b3a..371bc0c2c0eb 100644 --- a/packages/panzer/adapters-stk/test/solver/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/solver/CMakeLists.txt @@ -1,9 +1,9 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) -INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/closure_model) -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/bcstrategy) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/equation_set) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/closure_model) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/bcstrategy) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/stk_connmngr/CMakeLists.txt b/packages/panzer/adapters-stk/test/stk_connmngr/CMakeLists.txt index 1215434e650c..0fe350228a1c 100644 --- a/packages/panzer/adapters-stk/test/stk_connmngr/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/stk_connmngr/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/stk_interface_test/CMakeLists.txt b/packages/panzer/adapters-stk/test/stk_interface_test/CMakeLists.txt index eca6e50991e7..732e90c5a43b 100644 --- a/packages/panzer/adapters-stk/test/stk_interface_test/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/stk_interface_test/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/test/transform_bc_names/CMakeLists.txt b/packages/panzer/adapters-stk/test/transform_bc_names/CMakeLists.txt index edef81c11063..9e42c28fd1da 100644 --- a/packages/panzer/adapters-stk/test/transform_bc_names/CMakeLists.txt +++ b/packages/panzer/adapters-stk/test/transform_bc_names/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/adapters-stk/tutorial/siamCse17/CMakeLists.txt b/packages/panzer/adapters-stk/tutorial/siamCse17/CMakeLists.txt index 559c5cef4203..678ae63944f4 100644 --- a/packages/panzer/adapters-stk/tutorial/siamCse17/CMakeLists.txt +++ b/packages/panzer/adapters-stk/tutorial/siamCse17/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(main_SOURCES main.cpp diff --git a/packages/panzer/adapters-stk/tutorial/step01/CMakeLists.txt b/packages/panzer/adapters-stk/tutorial/step01/CMakeLists.txt index d9d860a00362..c0009badf9d3 100644 --- a/packages/panzer/adapters-stk/tutorial/step01/CMakeLists.txt +++ b/packages/panzer/adapters-stk/tutorial/step01/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(main_SOURCES main.cpp diff --git a/packages/panzer/adapters-stk/tutorial/step02/CMakeLists.txt b/packages/panzer/adapters-stk/tutorial/step02/CMakeLists.txt index e9e2935220b6..5de4fd985361 100644 --- a/packages/panzer/adapters-stk/tutorial/step02/CMakeLists.txt +++ b/packages/panzer/adapters-stk/tutorial/step02/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(main_SOURCES main.cpp diff --git a/packages/panzer/core/src/CMakeLists.txt b/packages/panzer/core/src/CMakeLists.txt index 7561809b5fd8..f7bfb90ee48a 100644 --- a/packages/panzer/core/src/CMakeLists.txt +++ b/packages/panzer/core/src/CMakeLists.txt @@ -11,12 +11,12 @@ SET(HEADERS "") SET(SOURCES "") TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.hpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.hpp ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) APPEND_GLOB(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) diff --git a/packages/panzer/disc-fe/src/CMakeLists.txt b/packages/panzer/disc-fe/src/CMakeLists.txt index c53af65bb3cf..0d2e08762483 100644 --- a/packages/panzer/disc-fe/src/CMakeLists.txt +++ b/packages/panzer/disc-fe/src/CMakeLists.txt @@ -2,17 +2,17 @@ SET(HEADERS "") SET(SOURCES "") TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.hpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.hpp ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lof) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/evaluators) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/responses) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lof) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/evaluators) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/responses) IF(Panzer_BUILD_PAPI_SUPPORT) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/papi) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/papi) ENDIF() # auto generate headers, add to dependencies and include directories @@ -24,7 +24,7 @@ IF(Panzer_BUILD_PAPI_SUPPORT) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}/papi) ENDIF() APPEND_GLOB(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/*.hpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) APPEND_GLOB(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/lof/*.hpp) diff --git a/packages/panzer/disc-fe/test/closure_model/CMakeLists.txt b/packages/panzer/disc-fe/test/closure_model/CMakeLists.txt index 8eb93538b6c0..e3d53a065722 100644 --- a/packages/panzer/disc-fe/test/closure_model/CMakeLists.txt +++ b/packages/panzer/disc-fe/test/closure_model/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/disc-fe/test/closure_model_composite/CMakeLists.txt b/packages/panzer/disc-fe/test/closure_model_composite/CMakeLists.txt index 41201effec19..a89e1596e0bb 100644 --- a/packages/panzer/disc-fe/test/closure_model_composite/CMakeLists.txt +++ b/packages/panzer/disc-fe/test/closure_model_composite/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/disc-fe/test/core_tests/CMakeLists.txt b/packages/panzer/disc-fe/test/core_tests/CMakeLists.txt index 3b26b194c3a5..5757265c43f1 100644 --- a/packages/panzer/disc-fe/test/core_tests/CMakeLists.txt +++ b/packages/panzer/disc-fe/test/core_tests/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/disc-fe/test/epetra_gatherscatter/CMakeLists.txt b/packages/panzer/disc-fe/test/epetra_gatherscatter/CMakeLists.txt index 4088d5dc4c73..fa844437a23f 100644 --- a/packages/panzer/disc-fe/test/epetra_gatherscatter/CMakeLists.txt +++ b/packages/panzer/disc-fe/test/epetra_gatherscatter/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/disc-fe/test/equation_set/CMakeLists.txt b/packages/panzer/disc-fe/test/equation_set/CMakeLists.txt index 1c3249f2850e..ea6dae02bb10 100644 --- a/packages/panzer/disc-fe/test/equation_set/CMakeLists.txt +++ b/packages/panzer/disc-fe/test/equation_set/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/disc-fe/test/evaluator_tests/CMakeLists.txt b/packages/panzer/disc-fe/test/evaluator_tests/CMakeLists.txt index 8753dad8a92c..9180cd1c966d 100644 --- a/packages/panzer/disc-fe/test/evaluator_tests/CMakeLists.txt +++ b/packages/panzer/disc-fe/test/evaluator_tests/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/disc-fe/test/la_factory/CMakeLists.txt b/packages/panzer/disc-fe/test/la_factory/CMakeLists.txt index 48ca0caba4f8..7a5d97c64966 100644 --- a/packages/panzer/disc-fe/test/la_factory/CMakeLists.txt +++ b/packages/panzer/disc-fe/test/la_factory/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) @@ -38,7 +38,7 @@ SET(UNIT_TEST_DRIVER # If this assumption is incorrect, or the build system is changed this might # have to be fixed! ############################################################################### -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../../dof-mgr/test/dofmngr_test) diff --git a/packages/panzer/disc-fe/test/local_mesh/CMakeLists.txt b/packages/panzer/disc-fe/test/local_mesh/CMakeLists.txt index 83f7ad6713f4..1b0778d66e9e 100644 --- a/packages/panzer/disc-fe/test/local_mesh/CMakeLists.txt +++ b/packages/panzer/disc-fe/test/local_mesh/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/disc-fe/test/physics_block/CMakeLists.txt b/packages/panzer/disc-fe/test/physics_block/CMakeLists.txt index c6ce1f6220fe..88066ed308fa 100644 --- a/packages/panzer/disc-fe/test/physics_block/CMakeLists.txt +++ b/packages/panzer/disc-fe/test/physics_block/CMakeLists.txt @@ -1,9 +1,9 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../equation_set) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../closure_model) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../equation_set) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../closure_model) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/disc-fe/test/workset_tests/CMakeLists.txt b/packages/panzer/disc-fe/test/workset_tests/CMakeLists.txt index aaee60f2f7fa..91573f8b110f 100644 --- a/packages/panzer/disc-fe/test/workset_tests/CMakeLists.txt +++ b/packages/panzer/disc-fe/test/workset_tests/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/dof-mgr/example/CartesianScaling/CMakeLists.txt b/packages/panzer/dof-mgr/example/CartesianScaling/CMakeLists.txt index d6c994245587..85be1a4d1a55 100644 --- a/packages/panzer/dof-mgr/example/CartesianScaling/CMakeLists.txt +++ b/packages/panzer/dof-mgr/example/CartesianScaling/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/cartesian_topology) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/cartesian_topology) SET(ScalingTest_SOURCES main.cpp diff --git a/packages/panzer/dof-mgr/src/CMakeLists.txt b/packages/panzer/dof-mgr/src/CMakeLists.txt index 68acd5b87de9..1f6fd7ede267 100644 --- a/packages/panzer/dof-mgr/src/CMakeLists.txt +++ b/packages/panzer/dof-mgr/src/CMakeLists.txt @@ -2,17 +2,17 @@ SET(HEADERS "") SET(SOURCES "") TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.hpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.hpp ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # auto generate headers, add to dependencies and include directories TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/*.hpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) APPEND_GLOB(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) diff --git a/packages/panzer/dof-mgr/test/cartesian_topology/CMakeLists.txt b/packages/panzer/dof-mgr/test/cartesian_topology/CMakeLists.txt index 38911dfa276c..0a15245539c4 100644 --- a/packages/panzer/dof-mgr/test/cartesian_topology/CMakeLists.txt +++ b/packages/panzer/dof-mgr/test/cartesian_topology/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/dof-mgr/test/dofmngr_test/CMakeLists.txt b/packages/panzer/dof-mgr/test/dofmngr_test/CMakeLists.txt index 0100d4e0b299..eeb7aea0e3dc 100644 --- a/packages/panzer/dof-mgr/test/dofmngr_test/CMakeLists.txt +++ b/packages/panzer/dof-mgr/test/dofmngr_test/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/dof-mgr/test/fe_assembly/CMakeLists.txt b/packages/panzer/dof-mgr/test/fe_assembly/CMakeLists.txt index 76e0a93edcf6..ef36ab814fbe 100644 --- a/packages/panzer/dof-mgr/test/fe_assembly/CMakeLists.txt +++ b/packages/panzer/dof-mgr/test/fe_assembly/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/dof-mgr/test/field_pattern/CMakeLists.txt b/packages/panzer/dof-mgr/test/field_pattern/CMakeLists.txt index b81bc9af24b3..8470b23b1f7b 100644 --- a/packages/panzer/dof-mgr/test/field_pattern/CMakeLists.txt +++ b/packages/panzer/dof-mgr/test/field_pattern/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(UNIT_TEST_DRIVER ${PANZER_UNIT_TEST_MAIN}) diff --git a/packages/panzer/expr-eval/src/CMakeLists.txt b/packages/panzer/expr-eval/src/CMakeLists.txt index 4862b1d0aa38..3b99dc9aaf86 100644 --- a/packages/panzer/expr-eval/src/CMakeLists.txt +++ b/packages/panzer/expr-eval/src/CMakeLists.txt @@ -6,7 +6,7 @@ SET(SOURCES Panzer_ExprEval.cpp ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_LIBRARY( panzer-expr-eval diff --git a/packages/panzer/mini-em/example/BlockPrec/CMakeLists.txt b/packages/panzer/mini-em/example/BlockPrec/CMakeLists.txt index 24177963831c..549c41de9c20 100644 --- a/packages/panzer/mini-em/example/BlockPrec/CMakeLists.txt +++ b/packages/panzer/mini-em/example/BlockPrec/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(BLOCK_PREC_SOURCES main.cpp diff --git a/packages/panzer/mini-em/src/CMakeLists.txt b/packages/panzer/mini-em/src/CMakeLists.txt index da66b55ce5d4..21c78fb66a8f 100644 --- a/packages/panzer/mini-em/src/CMakeLists.txt +++ b/packages/panzer/mini-em/src/CMakeLists.txt @@ -2,16 +2,16 @@ SET(HEADERS "") SET(SOURCES "") TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.hpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.hpp ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/eqn_sets) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/closures) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/solvers) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/responses) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/eqn_sets) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/closures) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/solvers) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/responses) # auto generate headers, add to dependencies and include directories TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}) @@ -20,7 +20,7 @@ TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}/closures) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}/solvers) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}/responses) APPEND_GLOB(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/*.hpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) APPEND_GLOB(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/eqn_sets/*.hpp) From 8a4480a96434ecd1e19195541aa132973ce53265 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:29:44 -0700 Subject: [PATCH 30/78] Percept: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/percept/CMakeLists.txt | 6 +++--- packages/percept/src/adapt/main/CMakeLists.txt | 2 +- packages/percept/src/adapt/sierra_element/CMakeLists.txt | 2 +- packages/percept/src/percept/CMakeLists.txt | 2 +- packages/percept/src/percept/eigen_verify/CMakeLists.txt | 2 +- packages/percept/src/percept/fixtures/CMakeLists.txt | 2 +- packages/percept/src/percept/function/CMakeLists.txt | 2 +- .../percept/src/percept/function/internal/CMakeLists.txt | 2 +- packages/percept/src/percept/math/CMakeLists.txt | 2 +- packages/percept/src/percept/mesh/gen/CMakeLists.txt | 2 +- .../percept/src/percept/mesh/mod/smoother/CMakeLists.txt | 2 +- packages/percept/src/percept/mesh_transfer/CMakeLists.txt | 2 +- packages/percept/src/percept/norm/CMakeLists.txt | 2 +- packages/percept/src/percept/stk_rebalance/CMakeLists.txt | 8 ++++---- .../src/percept/stk_rebalance_utils/CMakeLists.txt | 6 +++--- packages/percept/src/percept/util/CMakeLists.txt | 2 +- packages/percept/src/percept/xfer/CMakeLists.txt | 2 +- 17 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/percept/CMakeLists.txt b/packages/percept/CMakeLists.txt index 14f35fb2a54f..9fd5c78a2ce2 100644 --- a/packages/percept/CMakeLists.txt +++ b/packages/percept/CMakeLists.txt @@ -45,9 +45,9 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.hpp) #TRIBITS_ADD_TEST_DIRECTORIES(test) #TRIBITS_ADD_EXAMPLE_DIRECTORIES(example) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src) FILE (GLOB ADAPT_MAIN src/adapt/main/*.cpp diff --git a/packages/percept/src/adapt/main/CMakeLists.txt b/packages/percept/src/adapt/main/CMakeLists.txt index 7b0c41e8bb3a..0a7213bd2044 100644 --- a/packages/percept/src/adapt/main/CMakeLists.txt +++ b/packages/percept/src/adapt/main/CMakeLists.txt @@ -18,7 +18,7 @@ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) INCLUDE(TribitsAddExecutableAndTest) -INCLUDE_DIRECTORIES( .. ) +TRIBITS_INCLUDE_DIRECTORIES( .. ) TRIBITS_ADD_EXECUTABLE( adapt_exe_1 diff --git a/packages/percept/src/adapt/sierra_element/CMakeLists.txt b/packages/percept/src/adapt/sierra_element/CMakeLists.txt index 16ba69e047a6..db7ff60bd9dc 100644 --- a/packages/percept/src/adapt/sierra_element/CMakeLists.txt +++ b/packages/percept/src/adapt/sierra_element/CMakeLists.txt @@ -21,7 +21,7 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) diff --git a/packages/percept/src/percept/CMakeLists.txt b/packages/percept/src/percept/CMakeLists.txt index 154877326ff0..3c27455a8420 100644 --- a/packages/percept/src/percept/CMakeLists.txt +++ b/packages/percept/src/percept/CMakeLists.txt @@ -13,7 +13,7 @@ ADD_SUBDIRECTORY(eigen_verify) TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_search) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_search) SET(HEADERS "") SET(SOURCES "") diff --git a/packages/percept/src/percept/eigen_verify/CMakeLists.txt b/packages/percept/src/percept/eigen_verify/CMakeLists.txt index 4dd4db234ac1..8297630c0977 100644 --- a/packages/percept/src/percept/eigen_verify/CMakeLists.txt +++ b/packages/percept/src/percept/eigen_verify/CMakeLists.txt @@ -22,7 +22,7 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) diff --git a/packages/percept/src/percept/fixtures/CMakeLists.txt b/packages/percept/src/percept/fixtures/CMakeLists.txt index 9bafa3009fa2..54a63181c85a 100644 --- a/packages/percept/src/percept/fixtures/CMakeLists.txt +++ b/packages/percept/src/percept/fixtures/CMakeLists.txt @@ -22,7 +22,7 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) diff --git a/packages/percept/src/percept/function/CMakeLists.txt b/packages/percept/src/percept/function/CMakeLists.txt index d55de5ad42f6..b14d5215764a 100644 --- a/packages/percept/src/percept/function/CMakeLists.txt +++ b/packages/percept/src/percept/function/CMakeLists.txt @@ -24,7 +24,7 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) diff --git a/packages/percept/src/percept/function/internal/CMakeLists.txt b/packages/percept/src/percept/function/internal/CMakeLists.txt index 7f768c557e20..d718ea301dca 100644 --- a/packages/percept/src/percept/function/internal/CMakeLists.txt +++ b/packages/percept/src/percept/function/internal/CMakeLists.txt @@ -23,7 +23,7 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) diff --git a/packages/percept/src/percept/math/CMakeLists.txt b/packages/percept/src/percept/math/CMakeLists.txt index d4c6c43df05d..d83fafad1676 100644 --- a/packages/percept/src/percept/math/CMakeLists.txt +++ b/packages/percept/src/percept/math/CMakeLists.txt @@ -22,7 +22,7 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) diff --git a/packages/percept/src/percept/mesh/gen/CMakeLists.txt b/packages/percept/src/percept/mesh/gen/CMakeLists.txt index 15a32242060c..336ed1aea6d0 100644 --- a/packages/percept/src/percept/mesh/gen/CMakeLists.txt +++ b/packages/percept/src/percept/mesh/gen/CMakeLists.txt @@ -22,7 +22,7 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) diff --git a/packages/percept/src/percept/mesh/mod/smoother/CMakeLists.txt b/packages/percept/src/percept/mesh/mod/smoother/CMakeLists.txt index c91036c1f74e..3c4c14bcc80e 100644 --- a/packages/percept/src/percept/mesh/mod/smoother/CMakeLists.txt +++ b/packages/percept/src/percept/mesh/mod/smoother/CMakeLists.txt @@ -22,7 +22,7 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) diff --git a/packages/percept/src/percept/mesh_transfer/CMakeLists.txt b/packages/percept/src/percept/mesh_transfer/CMakeLists.txt index 4dd4db234ac1..8297630c0977 100644 --- a/packages/percept/src/percept/mesh_transfer/CMakeLists.txt +++ b/packages/percept/src/percept/mesh_transfer/CMakeLists.txt @@ -22,7 +22,7 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) diff --git a/packages/percept/src/percept/norm/CMakeLists.txt b/packages/percept/src/percept/norm/CMakeLists.txt index 2e89ea817145..9e64a329d741 100644 --- a/packages/percept/src/percept/norm/CMakeLists.txt +++ b/packages/percept/src/percept/norm/CMakeLists.txt @@ -22,7 +22,7 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) diff --git a/packages/percept/src/percept/stk_rebalance/CMakeLists.txt b/packages/percept/src/percept/stk_rebalance/CMakeLists.txt index 90ab2927627f..c6b754cdad54 100644 --- a/packages/percept/src/percept/stk_rebalance/CMakeLists.txt +++ b/packages/percept/src/percept/stk_rebalance/CMakeLists.txt @@ -22,15 +22,15 @@ SET(SOURCES "") FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES *.cpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../) # # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (TPL_ENABLE_MPI) ENDIF() diff --git a/packages/percept/src/percept/stk_rebalance_utils/CMakeLists.txt b/packages/percept/src/percept/stk_rebalance_utils/CMakeLists.txt index 2582b190caa9..c3c6c05bdb24 100644 --- a/packages/percept/src/percept/stk_rebalance_utils/CMakeLists.txt +++ b/packages/percept/src/percept/stk_rebalance_utils/CMakeLists.txt @@ -1,9 +1,9 @@ INCLUDE(TribitsAddExecutableAndTest) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_util) SET(SOURCES "") SET(HEADERS "") diff --git a/packages/percept/src/percept/util/CMakeLists.txt b/packages/percept/src/percept/util/CMakeLists.txt index c0322edb5325..01e3be97be7b 100644 --- a/packages/percept/src/percept/util/CMakeLists.txt +++ b/packages/percept/src/percept/util/CMakeLists.txt @@ -22,7 +22,7 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) diff --git a/packages/percept/src/percept/xfer/CMakeLists.txt b/packages/percept/src/percept/xfer/CMakeLists.txt index 4b62ea746af0..7b6ea065352d 100644 --- a/packages/percept/src/percept/xfer/CMakeLists.txt +++ b/packages/percept/src/percept/xfer/CMakeLists.txt @@ -22,7 +22,7 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) From f13098988bc51bf2c727a14a05f17b7cd7794e49 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:30:49 -0700 Subject: [PATCH 31/78] Phalanx: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/phalanx/example/FiniteElementAssembly/CMakeLists.txt | 2 +- .../example/FiniteElementAssembly_DeviceDag/CMakeLists.txt | 2 +- .../FiniteElementAssembly_MixedFieldTypes/CMakeLists.txt | 2 +- packages/phalanx/src/CMakeLists.txt | 4 ++-- packages/phalanx/test/Kokkos/CMakeLists.txt | 4 ++-- .../phalanx/test/Performance/FieldAccessors/CMakeLists.txt | 4 ++-- packages/phalanx/test/Utilities/CMakeLists.txt | 2 +- packages/phalanx/test/ViewOfViews/CMakeLists.txt | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/phalanx/example/FiniteElementAssembly/CMakeLists.txt b/packages/phalanx/example/FiniteElementAssembly/CMakeLists.txt index 907d1fb8db0a..a2c67c1bb4d1 100644 --- a/packages/phalanx/example/FiniteElementAssembly/CMakeLists.txt +++ b/packages/phalanx/example/FiniteElementAssembly/CMakeLists.txt @@ -1,7 +1,7 @@ TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/evaluators) SET(example_fem_SOURCES diff --git a/packages/phalanx/example/FiniteElementAssembly_DeviceDag/CMakeLists.txt b/packages/phalanx/example/FiniteElementAssembly_DeviceDag/CMakeLists.txt index d208be4c8d94..9f489f200430 100644 --- a/packages/phalanx/example/FiniteElementAssembly_DeviceDag/CMakeLists.txt +++ b/packages/phalanx/example/FiniteElementAssembly_DeviceDag/CMakeLists.txt @@ -5,7 +5,7 @@ IF(PHX_ENABLE_DEVICE_DAG) TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/evaluators) # Reuse files from other example diff --git a/packages/phalanx/example/FiniteElementAssembly_MixedFieldTypes/CMakeLists.txt b/packages/phalanx/example/FiniteElementAssembly_MixedFieldTypes/CMakeLists.txt index ba1bc482293c..2cff928886ee 100644 --- a/packages/phalanx/example/FiniteElementAssembly_MixedFieldTypes/CMakeLists.txt +++ b/packages/phalanx/example/FiniteElementAssembly_MixedFieldTypes/CMakeLists.txt @@ -1,7 +1,7 @@ TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/evaluators) # Reuse files from other example diff --git a/packages/phalanx/src/CMakeLists.txt b/packages/phalanx/src/CMakeLists.txt index 88f181c4e008..e9e430b89edc 100644 --- a/packages/phalanx/src/CMakeLists.txt +++ b/packages/phalanx/src/CMakeLists.txt @@ -11,13 +11,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.hpp) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.hpp ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) APPEND_GLOB(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) diff --git a/packages/phalanx/test/Kokkos/CMakeLists.txt b/packages/phalanx/test/Kokkos/CMakeLists.txt index ddf102ec3d20..2b2cedd77c0d 100644 --- a/packages/phalanx/test/Kokkos/CMakeLists.txt +++ b/packages/phalanx/test/Kokkos/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../Utilities) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../Utilities) TRIBITS_ADD_EXECUTABLE_AND_TEST( tKokkos diff --git a/packages/phalanx/test/Performance/FieldAccessors/CMakeLists.txt b/packages/phalanx/test/Performance/FieldAccessors/CMakeLists.txt index a362f52902d9..876acf82223f 100644 --- a/packages/phalanx/test/Performance/FieldAccessors/CMakeLists.txt +++ b/packages/phalanx/test/Performance/FieldAccessors/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../../Utilities) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../../Utilities) TRIBITS_ADD_EXECUTABLE_AND_TEST( performance_field_accessors diff --git a/packages/phalanx/test/Utilities/CMakeLists.txt b/packages/phalanx/test/Utilities/CMakeLists.txt index 3f5c3c8b7319..e27b7cc5d2ea 100644 --- a/packages/phalanx/test/Utilities/CMakeLists.txt +++ b/packages/phalanx/test/Utilities/CMakeLists.txt @@ -2,7 +2,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS diff --git a/packages/phalanx/test/ViewOfViews/CMakeLists.txt b/packages/phalanx/test/ViewOfViews/CMakeLists.txt index 61f67e86e4bc..6019d970853a 100644 --- a/packages/phalanx/test/ViewOfViews/CMakeLists.txt +++ b/packages/phalanx/test/ViewOfViews/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../Utilities) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../Utilities) TRIBITS_ADD_EXECUTABLE_AND_TEST( tViewOfViews From 362da71c96ddd85470ae6029b3251b19fa85e1f5 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:31:15 -0700 Subject: [PATCH 32/78] Pike: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/pike/blackbox/test/core/CMakeLists.txt | 4 ++-- packages/pike/blackbox/test/models/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/pike/blackbox/test/core/CMakeLists.txt b/packages/pike/blackbox/test/core/CMakeLists.txt index 620d5cfbe7d7..94a2cec4fd79 100644 --- a/packages/pike/blackbox/test/core/CMakeLists.txt +++ b/packages/pike/blackbox/test/core/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../models) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../models) SET(UNIT_TEST_DRIVER ${TEUCHOS_STD_UNIT_TEST_MAIN}) diff --git a/packages/pike/blackbox/test/models/CMakeLists.txt b/packages/pike/blackbox/test/models/CMakeLists.txt index 577701908999..90606ef39773 100644 --- a/packages/pike/blackbox/test/models/CMakeLists.txt +++ b/packages/pike/blackbox/test/models/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS "") SET(NOINSTALLHEADERS "") From 5fe63445123f0f7c6b32039375a2af3c4a9166e1 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:31:34 -0700 Subject: [PATCH 33/78] Piro: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/piro/src/CMakeLists.txt | 8 ++++---- packages/piro/test/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/piro/src/CMakeLists.txt b/packages/piro/src/CMakeLists.txt index 044e5f1e4e0e..13ecef775e29 100644 --- a/packages/piro/src/CMakeLists.txt +++ b/packages/piro/src/CMakeLists.txt @@ -10,8 +10,8 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.hpp) # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.hpp ) @@ -170,8 +170,8 @@ ENDIF() # Add rol/adapters/thyra directories if Rol is enabled IF (Piro_ENABLE_ROL) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../rol/adapters/thyra/src/function) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../rol/adapters/thyra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../rol/adapters/thyra/src/function) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../rol/adapters/thyra/src/vector) ENDIF() # diff --git a/packages/piro/test/CMakeLists.txt b/packages/piro/test/CMakeLists.txt index ad7f77863834..73d4bbe8fc95 100644 --- a/packages/piro/test/CMakeLists.txt +++ b/packages/piro/test/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) LINK_DIRECTORIES(${PACKAGE_BINARY_DIR}/../TriKota/Dakota/install/lib/) # Required for Dakota From de68e4f6e655d4c9f4c588c9ee713d61f582c171 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:31:50 -0700 Subject: [PATCH 34/78] Pilris: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/pliris/src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/pliris/src/CMakeLists.txt b/packages/pliris/src/CMakeLists.txt index 96a9632913fa..92bb858913ad 100644 --- a/packages/pliris/src/CMakeLists.txt +++ b/packages/pliris/src/CMakeLists.txt @@ -21,13 +21,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # Core files From 471728cf59b07c7da97094206a66281401cb8942 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:35:19 -0700 Subject: [PATCH 35/78] ROL: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. NOTE: Running these files through the script token-replace.py also resulted in removing the DOS/Windows carriage return from one of the files BuildOptions.cmake. This will cause conflicts with any merges but this is arguably the right thing to do for a file like this. --- .../rol/adapters/arrayfire/CMakeLists.txt | 2 +- .../rol/adapters/arrayfire/src/CMakeLists.txt | 6 +- packages/rol/adapters/belos/CMakeLists.txt | 4 +- .../rol/adapters/belos/src/CMakeLists.txt | 8 +- .../adapters/belos/test/vector/CMakeLists.txt | 2 +- packages/rol/adapters/eigen/CMakeLists.txt | 2 +- .../rol/adapters/eigen/src/CMakeLists.txt | 6 +- packages/rol/adapters/epetra/CMakeLists.txt | 4 +- .../rol/adapters/epetra/src/CMakeLists.txt | 8 +- .../rol/adapters/minitensor/CMakeLists.txt | 6 +- .../adapters/minitensor/src/CMakeLists.txt | 14 +- packages/rol/adapters/mpi/CMakeLists.txt | 4 +- packages/rol/adapters/mpi/src/CMakeLists.txt | 8 +- packages/rol/adapters/pebbl/CMakeLists.txt | 6 +- .../rol/adapters/pebbl/src/CMakeLists.txt | 10 +- packages/rol/adapters/sacado/CMakeLists.txt | 2 +- .../rol/adapters/sacado/src/CMakeLists.txt | 6 +- .../rol/adapters/sacado/test/CMakeLists.txt | 2 +- packages/rol/adapters/teuchos/CMakeLists.txt | 6 +- .../rol/adapters/teuchos/src/CMakeLists.txt | 12 +- packages/rol/adapters/thyra/CMakeLists.txt | 4 +- .../rol/adapters/thyra/src/CMakeLists.txt | 8 +- packages/rol/adapters/tpetra/CMakeLists.txt | 10 +- .../rol/adapters/tpetra/src/CMakeLists.txt | 14 +- .../adapters/tpetra/test/sol/CMakeLists.txt | 2 +- .../tpetra/test/vector/CMakeLists.txt | 4 +- packages/rol/adapters/trikota/CMakeLists.txt | 4 +- .../rol/adapters/trikota/src/CMakeLists.txt | 8 +- .../adapters/trikota/test/sol/CMakeLists.txt | 2 +- packages/rol/cmake/BuildOptions.cmake | 248 +++++++++--------- .../PDE-OPT/0ld/adv-diff-react/CMakeLists.txt | 2 +- .../PDE-OPT/0ld/elasticity/CMakeLists.txt | 2 +- .../CMakeLists.txt | 6 +- .../PDE-OPT/0ld/poisson/CMakeLists.txt | 2 +- .../0ld/stefan-boltzmann/CMakeLists.txt | 6 +- .../PDE-OPT/0ld/stoch-adv-diff/CMakeLists.txt | 6 +- .../multipleFrequency/CMakeLists.txt | 6 +- .../helmholtz/singleFrequency/CMakeLists.txt | 6 +- .../example/poisson/singleObs/CMakeLists.txt | 6 +- .../PDE-OPT/adv-diff-react/CMakeLists.txt | 6 +- .../example/PDE-OPT/allen-cahn/CMakeLists.txt | 6 +- .../binary/adv-diff-SUR/CMakeLists.txt | 16 +- .../binary/adv-diff-TEST/CMakeLists.txt | 18 +- .../PDE-OPT/binary/adv-diff/CMakeLists.txt | 16 +- .../PDE-OPT/binary/elasticity/CMakeLists.txt | 14 +- .../binary/stefan-boltzmann/CMakeLists.txt | 18 +- .../PDE-OPT/dynamic/adv_diff/CMakeLists.txt | 2 +- .../dynamic/navier-stokes/CMakeLists.txt | 12 +- .../PDE-OPT/dynamic/semilinear/CMakeLists.txt | 8 +- .../dynamic/thermal-fluids/CMakeLists.txt | 6 +- .../flow-opt/3dim/models/darcy/CMakeLists.txt | 6 +- .../models/brinkman/CMakeLists.txt | 6 +- .../axisymmetric/models/darcy/CMakeLists.txt | 6 +- .../models/filteredDarcy/CMakeLists.txt | 6 +- .../PDE-OPT/fractional/poisson/CMakeLists.txt | 2 +- .../PDE-OPT/ginzburg-landau/CMakeLists.txt | 4 +- .../example/PDE-OPT/helmholtz/CMakeLists.txt | 4 +- .../PDE-OPT/navier-stokes/CMakeLists.txt | 6 +- .../PDE-OPT/nonlinear-elliptic/CMakeLists.txt | 6 +- .../example/PDE-OPT/obstacle/CMakeLists.txt | 2 +- .../PDE-OPT/poisson-boltzmann/CMakeLists.txt | 6 +- .../example/PDE-OPT/poisson/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../IMAvolumes_KouriRidzal2017/CMakeLists.txt | 10 +- .../MPA_KouriSurowiec2019/CMakeLists.txt | 6 +- .../CMakeLists.txt | 6 +- .../TRSPG_Kouri2021/dualksvm/CMakeLists.txt | 6 +- .../TRSPG_Kouri2021/dualsvm/CMakeLists.txt | 6 +- .../TRSPG_Kouri2021/elasticity/CMakeLists.txt | 6 +- .../TRSPG_Kouri2021/lasso/CMakeLists.txt | 6 +- .../navier-stokes/CMakeLists.txt | 6 +- .../TRSPG_Kouri2021/simpreg/CMakeLists.txt | 6 +- .../PDE-OPT/stefan-boltzmann/CMakeLists.txt | 6 +- .../rol/example/PDE-OPT/stokes/CMakeLists.txt | 4 +- .../PDE-OPT/thermal-fluids/CMakeLists.txt | 6 +- .../topo-opt/elasticity/CMakeLists.txt | 6 +- .../PDE-OPT/topo-opt/multimat/CMakeLists.txt | 6 +- .../topo-opt/navier-stokes/CMakeLists.txt | 6 +- .../PDE-OPT/topo-opt/poisson/CMakeLists.txt | 2 +- .../rol/example/PinT/nonlinear/CMakeLists.txt | 4 +- .../PinT/parabolic-control/CMakeLists.txt | 4 +- .../rol/example/PinT/tanks/CMakeLists.txt | 4 +- packages/rol/example/arrayfire/CMakeLists.txt | 2 +- .../example/burgers-control/CMakeLists.txt | 2 +- packages/rol/example/json/CMakeLists.txt | 2 +- .../rol/example/l1-penalty/CMakeLists.txt | 4 +- .../example/poisson-control/CMakeLists.txt | 4 +- packages/rol/example/sacado/CMakeLists.txt | 4 +- packages/rol/example/tempus/CMakeLists.txt | 2 +- .../rol/example/tensor-opt/CMakeLists.txt | 2 +- packages/rol/src/CMakeLists.txt | 38 +-- packages/rol/src/compatibility/CMakeLists.txt | 4 +- packages/rol/test/elementwise/CMakeLists.txt | 2 +- .../test/step/interiorpoint/CMakeLists.txt | 4 +- 94 files changed, 410 insertions(+), 410 deletions(-) diff --git a/packages/rol/adapters/arrayfire/CMakeLists.txt b/packages/rol/adapters/arrayfire/CMakeLists.txt index d6908bce8ca4..b29037a16a06 100644 --- a/packages/rol/adapters/arrayfire/CMakeLists.txt +++ b/packages/rol/adapters/arrayfire/CMakeLists.txt @@ -1,4 +1,4 @@ ADD_SUBDIRECTORY(src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) TRIBITS_ADD_TEST_DIRECTORIES(test) diff --git a/packages/rol/adapters/arrayfire/src/CMakeLists.txt b/packages/rol/adapters/arrayfire/src/CMakeLists.txt index f88159867815..00eebc051433 100644 --- a/packages/rol/adapters/arrayfire/src/CMakeLists.txt +++ b/packages/rol/adapters/arrayfire/src/CMakeLists.txt @@ -17,9 +17,9 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # All headers @@ -31,7 +31,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_ArrayFireCPU) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) ENDIF() diff --git a/packages/rol/adapters/belos/CMakeLists.txt b/packages/rol/adapters/belos/CMakeLists.txt index 7ca1b8510e31..34b61a43e3d5 100644 --- a/packages/rol/adapters/belos/CMakeLists.txt +++ b/packages/rol/adapters/belos/CMakeLists.txt @@ -1,7 +1,7 @@ ADD_SUBDIRECTORY(src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) TRIBITS_ADD_TEST_DIRECTORIES(test) diff --git a/packages/rol/adapters/belos/src/CMakeLists.txt b/packages/rol/adapters/belos/src/CMakeLists.txt index 878d1b822246..9b2512a5c44d 100644 --- a/packages/rol/adapters/belos/src/CMakeLists.txt +++ b/packages/rol/adapters/belos/src/CMakeLists.txt @@ -17,9 +17,9 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # All headers @@ -32,12 +32,12 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_Belos) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) diff --git a/packages/rol/adapters/belos/test/vector/CMakeLists.txt b/packages/rol/adapters/belos/test/vector/CMakeLists.txt index 56a78b7db366..5bf4bc8385e2 100644 --- a/packages/rol/adapters/belos/test/vector/CMakeLists.txt +++ b/packages/rol/adapters/belos/test/vector/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/vector) IF(${PROJECT_NAME}_ENABLE_Belos) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/rol/adapters/eigen/CMakeLists.txt b/packages/rol/adapters/eigen/CMakeLists.txt index d6908bce8ca4..b29037a16a06 100644 --- a/packages/rol/adapters/eigen/CMakeLists.txt +++ b/packages/rol/adapters/eigen/CMakeLists.txt @@ -1,4 +1,4 @@ ADD_SUBDIRECTORY(src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) TRIBITS_ADD_TEST_DIRECTORIES(test) diff --git a/packages/rol/adapters/eigen/src/CMakeLists.txt b/packages/rol/adapters/eigen/src/CMakeLists.txt index fe46e5bb713c..f2ad43b166cb 100644 --- a/packages/rol/adapters/eigen/src/CMakeLists.txt +++ b/packages/rol/adapters/eigen/src/CMakeLists.txt @@ -17,9 +17,9 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # All headers @@ -32,7 +32,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_Eigen) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) diff --git a/packages/rol/adapters/epetra/CMakeLists.txt b/packages/rol/adapters/epetra/CMakeLists.txt index 11ee6adac82b..a95ae194cd32 100644 --- a/packages/rol/adapters/epetra/CMakeLists.txt +++ b/packages/rol/adapters/epetra/CMakeLists.txt @@ -1,6 +1,6 @@ ADD_SUBDIRECTORY(src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/sol) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/sol) TRIBITS_ADD_TEST_DIRECTORIES(test) diff --git a/packages/rol/adapters/epetra/src/CMakeLists.txt b/packages/rol/adapters/epetra/src/CMakeLists.txt index 11b20e4474b4..cd60f4fcc1a1 100644 --- a/packages/rol/adapters/epetra/src/CMakeLists.txt +++ b/packages/rol/adapters/epetra/src/CMakeLists.txt @@ -17,9 +17,9 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # All headers @@ -32,11 +32,11 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_Epetra) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) ENDIF() diff --git a/packages/rol/adapters/minitensor/CMakeLists.txt b/packages/rol/adapters/minitensor/CMakeLists.txt index 771c3f934528..9f979b39d62b 100644 --- a/packages/rol/adapters/minitensor/CMakeLists.txt +++ b/packages/rol/adapters/minitensor/CMakeLists.txt @@ -1,7 +1,7 @@ ADD_SUBDIRECTORY(src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/sol) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/sol) IF (ROL_ENABLE_Gtest) TRIBITS_ADD_TEST_DIRECTORIES(test) ENDIF() diff --git a/packages/rol/adapters/minitensor/src/CMakeLists.txt b/packages/rol/adapters/minitensor/src/CMakeLists.txt index e4f4b971cf69..03884f5e79b9 100644 --- a/packages/rol/adapters/minitensor/src/CMakeLists.txt +++ b/packages/rol/adapters/minitensor/src/CMakeLists.txt @@ -17,9 +17,9 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # All headers @@ -30,7 +30,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # IF (ROL_ENABLE_Boost AND ROL_ENABLE_MiniTensor) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/vector) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/vector) APPEND_SET(HEADERS vector/ROL_MiniTensor_Vector.hpp vector/ROL_MiniTensor_Vector_Def.hpp @@ -42,7 +42,7 @@ ENDIF() # IF (ROL_ENABLE_Boost AND ROL_ENABLE_MiniTensor) -# INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/function) +# TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/function) # APPEND_SET(HEADERS # function/ROL_MiniTensor_BoundConstraint.hpp # function/ROL_MiniTensor_BoundConstraint_Def.hpp @@ -54,7 +54,7 @@ IF (ROL_ENABLE_Boost AND ROL_ENABLE_MiniTensor) # function/ROL_MiniTensor_InequalityConstraint_Def.hpp # ) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) ENDIF() @@ -64,14 +64,14 @@ ENDIF() # IF (ROL_ENABLE_Boost AND ROL_ENABLE_MiniTensor) -# INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sol) +# TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sol) # APPEND_SET(HEADERS # sol/ROL_MiniTensor_MiniSolver.hpp # sol/ROL_MiniTensor_MiniSolver_Def.hpp # ) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) ENDIF() diff --git a/packages/rol/adapters/mpi/CMakeLists.txt b/packages/rol/adapters/mpi/CMakeLists.txt index cda8ef8405c7..d472e9f6a6f8 100644 --- a/packages/rol/adapters/mpi/CMakeLists.txt +++ b/packages/rol/adapters/mpi/CMakeLists.txt @@ -1,6 +1,6 @@ ADD_SUBDIRECTORY(src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) TRIBITS_ADD_TEST_DIRECTORIES(test) diff --git a/packages/rol/adapters/mpi/src/CMakeLists.txt b/packages/rol/adapters/mpi/src/CMakeLists.txt index 936a65954e08..bfc7980a4666 100644 --- a/packages/rol/adapters/mpi/src/CMakeLists.txt +++ b/packages/rol/adapters/mpi/src/CMakeLists.txt @@ -17,14 +17,14 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # All headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/vector) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/vector) APPEND_SET(HEADERS vector/ROL_PinTVector.hpp vector/ROL_PinTCommunicators.hpp @@ -32,7 +32,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/vector) vector/ROL_PinTVectorCommunication_StdVector.hpp ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/function) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/function) APPEND_SET(HEADERS function/ROL_PinTConstraint.hpp ) diff --git a/packages/rol/adapters/pebbl/CMakeLists.txt b/packages/rol/adapters/pebbl/CMakeLists.txt index bc939329ceeb..1959bd6e10a5 100644 --- a/packages/rol/adapters/pebbl/CMakeLists.txt +++ b/packages/rol/adapters/pebbl/CMakeLists.txt @@ -1,7 +1,7 @@ ADD_SUBDIRECTORY(src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/algorithm) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/algorithm) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) TRIBITS_ADD_TEST_DIRECTORIES(test) diff --git a/packages/rol/adapters/pebbl/src/CMakeLists.txt b/packages/rol/adapters/pebbl/src/CMakeLists.txt index e8ce42e2599e..491d0c47bdd1 100644 --- a/packages/rol/adapters/pebbl/src/CMakeLists.txt +++ b/packages/rol/adapters/pebbl/src/CMakeLists.txt @@ -17,26 +17,26 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # All headers # IF (ROL_ENABLE_pebbl) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithm) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithm) APPEND_SET(HEADERS algorithm/*.hpp ) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/function) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/function) APPEND_SET(HEADERS function/*.hpp ) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/vector) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/vector) APPEND_SET(HEADERS vector/*.hpp ) diff --git a/packages/rol/adapters/sacado/CMakeLists.txt b/packages/rol/adapters/sacado/CMakeLists.txt index 52f58055cec2..2f3d7e3bdb27 100644 --- a/packages/rol/adapters/sacado/CMakeLists.txt +++ b/packages/rol/adapters/sacado/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) ADD_SUBDIRECTORY(src) diff --git a/packages/rol/adapters/sacado/src/CMakeLists.txt b/packages/rol/adapters/sacado/src/CMakeLists.txt index a7a9ac905f1f..842ad5038974 100644 --- a/packages/rol/adapters/sacado/src/CMakeLists.txt +++ b/packages/rol/adapters/sacado/src/CMakeLists.txt @@ -17,9 +17,9 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # All headers @@ -32,7 +32,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_Sacado) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) ENDIF() diff --git a/packages/rol/adapters/sacado/test/CMakeLists.txt b/packages/rol/adapters/sacado/test/CMakeLists.txt index 5f61739c5c38..ef6d8f6fa5a1 100644 --- a/packages/rol/adapters/sacado/test/CMakeLists.txt +++ b/packages/rol/adapters/sacado/test/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(HS) +TRIBITS_INCLUDE_DIRECTORIES(HS) TRIBITS_ADD_EXECUTABLE_AND_TEST( NonlinearProblemTest diff --git a/packages/rol/adapters/teuchos/CMakeLists.txt b/packages/rol/adapters/teuchos/CMakeLists.txt index 98ee116b6045..96148a0e4e85 100644 --- a/packages/rol/adapters/teuchos/CMakeLists.txt +++ b/packages/rol/adapters/teuchos/CMakeLists.txt @@ -1,7 +1,7 @@ ADD_SUBDIRECTORY(src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/sol) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/sol) TRIBITS_ADD_TEST_DIRECTORIES(test) diff --git a/packages/rol/adapters/teuchos/src/CMakeLists.txt b/packages/rol/adapters/teuchos/src/CMakeLists.txt index b16e8c8d834f..e7d8061db2ec 100644 --- a/packages/rol/adapters/teuchos/src/CMakeLists.txt +++ b/packages/rol/adapters/teuchos/src/CMakeLists.txt @@ -17,8 +17,8 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # All headers @@ -27,21 +27,21 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_Teuchos) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) IF (ROL_ENABLE_pebbl) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/pebbl ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) ENDIF() diff --git a/packages/rol/adapters/thyra/CMakeLists.txt b/packages/rol/adapters/thyra/CMakeLists.txt index cda8ef8405c7..d472e9f6a6f8 100644 --- a/packages/rol/adapters/thyra/CMakeLists.txt +++ b/packages/rol/adapters/thyra/CMakeLists.txt @@ -1,6 +1,6 @@ ADD_SUBDIRECTORY(src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) TRIBITS_ADD_TEST_DIRECTORIES(test) diff --git a/packages/rol/adapters/thyra/src/CMakeLists.txt b/packages/rol/adapters/thyra/src/CMakeLists.txt index ed56b7253344..f5959a80b579 100644 --- a/packages/rol/adapters/thyra/src/CMakeLists.txt +++ b/packages/rol/adapters/thyra/src/CMakeLists.txt @@ -17,9 +17,9 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # All headers @@ -32,12 +32,12 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_Thyra) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) ENDIF() diff --git a/packages/rol/adapters/tpetra/CMakeLists.txt b/packages/rol/adapters/tpetra/CMakeLists.txt index b6f7b5f05e2f..16e336a13926 100644 --- a/packages/rol/adapters/tpetra/CMakeLists.txt +++ b/packages/rol/adapters/tpetra/CMakeLists.txt @@ -1,9 +1,9 @@ ADD_SUBDIRECTORY(src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/sol) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/mpi) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/pebbl) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/function) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/sol) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/mpi) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/pebbl) TRIBITS_ADD_TEST_DIRECTORIES(test) diff --git a/packages/rol/adapters/tpetra/src/CMakeLists.txt b/packages/rol/adapters/tpetra/src/CMakeLists.txt index 455db14edba1..83b0ec3d4387 100644 --- a/packages/rol/adapters/tpetra/src/CMakeLists.txt +++ b/packages/rol/adapters/tpetra/src/CMakeLists.txt @@ -18,9 +18,9 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # @@ -34,17 +34,17 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_Tpetra) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) IF (ROL_ENABLE_Teuchos) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) ENDIF() @@ -52,13 +52,13 @@ IF (ROL_ENABLE_Tpetra) # add in the MPI code IF( TPL_ENABLE_MPI ) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/mpi ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) ENDIF() IF (ROL_ENABLE_pebbl) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/pebbl ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) ENDIF() diff --git a/packages/rol/adapters/tpetra/test/sol/CMakeLists.txt b/packages/rol/adapters/tpetra/test/sol/CMakeLists.txt index c66fcb5b4f9d..f1add78901ae 100644 --- a/packages/rol/adapters/tpetra/test/sol/CMakeLists.txt +++ b/packages/rol/adapters/tpetra/test/sol/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) IF(${PROJECT_NAME}_ENABLE_Tpetra) diff --git a/packages/rol/adapters/tpetra/test/vector/CMakeLists.txt b/packages/rol/adapters/tpetra/test/vector/CMakeLists.txt index 037edc965822..53dd17cf62b3 100644 --- a/packages/rol/adapters/tpetra/test/vector/CMakeLists.txt +++ b/packages/rol/adapters/tpetra/test/vector/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/vector) IF(${PROJECT_NAME}_ENABLE_Tpetra) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/rol/adapters/trikota/CMakeLists.txt b/packages/rol/adapters/trikota/CMakeLists.txt index f32d10fca9d0..8a2b31312638 100644 --- a/packages/rol/adapters/trikota/CMakeLists.txt +++ b/packages/rol/adapters/trikota/CMakeLists.txt @@ -1,6 +1,6 @@ ADD_SUBDIRECTORY(src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/sol) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/sol/sparse_grids) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/sol) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/sol/sparse_grids) TRIBITS_ADD_TEST_DIRECTORIES(test) diff --git a/packages/rol/adapters/trikota/src/CMakeLists.txt b/packages/rol/adapters/trikota/src/CMakeLists.txt index 31cd3b71996b..f088c3892f59 100644 --- a/packages/rol/adapters/trikota/src/CMakeLists.txt +++ b/packages/rol/adapters/trikota/src/CMakeLists.txt @@ -17,9 +17,9 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # All headers @@ -32,11 +32,11 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_TriKota) SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol ) - INCLUDE_DIRECTORIES( ${DIR} ) + TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) # SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol) -# INCLUDE_DIRECTORIES(${DIR} +# TRIBITS_INCLUDE_DIRECTORIES(${DIR} # ${DIR}/sparse_grids # ) # APPEND_SET(HEADERS ${DIR}/ROL_SparseGridGenerator.hpp diff --git a/packages/rol/adapters/trikota/test/sol/CMakeLists.txt b/packages/rol/adapters/trikota/test/sol/CMakeLists.txt index d57a471fa26d..49b59a3fa02c 100644 --- a/packages/rol/adapters/trikota/test/sol/CMakeLists.txt +++ b/packages/rol/adapters/trikota/test/sol/CMakeLists.txt @@ -1,7 +1,7 @@ IF(${PROJECT_NAME}_ENABLE_TriKota) - INCLUDE_DIRECTORIES(${ROL_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${ROL_SOURCE_DIR}/adapters/teuchos/src/sol) #TRIBITS_ADD_EXECUTABLE_AND_TEST( # SparseGridBurgersControl diff --git a/packages/rol/cmake/BuildOptions.cmake b/packages/rol/cmake/BuildOptions.cmake index 79fd1593fbd7..6589818eecb8 100644 --- a/packages/rol/cmake/BuildOptions.cmake +++ b/packages/rol/cmake/BuildOptions.cmake @@ -1,124 +1,124 @@ -INCLUDE(BuildOptionFunctions) -INCLUDE(Deprecated) - -IF( ROL_ENABLE_TIMERS ) - MESSAGE("Build ROL with Teuchos TimeMonitors enabled.") - OPTION( ROL_TIMERS ON ) - CONFIGURE_FILE("${PACKAGE_SOURCE_DIR}/cmake/ROL_config.h.in" ROL_config.h @ONLY) -ENDIF( ROL_ENABLE_TIMERS ) - -SET_PROPERTY( GLOBAL PROPERTY TEUCHOS_PARAMETERLIST "Teuchos::ParameterList" ) -SET_PROPERTY( GLOBAL PROPERTY TEUCHOS_STACKTRACE "Teuchos::stacktrace" ) -SET_PROPERTY( GLOBAL PROPERTY TEUCHOS_RCP "Teuchos::RCP" ) - -SET_PROPERTY( GLOBAL PROPERTY BACKWARD_CPP "backward-cpp" ) - -SET_PROPERTY( GLOBAL PROPERTY SIMPLE_STACKTRACE "simple" ) - -SET_PROPERTY( GLOBAL PROPERTY BOOST_PROPERTY_TREE "boost::property_tree" ) -SET_PROPERTY( GLOBAL PROPERTY BOOST_STACKTRACE "boost::stacktrace" ) -SET_PROPERTY( GLOBAL PROPERTY STD_SHARED_PTR "std::shared_ptr" ) - - -SET_DEFAULT( ROL_Ptr "Teuchos::RCP" ) -SET_DEFAULT( ROL_ParameterList "Teuchos::ParameterList" ) -SET_DEFAULT( ROL_stacktrace "Teuchos::stacktrace" ) -SET_DEFAULT( ROL_LinearAlgebra "Teuchos::SerialDense" ) -SET_DEFAULT( ROL_LAPACK "Teuchos::LAPACK" ) -SET_DEFAULT( ROL_BLAS "Teuchos::BLAS" ) - -SET( USING_TEUCHOS_ALL ON ) -SET( USING_TEUCHOS_ALL ON PARENT_SCOPE ) - -# Compatibility Directory -SET( DIR ${${PACKAGE_NAME}_SOURCE_DIR}/src/compatibility ) - - - -# Set smart pointer type -IF( ROL_Ptr STREQUAL "std::shared_ptr") - SET_PROPERTY( GLOBAL PROPERTY PTR_IMPL "std::shared_ptr" ) - SET_PROPERTY( GLOBAL PROPERTY PTR_DIR "${DIR}/std/shared_ptr" ) - SET( USING_TEUCHOS_ALL OFF ) - SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) -ELSE() - SET_PROPERTY( GLOBAL PROPERTY PTR_IMPL "Teuchos::RCP" ) - SET_PROPERTY( GLOBAL PROPERTY PTR_DIR "${DIR}/teuchos/rcp" ) -ENDIF() - - - -# Set parameter list type -IF( ROL_ParameterList STREQUAL "boost::property_tree") - SET_PROPERTY( GLOBAL PROPERTY PARAMETERLIST_IMPL "boost::property_tree" ) - SET_PROPERTY( GLOBAL PROPERTY PARAMETERLIST_DIR "${DIR}/boost/property_tree" ) - SET( USING_TEUCHOS_ALL OFF ) - SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) -ELSEIF( ROL_ParameterList STREQUAL "simple" ) - SET_PROPERTY( GLOBAL PROPERTY PARAMETERLIST_IMPL "simple" ) - SET_PROPERTY( GLOBAL PROPERTY PARAMETERLIST_DIR "${DIR}/simple/parameterlist" ) - SET( USING_TEUCHOS_ALL OFF ) - SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) -ELSE() - SET_PROPERTY( GLOBAL PROPERTY PARAMETERLIST_IMPL "Teuchos::ParameterList" ) - SET_PROPERTY( GLOBAL PROPERTY PARAMETERLIST_DIR "${DIR}/teuchos/parameterlist" ) -ENDIF() - - -# set stacktrace type -IF( ROL_stacktrace STREQUAL "backward-cpp" ) - INCLUDE(BackwardConfig) - SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_IMPL "backward-cpp" ) - SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_DIR "${DIR}/backward_cpp" ) - SET( USING_TEUCHOS_ALL OFF ) - SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) -ELSEIF( ROL_stacktrace STREQUAL "simple" ) - SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_IMPL "simple" ) - SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_DIR "${DIR}/simple/stacktrace" ) - SET( USING_TEUCHOS_ALL OFF ) - SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) -ELSEIF( ROL_stacktrace STREQUAL "boost::stacktrace") - SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_IMPL "boost::stacktrace" ) - SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_DIR "${DIR}/boost/stacktrace" ) - SET( USING_TEUCHOS_ALL OFF ) - SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) -ELSE() - SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_IMPL "Teuchos::stacktrace" ) - SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_DIR "${DIR}/teuchos/stacktrace" ) -ENDIF() - - -# Set linear algebra -IF( ROL_LinearAlgebra STREQUAL "Eigen") - SET_PROPERTY( GLOBAL PROPERTY LA_IMPL "Eigen" ) - SET_PROPERTY( GLOBAL PROPERTY LA_DIR "${DIR}/eigen" ) - find_package(Eigen3 REQUIRED) - INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR}) - SET( USING_TEUCHOS_ALL OFF ) - SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) -ELSE() - SET_PROPERTY( GLOBAL PROPERTY LA_IMPL "Teuchos::SerialDense" ) - SET_PROPERTY( GLOBAL PROPERTY LA_DIR "${DIR}/teuchos/la" ) -ENDIF() - -# Set lapack -IF( ROL_LAPACK STREQUAL "simple") - SET_PROPERTY( GLOBAL PROPERTY LAPACK_IMPL "simple" ) - SET_PROPERTY( GLOBAL PROPERTY LAPACK_DIR "${DIR}/simple/lapack" ) - SET( USING_TEUCHOS_ALL OFF ) - SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) -ELSE() - SET_PROPERTY( GLOBAL PROPERTY LAPACK_IMPL "Teuchos::LAPACK" ) - SET_PROPERTY( GLOBAL PROPERTY LAPACK_DIR "${DIR}/teuchos/lapack" ) -ENDIF() - -# Set blas -IF( ROL_BLAS STREQUAL "simple") - SET_PROPERTY( GLOBAL PROPERTY BLAS_IMPL "simple" ) - SET_PROPERTY( GLOBAL PROPERTY BLAS_DIR "${DIR}/simple/blas" ) - SET( USING_TEUCHOS_ALL OFF ) - SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) -ELSE() - SET_PROPERTY( GLOBAL PROPERTY BLAS_IMPL "Teuchos::BLAS" ) - SET_PROPERTY( GLOBAL PROPERTY BLAS_DIR "${DIR}/teuchos/blas" ) -ENDIF() +INCLUDE(BuildOptionFunctions) +INCLUDE(Deprecated) + +IF( ROL_ENABLE_TIMERS ) + MESSAGE("Build ROL with Teuchos TimeMonitors enabled.") + OPTION( ROL_TIMERS ON ) + CONFIGURE_FILE("${PACKAGE_SOURCE_DIR}/cmake/ROL_config.h.in" ROL_config.h @ONLY) +ENDIF( ROL_ENABLE_TIMERS ) + +SET_PROPERTY( GLOBAL PROPERTY TEUCHOS_PARAMETERLIST "Teuchos::ParameterList" ) +SET_PROPERTY( GLOBAL PROPERTY TEUCHOS_STACKTRACE "Teuchos::stacktrace" ) +SET_PROPERTY( GLOBAL PROPERTY TEUCHOS_RCP "Teuchos::RCP" ) + +SET_PROPERTY( GLOBAL PROPERTY BACKWARD_CPP "backward-cpp" ) + +SET_PROPERTY( GLOBAL PROPERTY SIMPLE_STACKTRACE "simple" ) + +SET_PROPERTY( GLOBAL PROPERTY BOOST_PROPERTY_TREE "boost::property_tree" ) +SET_PROPERTY( GLOBAL PROPERTY BOOST_STACKTRACE "boost::stacktrace" ) +SET_PROPERTY( GLOBAL PROPERTY STD_SHARED_PTR "std::shared_ptr" ) + + +SET_DEFAULT( ROL_Ptr "Teuchos::RCP" ) +SET_DEFAULT( ROL_ParameterList "Teuchos::ParameterList" ) +SET_DEFAULT( ROL_stacktrace "Teuchos::stacktrace" ) +SET_DEFAULT( ROL_LinearAlgebra "Teuchos::SerialDense" ) +SET_DEFAULT( ROL_LAPACK "Teuchos::LAPACK" ) +SET_DEFAULT( ROL_BLAS "Teuchos::BLAS" ) + +SET( USING_TEUCHOS_ALL ON ) +SET( USING_TEUCHOS_ALL ON PARENT_SCOPE ) + +# Compatibility Directory +SET( DIR ${${PACKAGE_NAME}_SOURCE_DIR}/src/compatibility ) + + + +# Set smart pointer type +IF( ROL_Ptr STREQUAL "std::shared_ptr") + SET_PROPERTY( GLOBAL PROPERTY PTR_IMPL "std::shared_ptr" ) + SET_PROPERTY( GLOBAL PROPERTY PTR_DIR "${DIR}/std/shared_ptr" ) + SET( USING_TEUCHOS_ALL OFF ) + SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) +ELSE() + SET_PROPERTY( GLOBAL PROPERTY PTR_IMPL "Teuchos::RCP" ) + SET_PROPERTY( GLOBAL PROPERTY PTR_DIR "${DIR}/teuchos/rcp" ) +ENDIF() + + + +# Set parameter list type +IF( ROL_ParameterList STREQUAL "boost::property_tree") + SET_PROPERTY( GLOBAL PROPERTY PARAMETERLIST_IMPL "boost::property_tree" ) + SET_PROPERTY( GLOBAL PROPERTY PARAMETERLIST_DIR "${DIR}/boost/property_tree" ) + SET( USING_TEUCHOS_ALL OFF ) + SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) +ELSEIF( ROL_ParameterList STREQUAL "simple" ) + SET_PROPERTY( GLOBAL PROPERTY PARAMETERLIST_IMPL "simple" ) + SET_PROPERTY( GLOBAL PROPERTY PARAMETERLIST_DIR "${DIR}/simple/parameterlist" ) + SET( USING_TEUCHOS_ALL OFF ) + SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) +ELSE() + SET_PROPERTY( GLOBAL PROPERTY PARAMETERLIST_IMPL "Teuchos::ParameterList" ) + SET_PROPERTY( GLOBAL PROPERTY PARAMETERLIST_DIR "${DIR}/teuchos/parameterlist" ) +ENDIF() + + +# set stacktrace type +IF( ROL_stacktrace STREQUAL "backward-cpp" ) + INCLUDE(BackwardConfig) + SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_IMPL "backward-cpp" ) + SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_DIR "${DIR}/backward_cpp" ) + SET( USING_TEUCHOS_ALL OFF ) + SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) +ELSEIF( ROL_stacktrace STREQUAL "simple" ) + SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_IMPL "simple" ) + SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_DIR "${DIR}/simple/stacktrace" ) + SET( USING_TEUCHOS_ALL OFF ) + SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) +ELSEIF( ROL_stacktrace STREQUAL "boost::stacktrace") + SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_IMPL "boost::stacktrace" ) + SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_DIR "${DIR}/boost/stacktrace" ) + SET( USING_TEUCHOS_ALL OFF ) + SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) +ELSE() + SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_IMPL "Teuchos::stacktrace" ) + SET_PROPERTY( GLOBAL PROPERTY STACKTRACE_DIR "${DIR}/teuchos/stacktrace" ) +ENDIF() + + +# Set linear algebra +IF( ROL_LinearAlgebra STREQUAL "Eigen") + SET_PROPERTY( GLOBAL PROPERTY LA_IMPL "Eigen" ) + SET_PROPERTY( GLOBAL PROPERTY LA_DIR "${DIR}/eigen" ) + find_package(Eigen3 REQUIRED) + TRIBITS_INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR}) + SET( USING_TEUCHOS_ALL OFF ) + SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) +ELSE() + SET_PROPERTY( GLOBAL PROPERTY LA_IMPL "Teuchos::SerialDense" ) + SET_PROPERTY( GLOBAL PROPERTY LA_DIR "${DIR}/teuchos/la" ) +ENDIF() + +# Set lapack +IF( ROL_LAPACK STREQUAL "simple") + SET_PROPERTY( GLOBAL PROPERTY LAPACK_IMPL "simple" ) + SET_PROPERTY( GLOBAL PROPERTY LAPACK_DIR "${DIR}/simple/lapack" ) + SET( USING_TEUCHOS_ALL OFF ) + SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) +ELSE() + SET_PROPERTY( GLOBAL PROPERTY LAPACK_IMPL "Teuchos::LAPACK" ) + SET_PROPERTY( GLOBAL PROPERTY LAPACK_DIR "${DIR}/teuchos/lapack" ) +ENDIF() + +# Set blas +IF( ROL_BLAS STREQUAL "simple") + SET_PROPERTY( GLOBAL PROPERTY BLAS_IMPL "simple" ) + SET_PROPERTY( GLOBAL PROPERTY BLAS_DIR "${DIR}/simple/blas" ) + SET( USING_TEUCHOS_ALL OFF ) + SET( USING_TEUCHOS_ALL OFF PARENT_SCOPE ) +ELSE() + SET_PROPERTY( GLOBAL PROPERTY BLAS_IMPL "Teuchos::BLAS" ) + SET_PROPERTY( GLOBAL PROPERTY BLAS_DIR "${DIR}/teuchos/blas" ) +ENDIF() diff --git a/packages/rol/example/PDE-OPT/0ld/adv-diff-react/CMakeLists.txt b/packages/rol/example/PDE-OPT/0ld/adv-diff-react/CMakeLists.txt index 14acdd414c50..42ba1795c5a6 100644 --- a/packages/rol/example/PDE-OPT/0ld/adv-diff-react/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/0ld/adv-diff-react/CMakeLists.txt @@ -6,7 +6,7 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/PDE-OPT/0ld/elasticity/CMakeLists.txt b/packages/rol/example/PDE-OPT/0ld/elasticity/CMakeLists.txt index ef18db347295..83dc4b71aabc 100644 --- a/packages/rol/example/PDE-OPT/0ld/elasticity/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/0ld/elasticity/CMakeLists.txt @@ -6,7 +6,7 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/PDE-OPT/0ld/elasticitySIMP_topologyOptimization/CMakeLists.txt b/packages/rol/example/PDE-OPT/0ld/elasticitySIMP_topologyOptimization/CMakeLists.txt index e705227db3ea..04a36a8fa260 100644 --- a/packages/rol/example/PDE-OPT/0ld/elasticitySIMP_topologyOptimization/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/0ld/elasticitySIMP_topologyOptimization/CMakeLists.txt @@ -4,11 +4,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/0ld/poisson/CMakeLists.txt b/packages/rol/example/PDE-OPT/0ld/poisson/CMakeLists.txt index 37842479a138..6adef2a50283 100644 --- a/packages/rol/example/PDE-OPT/0ld/poisson/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/0ld/poisson/CMakeLists.txt @@ -6,7 +6,7 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/PDE-OPT/0ld/stefan-boltzmann/CMakeLists.txt b/packages/rol/example/PDE-OPT/0ld/stefan-boltzmann/CMakeLists.txt index fdea8c2e608e..531bd1fba2b9 100644 --- a/packages/rol/example/PDE-OPT/0ld/stefan-boltzmann/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/0ld/stefan-boltzmann/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) # TRIBITS_ADD_EXECUTABLE_AND_TEST( # example_01 diff --git a/packages/rol/example/PDE-OPT/0ld/stoch-adv-diff/CMakeLists.txt b/packages/rol/example/PDE-OPT/0ld/stoch-adv-diff/CMakeLists.txt index 9b7f59a28f99..68bf150d219e 100644 --- a/packages/rol/example/PDE-OPT/0ld/stoch-adv-diff/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/0ld/stoch-adv-diff/CMakeLists.txt @@ -6,13 +6,13 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) # Need ROL_TpetraTeuchosBatchManager.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/PDE-OPT/OED/example/helmholtz/multipleFrequency/CMakeLists.txt b/packages/rol/example/PDE-OPT/OED/example/helmholtz/multipleFrequency/CMakeLists.txt index 577e1d09f304..cf89f3daa6e9 100644 --- a/packages/rol/example/PDE-OPT/OED/example/helmholtz/multipleFrequency/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/OED/example/helmholtz/multipleFrequency/CMakeLists.txt @@ -7,9 +7,9 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/OED/example/helmholtz/singleFrequency/CMakeLists.txt b/packages/rol/example/PDE-OPT/OED/example/helmholtz/singleFrequency/CMakeLists.txt index e081a045cc64..d5fb90477400 100644 --- a/packages/rol/example/PDE-OPT/OED/example/helmholtz/singleFrequency/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/OED/example/helmholtz/singleFrequency/CMakeLists.txt @@ -7,9 +7,9 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/OED/example/poisson/singleObs/CMakeLists.txt b/packages/rol/example/PDE-OPT/OED/example/poisson/singleObs/CMakeLists.txt index f291cf9f476d..48ec4aea62ad 100644 --- a/packages/rol/example/PDE-OPT/OED/example/poisson/singleObs/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/OED/example/poisson/singleObs/CMakeLists.txt @@ -7,9 +7,9 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/adv-diff-react/CMakeLists.txt b/packages/rol/example/PDE-OPT/adv-diff-react/CMakeLists.txt index 35d8a73ca48d..40c8628d66a7 100644 --- a/packages/rol/example/PDE-OPT/adv-diff-react/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/adv-diff-react/CMakeLists.txt @@ -6,13 +6,13 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) # Need ROL_TpetraTeuchosBatchManager.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) #TRIBITS_ADD_EXECUTABLE_AND_TEST( # example_01 diff --git a/packages/rol/example/PDE-OPT/allen-cahn/CMakeLists.txt b/packages/rol/example/PDE-OPT/allen-cahn/CMakeLists.txt index 60a711236d69..ec63e966c3a0 100644 --- a/packages/rol/example/PDE-OPT/allen-cahn/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/allen-cahn/CMakeLists.txt @@ -5,13 +5,13 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) # Need ROL_TpetraTeuchosBatchManager.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-SUR/CMakeLists.txt b/packages/rol/example/PDE-OPT/binary/adv-diff-SUR/CMakeLists.txt index d8da7c4e56e8..f660a02cf2c0 100644 --- a/packages/rol/example/PDE-OPT/binary/adv-diff-SUR/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-SUR/CMakeLists.txt @@ -8,24 +8,24 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) # Need ROL_TpetraTeuchosBatchManager.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) # Need ROL_Teuchos_LinearOperator.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/function) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/function) # Need ROL_TeuchosVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/vector) # Need Teuchos/PEBBL interface - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/pebbl) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/pebbl) # Need ROL/PEBBL interface - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/algorithm) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/function) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/algorithm) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/function) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/CMakeLists.txt b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/CMakeLists.txt index bf63dfad57e5..7367eac8fdab 100644 --- a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/CMakeLists.txt @@ -8,27 +8,27 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) # Need ROL_TpetraTeuchosBatchManager.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) # Need ROL_TpetraTeuchosBatchManager.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/pebbl) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/pebbl) # Need ROL_Teuchos_LinearOperator.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/function) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/function) # Need ROL_TeuchosVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/vector) # Need Teuchos/PEBBL interface - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/pebbl) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/pebbl) # Need ROL/PEBBL interface - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/algorithm) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/function) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/algorithm) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/function) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( Binary diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff/CMakeLists.txt b/packages/rol/example/PDE-OPT/binary/adv-diff/CMakeLists.txt index d516c3ddcc46..794a3e5ecbd3 100644 --- a/packages/rol/example/PDE-OPT/binary/adv-diff/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/binary/adv-diff/CMakeLists.txt @@ -8,24 +8,24 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) # Need ROL_TpetraTeuchosBatchManager.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) # Need ROL_Teuchos_LinearOperator.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/function) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/function) # Need ROL_TeuchosVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/vector) # Need Teuchos/PEBBL interface - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/pebbl) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/pebbl) # Need ROL/PEBBL interface - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/algorithm) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/function) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/algorithm) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/function) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/PDE-OPT/binary/elasticity/CMakeLists.txt b/packages/rol/example/PDE-OPT/binary/elasticity/CMakeLists.txt index 7039ca596ec7..1e5659087bfc 100644 --- a/packages/rol/example/PDE-OPT/binary/elasticity/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/binary/elasticity/CMakeLists.txt @@ -6,17 +6,17 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_pebbl AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/pebbl) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/pebbl) # Need ROL/PEBBL interface - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/algorithm) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/function) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/algorithm) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/function) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/vector) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/binary/stefan-boltzmann/CMakeLists.txt b/packages/rol/example/PDE-OPT/binary/stefan-boltzmann/CMakeLists.txt index 6b269af3df98..c6bf82ea9d98 100644 --- a/packages/rol/example/PDE-OPT/binary/stefan-boltzmann/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/binary/stefan-boltzmann/CMakeLists.txt @@ -8,27 +8,27 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) # Need ROL_TpetraTeuchosBatchManager.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) # Need ROL_TpetraTeuchosBatchManager.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/pebbl) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/pebbl) # Need ROL_Teuchos_LinearOperator.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/function) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/function) # Need ROL_TeuchosVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/vector) # Need Teuchos/PEBBL interface - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/pebbl) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/pebbl) # Need ROL/PEBBL interface - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/algorithm) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/function) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/algorithm) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/function) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/pebbl/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( BinaryStefanBoltzmann diff --git a/packages/rol/example/PDE-OPT/dynamic/adv_diff/CMakeLists.txt b/packages/rol/example/PDE-OPT/dynamic/adv_diff/CMakeLists.txt index f1f80e010a1d..29922b72cc9a 100644 --- a/packages/rol/example/PDE-OPT/dynamic/adv_diff/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/dynamic/adv_diff/CMakeLists.txt @@ -7,7 +7,7 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/dynamic/navier-stokes/CMakeLists.txt b/packages/rol/example/PDE-OPT/dynamic/navier-stokes/CMakeLists.txt index bdcc18f1076b..d2eaf3886ee1 100644 --- a/packages/rol/example/PDE-OPT/dynamic/navier-stokes/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/dynamic/navier-stokes/CMakeLists.txt @@ -4,16 +4,16 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) # Need for parallel-in-time. - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/function) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/mpi) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/function) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/mpi) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/dynamic/semilinear/CMakeLists.txt b/packages/rol/example/PDE-OPT/dynamic/semilinear/CMakeLists.txt index 17f1a47231ab..45b6737156da 100644 --- a/packages/rol/example/PDE-OPT/dynamic/semilinear/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/dynamic/semilinear/CMakeLists.txt @@ -1,8 +1,8 @@ INCLUDE(TribitsAddExecutableAndTest) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/function) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/vector) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/mpi) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/function) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/mpi) IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Ifpack2 AND @@ -11,7 +11,7 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/dynamic/thermal-fluids/CMakeLists.txt b/packages/rol/example/PDE-OPT/dynamic/thermal-fluids/CMakeLists.txt index 72f0d92ca63f..d1e9881afc80 100644 --- a/packages/rol/example/PDE-OPT/dynamic/thermal-fluids/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/dynamic/thermal-fluids/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/flow-opt/3dim/models/darcy/CMakeLists.txt b/packages/rol/example/PDE-OPT/flow-opt/3dim/models/darcy/CMakeLists.txt index f9b245280158..9f66aa87008c 100644 --- a/packages/rol/example/PDE-OPT/flow-opt/3dim/models/darcy/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/flow-opt/3dim/models/darcy/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/flow-opt/axisymmetric/models/brinkman/CMakeLists.txt b/packages/rol/example/PDE-OPT/flow-opt/axisymmetric/models/brinkman/CMakeLists.txt index c4b350fbfcd1..30694d14463c 100644 --- a/packages/rol/example/PDE-OPT/flow-opt/axisymmetric/models/brinkman/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/flow-opt/axisymmetric/models/brinkman/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/flow-opt/axisymmetric/models/darcy/CMakeLists.txt b/packages/rol/example/PDE-OPT/flow-opt/axisymmetric/models/darcy/CMakeLists.txt index 6f50b2a01c94..e6c5d7675e02 100644 --- a/packages/rol/example/PDE-OPT/flow-opt/axisymmetric/models/darcy/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/flow-opt/axisymmetric/models/darcy/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/flow-opt/axisymmetric/models/filteredDarcy/CMakeLists.txt b/packages/rol/example/PDE-OPT/flow-opt/axisymmetric/models/filteredDarcy/CMakeLists.txt index e78642d6a5cc..4336dbeb8a2d 100644 --- a/packages/rol/example/PDE-OPT/flow-opt/axisymmetric/models/filteredDarcy/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/flow-opt/axisymmetric/models/filteredDarcy/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/fractional/poisson/CMakeLists.txt b/packages/rol/example/PDE-OPT/fractional/poisson/CMakeLists.txt index af36f5fc4813..e9c783c398bb 100644 --- a/packages/rol/example/PDE-OPT/fractional/poisson/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/fractional/poisson/CMakeLists.txt @@ -5,7 +5,7 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/ginzburg-landau/CMakeLists.txt b/packages/rol/example/PDE-OPT/ginzburg-landau/CMakeLists.txt index 24a71b2c86a7..50398a030963 100644 --- a/packages/rol/example/PDE-OPT/ginzburg-landau/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/ginzburg-landau/CMakeLists.txt @@ -6,8 +6,8 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/helmholtz/CMakeLists.txt b/packages/rol/example/PDE-OPT/helmholtz/CMakeLists.txt index a6f1ea4a39b2..4d474b848721 100644 --- a/packages/rol/example/PDE-OPT/helmholtz/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/helmholtz/CMakeLists.txt @@ -6,8 +6,8 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/navier-stokes/CMakeLists.txt b/packages/rol/example/PDE-OPT/navier-stokes/CMakeLists.txt index 138990ae9eac..348f7f62300f 100644 --- a/packages/rol/example/PDE-OPT/navier-stokes/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/navier-stokes/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/nonlinear-elliptic/CMakeLists.txt b/packages/rol/example/PDE-OPT/nonlinear-elliptic/CMakeLists.txt index c913902e9545..8ea795e9479d 100644 --- a/packages/rol/example/PDE-OPT/nonlinear-elliptic/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/nonlinear-elliptic/CMakeLists.txt @@ -5,13 +5,13 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) # Need ROL_TpetraTeuchosBatchManager.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/PDE-OPT/obstacle/CMakeLists.txt b/packages/rol/example/PDE-OPT/obstacle/CMakeLists.txt index 92f262a9582a..850e2ea7b9db 100644 --- a/packages/rol/example/PDE-OPT/obstacle/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/obstacle/CMakeLists.txt @@ -6,7 +6,7 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/PDE-OPT/poisson-boltzmann/CMakeLists.txt b/packages/rol/example/PDE-OPT/poisson-boltzmann/CMakeLists.txt index bcd19ae068b9..080cc58f5c61 100644 --- a/packages/rol/example/PDE-OPT/poisson-boltzmann/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/poisson-boltzmann/CMakeLists.txt @@ -5,13 +5,13 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) # Need ROL_TpetraTeuchosBatchManager.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/PDE-OPT/poisson/CMakeLists.txt b/packages/rol/example/PDE-OPT/poisson/CMakeLists.txt index 842f427ce1cc..3389c3d90e37 100644 --- a/packages/rol/example/PDE-OPT/poisson/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/poisson/CMakeLists.txt @@ -6,7 +6,7 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/CMakeLists.txt b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/CMakeLists.txt index 71a29e6a20ac..47b2ae353229 100644 --- a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/CMakeLists.txt @@ -6,7 +6,7 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/published/IMAvolumes_KouriRidzal2017/CMakeLists.txt b/packages/rol/example/PDE-OPT/published/IMAvolumes_KouriRidzal2017/CMakeLists.txt index 18a4484c9ff4..29cf81f91827 100644 --- a/packages/rol/example/PDE-OPT/published/IMAvolumes_KouriRidzal2017/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/published/IMAvolumes_KouriRidzal2017/CMakeLists.txt @@ -7,13 +7,13 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/trikota/src/sol) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/trikota/src/sol/sparse_grids) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/trikota/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/trikota/src/sol/sparse_grids) TRIBITS_ADD_EXECUTABLE( example_RS diff --git a/packages/rol/example/PDE-OPT/published/MPA_KouriSurowiec2019/CMakeLists.txt b/packages/rol/example/PDE-OPT/published/MPA_KouriSurowiec2019/CMakeLists.txt index 7c93fa576591..5510631b1565 100644 --- a/packages/rol/example/PDE-OPT/published/MPA_KouriSurowiec2019/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/published/MPA_KouriSurowiec2019/CMakeLists.txt @@ -6,9 +6,9 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) TRIBITS_ADD_EXECUTABLE( Burgers diff --git a/packages/rol/example/PDE-OPT/published/NonsmoothTR_BaraldiKouri2022/CMakeLists.txt b/packages/rol/example/PDE-OPT/published/NonsmoothTR_BaraldiKouri2022/CMakeLists.txt index 479ccd1cf581..defcd9155218 100644 --- a/packages/rol/example/PDE-OPT/published/NonsmoothTR_BaraldiKouri2022/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/published/NonsmoothTR_BaraldiKouri2022/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_MueLu AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/dualksvm/CMakeLists.txt b/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/dualksvm/CMakeLists.txt index 22866192d790..7542e7a416b7 100644 --- a/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/dualksvm/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/dualksvm/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_MueLu AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/dualsvm/CMakeLists.txt b/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/dualsvm/CMakeLists.txt index e9fcae38fdd7..df55ae02c286 100644 --- a/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/dualsvm/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/dualsvm/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_MueLu AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/elasticity/CMakeLists.txt b/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/elasticity/CMakeLists.txt index 006517913c83..3c16c24d36f9 100644 --- a/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/elasticity/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/elasticity/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_MueLu AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/lasso/CMakeLists.txt b/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/lasso/CMakeLists.txt index 11a75b54daca..697d7680f966 100644 --- a/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/lasso/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/lasso/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_MueLu AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/navier-stokes/CMakeLists.txt b/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/navier-stokes/CMakeLists.txt index 45a765a13ee5..0a45a636195a 100644 --- a/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/navier-stokes/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/navier-stokes/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/simpreg/CMakeLists.txt b/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/simpreg/CMakeLists.txt index 93cb5d0b9654..bce71a6a0500 100644 --- a/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/simpreg/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/published/TRSPG_Kouri2021/simpreg/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_MueLu AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/stefan-boltzmann/CMakeLists.txt b/packages/rol/example/PDE-OPT/stefan-boltzmann/CMakeLists.txt index 5ba2407709fb..ce96ef26e897 100644 --- a/packages/rol/example/PDE-OPT/stefan-boltzmann/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/stefan-boltzmann/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/PDE-OPT/stokes/CMakeLists.txt b/packages/rol/example/PDE-OPT/stokes/CMakeLists.txt index 6c2e6ae46a1f..d0164db7df71 100644 --- a/packages/rol/example/PDE-OPT/stokes/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/stokes/CMakeLists.txt @@ -6,8 +6,8 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/thermal-fluids/CMakeLists.txt b/packages/rol/example/PDE-OPT/thermal-fluids/CMakeLists.txt index 060a990bf0bb..ace359100890 100644 --- a/packages/rol/example/PDE-OPT/thermal-fluids/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/thermal-fluids/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/topo-opt/elasticity/CMakeLists.txt b/packages/rol/example/PDE-OPT/topo-opt/elasticity/CMakeLists.txt index 22b6231e2148..55ae07c38807 100644 --- a/packages/rol/example/PDE-OPT/topo-opt/elasticity/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/topo-opt/elasticity/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_MueLu AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/topo-opt/multimat/CMakeLists.txt b/packages/rol/example/PDE-OPT/topo-opt/multimat/CMakeLists.txt index 68628b39da3a..c2fe96d549c1 100644 --- a/packages/rol/example/PDE-OPT/topo-opt/multimat/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/topo-opt/multimat/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_MueLu AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/topo-opt/navier-stokes/CMakeLists.txt b/packages/rol/example/PDE-OPT/topo-opt/navier-stokes/CMakeLists.txt index a58d8a1f0cf6..5465ab589ba8 100644 --- a/packages/rol/example/PDE-OPT/topo-opt/navier-stokes/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/topo-opt/navier-stokes/CMakeLists.txt @@ -5,11 +5,11 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Amesos2 AND ${PROJECT_NAME}_ENABLE_Tpetra ) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/PDE-OPT/topo-opt/poisson/CMakeLists.txt b/packages/rol/example/PDE-OPT/topo-opt/poisson/CMakeLists.txt index 1e7bf0629e23..cd10cbc5d7e6 100644 --- a/packages/rol/example/PDE-OPT/topo-opt/poisson/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/topo-opt/poisson/CMakeLists.txt @@ -6,7 +6,7 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Tpetra ) # Need ROL_TpetraMultiVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/PinT/nonlinear/CMakeLists.txt b/packages/rol/example/PinT/nonlinear/CMakeLists.txt index 2e1e969b4221..ffcf7abfc162 100644 --- a/packages/rol/example/PinT/nonlinear/CMakeLists.txt +++ b/packages/rol/example/PinT/nonlinear/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/function) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/function) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/PinT/parabolic-control/CMakeLists.txt b/packages/rol/example/PinT/parabolic-control/CMakeLists.txt index 41b2522c3cf1..cf82a78f506f 100644 --- a/packages/rol/example/PinT/parabolic-control/CMakeLists.txt +++ b/packages/rol/example/PinT/parabolic-control/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/function) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/function) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/PinT/tanks/CMakeLists.txt b/packages/rol/example/PinT/tanks/CMakeLists.txt index 31d204ac0824..176d753464c9 100644 --- a/packages/rol/example/PinT/tanks/CMakeLists.txt +++ b/packages/rol/example/PinT/tanks/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/function) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/function) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/mpi/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/arrayfire/CMakeLists.txt b/packages/rol/example/arrayfire/CMakeLists.txt index 92a2bc7c2b7c..2fa26f0231cc 100644 --- a/packages/rol/example/arrayfire/CMakeLists.txt +++ b/packages/rol/example/arrayfire/CMakeLists.txt @@ -2,7 +2,7 @@ IF(${PACKAGE_NAME}_ENABLE_ArrayFireCPU) # Need ROL_ArrayFireVector.hpp - INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/arrayfire/src/vector) + TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/arrayfire/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/burgers-control/CMakeLists.txt b/packages/rol/example/burgers-control/CMakeLists.txt index de5e6b5b62e3..d1288baf4e21 100644 --- a/packages/rol/example/burgers-control/CMakeLists.txt +++ b/packages/rol/example/burgers-control/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/json/CMakeLists.txt b/packages/rol/example/json/CMakeLists.txt index 4338e209b69a..46b4996982dc 100644 --- a/packages/rol/example/json/CMakeLists.txt +++ b/packages/rol/example/json/CMakeLists.txt @@ -12,7 +12,7 @@ IF(TPL_ENABLE_JSONCPP) - include_directories(${JSONCPP_INCLUDE_DIRS}) + tribits_include_directories(${JSONCPP_INCLUDE_DIRS}) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/l1-penalty/CMakeLists.txt b/packages/rol/example/l1-penalty/CMakeLists.txt index 56c2af35e7c5..e661372401ea 100644 --- a/packages/rol/example/l1-penalty/CMakeLists.txt +++ b/packages/rol/example/l1-penalty/CMakeLists.txt @@ -1,5 +1,5 @@ -include_directories(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/vector) -include_directories(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/function) +tribits_include_directories(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/vector) +tribits_include_directories(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/function) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/poisson-control/CMakeLists.txt b/packages/rol/example/poisson-control/CMakeLists.txt index ef13da9bf289..41a8304c5f83 100644 --- a/packages/rol/example/poisson-control/CMakeLists.txt +++ b/packages/rol/example/poisson-control/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/function) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/function) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/sol) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/sacado/CMakeLists.txt b/packages/rol/example/sacado/CMakeLists.txt index a31106c2b98c..8ae98e36e4c6 100644 --- a/packages/rol/example/sacado/CMakeLists.txt +++ b/packages/rol/example/sacado/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/sacado/src/function) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/util/numerics/) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/sacado/src/function) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/util/numerics/) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/rol/example/tempus/CMakeLists.txt b/packages/rol/example/tempus/CMakeLists.txt index e70a1d0c783a..1ea1cdb4676d 100644 --- a/packages/rol/example/tempus/CMakeLists.txt +++ b/packages/rol/example/tempus/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/thyra/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/thyra/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/tensor-opt/CMakeLists.txt b/packages/rol/example/tensor-opt/CMakeLists.txt index 56d48b70ef2e..0eb61ecb6dc3 100644 --- a/packages/rol/example/tensor-opt/CMakeLists.txt +++ b/packages/rol/example/tensor-opt/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/teuchos/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/src/CMakeLists.txt b/packages/rol/src/CMakeLists.txt index 9655e38cd0c3..6723cd46bf17 100644 --- a/packages/rol/src/CMakeLists.txt +++ b/packages/rol/src/CMakeLists.txt @@ -18,8 +18,8 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # All headers @@ -59,22 +59,22 @@ MESSAGE( "-- ROL::LinearAlgebra is implemented by ${LA_STRING}" ) MESSAGE( "-- ROL::LAPACK is implemented by ${LAPACK_STRING}" ) MESSAGE( "-- ROL::BLAS is implemented by ${BLAS_STRING}" ) -INCLUDE_DIRECTORIES( ${PTR_DIR} ) +TRIBITS_INCLUDE_DIRECTORIES( ${PTR_DIR} ) APPEND_GLOB( HEADERS ${PTR_DIR}/*.hpp ) -INCLUDE_DIRECTORIES( ${PARAMETERLIST_DIR} ) +TRIBITS_INCLUDE_DIRECTORIES( ${PARAMETERLIST_DIR} ) APPEND_GLOB( HEADERS ${PARAMETERLIST_DIR}/*.hpp ) -INCLUDE_DIRECTORIES( ${STACKTRACE_DIR} ) +TRIBITS_INCLUDE_DIRECTORIES( ${STACKTRACE_DIR} ) APPEND_GLOB( HEADERS ${STACKTRACE_DIR}/*.hpp ) -INCLUDE_DIRECTORIES( ${LA_DIR} ) +TRIBITS_INCLUDE_DIRECTORIES( ${LA_DIR} ) APPEND_GLOB( HEADERS ${LA_DIR}/*.hpp ) -INCLUDE_DIRECTORIES( ${LAPACK_DIR} ) +TRIBITS_INCLUDE_DIRECTORIES( ${LAPACK_DIR} ) APPEND_GLOB( HEADERS ${LAPACK_DIR}/*.hpp ) -INCLUDE_DIRECTORIES( ${BLAS_DIR} ) +TRIBITS_INCLUDE_DIRECTORIES( ${BLAS_DIR} ) APPEND_GLOB( HEADERS ${BLAS_DIR}/*.hpp ) # @@ -82,7 +82,7 @@ APPEND_GLOB( HEADERS ${BLAS_DIR}/*.hpp ) # SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector) -INCLUDE_DIRECTORIES(${DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) # @@ -90,7 +90,7 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp) # SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/function) -INCLUDE_DIRECTORIES(${DIR} +TRIBITS_INCLUDE_DIRECTORIES(${DIR} ${DIR}/dynamic ${DIR}/boundconstraint ${DIR}/constraint @@ -118,7 +118,7 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp # step headers # SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/step) -INCLUDE_DIRECTORIES(${DIR} +TRIBITS_INCLUDE_DIRECTORIES(${DIR} ${DIR}/linesearch ${DIR}/trustregion ${DIR}/secant @@ -148,7 +148,7 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp # SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/algorithm) -INCLUDE_DIRECTORIES(${DIR} +TRIBITS_INCLUDE_DIRECTORIES(${DIR} ${DIR}/TypeB ${DIR}/TypeE ${DIR}/TypeG @@ -184,7 +184,7 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp # SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/parameterlist) -INCLUDE_DIRECTORIES(${DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) # @@ -192,14 +192,14 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp) # SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/status) -INCLUDE_DIRECTORIES(${DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) # # sol headers # SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol) -INCLUDE_DIRECTORIES(${DIR}/function +TRIBITS_INCLUDE_DIRECTORIES(${DIR}/function ${DIR}/function/distribution ${DIR}/function/expectationquad ${DIR}/function/randvarfunctional @@ -250,7 +250,7 @@ APPEND_GLOB(HEADERS ${DIR}/function/*.hpp # SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/elementwise) -INCLUDE_DIRECTORIES(${DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) # @@ -258,7 +258,7 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp) # SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/utils) -INCLUDE_DIRECTORIES(${DIR} +TRIBITS_INCLUDE_DIRECTORIES(${DIR} ${DIR}/function_bindings) APPEND_GLOB(HEADERS ${DIR}/*.hpp ${DIR}/function_bindings/*.hpp) @@ -268,7 +268,7 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp # SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/zoo) -INCLUDE_DIRECTORIES(${DIR} +TRIBITS_INCLUDE_DIRECTORIES(${DIR} ${DIR}/testproblems) APPEND_GLOB(HEADERS ${DIR}/*.hpp ${DIR}/testproblems/*.hpp) @@ -277,7 +277,7 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp # SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/oed) -INCLUDE_DIRECTORIES(${DIR} +TRIBITS_INCLUDE_DIRECTORIES(${DIR} ${DIR}/constraint ${DIR}/factors ${DIR}/objective diff --git a/packages/rol/src/compatibility/CMakeLists.txt b/packages/rol/src/compatibility/CMakeLists.txt index 6f770483106d..1b167605dd8c 100644 --- a/packages/rol/src/compatibility/CMakeLists.txt +++ b/packages/rol/src/compatibility/CMakeLists.txt @@ -8,9 +8,9 @@ #MESSAGE( "-- ROL::ParameterList is implemented by ${PARAMETERLIST_STRING}" ) # #SET( ${HEADERS} ${${HEADERS}} PARENT_SCOPE ) -#INCLUDE_DIRECTORIES( ${PTR_DIR} ) +#TRIBITS_INCLUDE_DIRECTORIES( ${PTR_DIR} ) #APPEND_GLOB( HEADERS ${PTR_DIR}/*.hpp ) # -#INCLUDE_DIRECTORIES( ${PARAMETERLIST_DIR} ) +#TRIBITS_INCLUDE_DIRECTORIES( ${PARAMETERLIST_DIR} ) #APPEND_GLOB( HEADERS ${PARAMETERLIST_DIR}/*.hpp ) diff --git a/packages/rol/test/elementwise/CMakeLists.txt b/packages/rol/test/elementwise/CMakeLists.txt index 660644f192e0..26624b1bdeda 100644 --- a/packages/rol/test/elementwise/CMakeLists.txt +++ b/packages/rol/test/elementwise/CMakeLists.txt @@ -9,7 +9,7 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST( ) IF(${PROJECT_NAME}_ENABLE_Tpetra) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/tpetra/src/vector) TRIBITS_ADD_EXECUTABLE_AND_TEST( TpetraMultiVector SOURCES test_02.cpp diff --git a/packages/rol/test/step/interiorpoint/CMakeLists.txt b/packages/rol/test/step/interiorpoint/CMakeLists.txt index f2d50202564f..6c787af72a60 100644 --- a/packages/rol/test/step/interiorpoint/CMakeLists.txt +++ b/packages/rol/test/step/interiorpoint/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/sacado/src/function) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/sacado/test/HS) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/sacado/src/function) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/sacado/test/HS) TRIBITS_ADD_EXECUTABLE_AND_TEST( BarrierObjective From af4482dafea04b3b83fc36ad7580b26fbfc8f090 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:38:33 -0700 Subject: [PATCH 36/78] Rythmos: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/rythmos/adapters/gaasp/src/CMakeLists.txt | 2 +- packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt | 4 ++-- packages/rythmos/test/Charon/CMakeLists.txt | 2 +- packages/rythmos/test/ThetaStepper/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/rythmos/adapters/gaasp/src/CMakeLists.txt b/packages/rythmos/adapters/gaasp/src/CMakeLists.txt index c8678d983b7a..f27702adad6d 100644 --- a/packages/rythmos/adapters/gaasp/src/CMakeLists.txt +++ b/packages/rythmos/adapters/gaasp/src/CMakeLists.txt @@ -22,7 +22,7 @@ APPEND_GLOB(SOURCES ${DIR}/*.cpp) ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_GAASP_INTERNAL_TPL) IF(${PACKAGE_NAME}_ENABLE_GAASP_INTERNAL_TPL) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../tpl_src) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../tpl_src) ENDIF() # diff --git a/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt b/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt index ca9e1e0d420e..5ba3537af6ea 100644 --- a/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt +++ b/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt @@ -13,9 +13,9 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.h) diff --git a/packages/rythmos/test/Charon/CMakeLists.txt b/packages/rythmos/test/Charon/CMakeLists.txt index aac74d44f087..d5959bc117e2 100644 --- a/packages/rythmos/test/Charon/CMakeLists.txt +++ b/packages/rythmos/test/Charon/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../UnitTest) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../UnitTest) ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) FILE(GLOB SOURCES *.cpp) diff --git a/packages/rythmos/test/ThetaStepper/CMakeLists.txt b/packages/rythmos/test/ThetaStepper/CMakeLists.txt index d69a9acc6bcd..e3902bdc2619 100644 --- a/packages/rythmos/test/ThetaStepper/CMakeLists.txt +++ b/packages/rythmos/test/ThetaStepper/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(../UnitTest) +TRIBITS_INCLUDE_DIRECTORIES(../UnitTest) ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) FILE(GLOB SOURCES *.cpp) From fd791394ee4b1f0323c9d00a576f7f897dcda0f4 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:39:17 -0700 Subject: [PATCH 37/78] Sacado: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/sacado/src/CMakeLists.txt | 12 ++++++------ packages/sacado/test/GTestSuite/CMakeLists.txt | 4 ++-- .../sacado/test/performance/advection/CMakeLists.txt | 4 ++-- .../performance/advection_const_basis/CMakeLists.txt | 4 ++-- .../test/performance/fenl_assembly/CMakeLists.txt | 4 ++-- .../performance/fenl_assembly_view/CMakeLists.txt | 4 ++-- .../sacado/test/performance/mat_vec/CMakeLists.txt | 4 ++-- packages/sacado/test/utils/CMakeLists.txt | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/sacado/src/CMakeLists.txt b/packages/sacado/src/CMakeLists.txt index 5747b663d37d..c34ac44fd35d 100644 --- a/packages/sacado/src/CMakeLists.txt +++ b/packages/sacado/src/CMakeLists.txt @@ -11,15 +11,15 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/new_design) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/new_design) SET(HEADERS ${HEADERS} new_design/Sacado_Fad_Exp_MathFunctions.hpp new_design/Sacado_Fad_Exp_Expression.hpp @@ -185,7 +185,7 @@ SET(SOURCES ${SOURCES} ) # TEMPLATE -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/template) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/template) SET(HEADERS ${HEADERS} template/Sacado_TemplateContainer.hpp ) @@ -219,7 +219,7 @@ IF (${PACKAGE_NAME}_ENABLE_TeuchosCore) IF (${PACKAGE_NAME}_ENABLE_PARAMLIB) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/parameter) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/parameter) SET(HEADERS ${HEADERS} parameter/Sacado_ParameterFamilyBase.hpp parameter/Sacado_ParameterFamilyBaseImp.hpp @@ -250,7 +250,7 @@ IF (${PACKAGE_NAME}_ENABLE_TeuchosComm) ENDIF() #mpl -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/mpl) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/mpl) SET(HEADERS ${HEADERS} mpl/Sacado_mpl_is_same.hpp mpl/Sacado_mpl_is_convertible.hpp diff --git a/packages/sacado/test/GTestSuite/CMakeLists.txt b/packages/sacado/test/GTestSuite/CMakeLists.txt index 4ff0be297cbe..14398dff355d 100644 --- a/packages/sacado/test/GTestSuite/CMakeLists.txt +++ b/packages/sacado/test/GTestSuite/CMakeLists.txt @@ -8,8 +8,8 @@ add_subdirectory(googletest) set_target_properties(sacado-gtest gtest_main PROPERTIES TRIBITS_TESTONLY_LIB TRUE) -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/Fad) -INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/utils) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/Fad) +TRIBITS_INCLUDE_DIRECTORIES(${PACKAGE_SOURCE_DIR}/test/utils) SET(${PACKAGE_NAME}_TESTSUITE_SOURCES "") diff --git a/packages/sacado/test/performance/advection/CMakeLists.txt b/packages/sacado/test/performance/advection/CMakeLists.txt index 51d0f4f56dfc..f40134be90e4 100644 --- a/packages/sacado/test/performance/advection/CMakeLists.txt +++ b/packages/sacado/test/performance/advection/CMakeLists.txt @@ -1,7 +1,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) IF (Sacado_ENABLE_KokkosCore AND Sacado_ENABLE_TeuchosCore) diff --git a/packages/sacado/test/performance/advection_const_basis/CMakeLists.txt b/packages/sacado/test/performance/advection_const_basis/CMakeLists.txt index d2bd03b5b92f..394bdf04983d 100644 --- a/packages/sacado/test/performance/advection_const_basis/CMakeLists.txt +++ b/packages/sacado/test/performance/advection_const_basis/CMakeLists.txt @@ -1,7 +1,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) IF (Sacado_ENABLE_KokkosCore AND Sacado_ENABLE_TeuchosCore) diff --git a/packages/sacado/test/performance/fenl_assembly/CMakeLists.txt b/packages/sacado/test/performance/fenl_assembly/CMakeLists.txt index 43e079b5a4b8..aafc162dc4bc 100644 --- a/packages/sacado/test/performance/fenl_assembly/CMakeLists.txt +++ b/packages/sacado/test/performance/fenl_assembly/CMakeLists.txt @@ -1,7 +1,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) IF (Sacado_ENABLE_KokkosCore AND Sacado_ENABLE_KokkosContainers AND Sacado_ENABLE_TeuchosCore) diff --git a/packages/sacado/test/performance/fenl_assembly_view/CMakeLists.txt b/packages/sacado/test/performance/fenl_assembly_view/CMakeLists.txt index b7944fbf2970..e551a3ae4bc8 100644 --- a/packages/sacado/test/performance/fenl_assembly_view/CMakeLists.txt +++ b/packages/sacado/test/performance/fenl_assembly_view/CMakeLists.txt @@ -1,7 +1,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) IF (Sacado_ENABLE_KokkosCore AND Sacado_ENABLE_KokkosContainers AND Sacado_ENABLE_TeuchosCore) diff --git a/packages/sacado/test/performance/mat_vec/CMakeLists.txt b/packages/sacado/test/performance/mat_vec/CMakeLists.txt index 34a887346a65..bdc592c348f9 100644 --- a/packages/sacado/test/performance/mat_vec/CMakeLists.txt +++ b/packages/sacado/test/performance/mat_vec/CMakeLists.txt @@ -1,7 +1,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) IF (Sacado_ENABLE_KokkosCore AND Sacado_ENABLE_TeuchosCore) diff --git a/packages/sacado/test/utils/CMakeLists.txt b/packages/sacado/test/utils/CMakeLists.txt index c00fff020298..0a25d22b48b6 100644 --- a/packages/sacado/test/utils/CMakeLists.txt +++ b/packages/sacado/test/utils/CMakeLists.txt @@ -13,13 +13,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS ${HEADERS} Sacado_Random.hpp From 2c0cc23d52d05ea3698525357a30260d577196c7 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:40:49 -0700 Subject: [PATCH 38/78] SEACAS: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/seacas/applications/algebra/CMakeLists.txt | 2 +- packages/seacas/applications/aprepro/CMakeLists.txt | 2 +- packages/seacas/applications/blot/CMakeLists.txt | 2 +- packages/seacas/applications/conjoin/CMakeLists.txt | 2 +- packages/seacas/applications/cpup/CMakeLists.txt | 2 +- packages/seacas/applications/ejoin/CMakeLists.txt | 2 +- packages/seacas/applications/epu/CMakeLists.txt | 2 +- packages/seacas/applications/ex1ex2v2/CMakeLists.txt | 2 +- packages/seacas/applications/ex2ex1v2/CMakeLists.txt | 2 +- packages/seacas/applications/exo2mat/CMakeLists.txt | 2 +- packages/seacas/applications/exo_format/CMakeLists.txt | 2 +- packages/seacas/applications/exodiff/CMakeLists.txt | 2 +- packages/seacas/applications/exomatlab/CMakeLists.txt | 2 +- packages/seacas/applications/exotec2/CMakeLists.txt | 2 +- packages/seacas/applications/exotxt/CMakeLists.txt | 2 +- packages/seacas/applications/explore/CMakeLists.txt | 2 +- packages/seacas/applications/fastq/CMakeLists.txt | 2 +- packages/seacas/applications/gen3d/CMakeLists.txt | 2 +- packages/seacas/applications/genshell/CMakeLists.txt | 2 +- packages/seacas/applications/gjoin/CMakeLists.txt | 2 +- packages/seacas/applications/grepos/CMakeLists.txt | 2 +- packages/seacas/applications/mapvar-kd/CMakeLists.txt | 2 +- packages/seacas/applications/mapvar/CMakeLists.txt | 2 +- packages/seacas/applications/mat2exo/CMakeLists.txt | 2 +- packages/seacas/applications/nas2exo/CMakeLists.txt | 2 +- packages/seacas/applications/nem_slice/CMakeLists.txt | 4 ++-- packages/seacas/applications/nem_spread/CMakeLists.txt | 2 +- packages/seacas/applications/numbers/CMakeLists.txt | 2 +- packages/seacas/applications/slice/CMakeLists.txt | 2 +- packages/seacas/applications/txtexo/CMakeLists.txt | 2 +- packages/seacas/applications/zellij/CMakeLists.txt | 4 ++-- packages/seacas/libraries/aprepro_lib/CMakeLists.txt | 2 +- packages/seacas/libraries/chaco/CMakeLists.txt | 2 +- packages/seacas/libraries/exoIIv2for32/CMakeLists.txt | 2 +- packages/seacas/libraries/exodus/CMakeLists.txt | 2 +- packages/seacas/libraries/exodus_for/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/CMakeLists.txt | 4 ++-- packages/seacas/libraries/ioss/src/adios/CMakeLists.txt | 2 +- .../seacas/libraries/ioss/src/adios/utest/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/catalyst/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/cgns/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/exodus/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/faodel/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/gen_struc/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/generated/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/init/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/main/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/text_mesh/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/transform/CMakeLists.txt | 2 +- .../seacas/libraries/ioss/src/unit_tests/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/utest/CMakeLists.txt | 2 +- .../seacas/libraries/ioss/src/visualization/CMakeLists.txt | 2 +- .../ioss/src/visualization/catalyst/CMakeLists.txt | 6 +++--- .../ioss/src/visualization/catalyst/parser/CMakeLists.txt | 4 ++-- packages/seacas/libraries/mapvarlib/CMakeLists.txt | 2 +- packages/seacas/libraries/nemesis/CMakeLists.txt | 2 +- packages/seacas/libraries/supes/CMakeLists.txt | 2 +- packages/seacas/libraries/suplib/CMakeLists.txt | 2 +- packages/seacas/libraries/suplib_c/CMakeLists.txt | 2 +- packages/seacas/libraries/suplib_cpp/CMakeLists.txt | 2 +- packages/seacas/libraries/svdi/CMakeLists.txt | 2 +- packages/seacas/scripts/CMakeLists.txt | 2 +- 64 files changed, 70 insertions(+), 70 deletions(-) diff --git a/packages/seacas/applications/algebra/CMakeLists.txt b/packages/seacas/applications/algebra/CMakeLists.txt index dce299ad19d3..5875a2ce34df 100644 --- a/packages/seacas/applications/algebra/CMakeLists.txt +++ b/packages/seacas/applications/algebra/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(FortranSettings) TRIBITS_SUBPACKAGE(Algebra) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/aprepro/CMakeLists.txt b/packages/seacas/applications/aprepro/CMakeLists.txt index 7c6d8ebec6c6..b74b9b4b272f 100644 --- a/packages/seacas/applications/aprepro/CMakeLists.txt +++ b/packages/seacas/applications/aprepro/CMakeLists.txt @@ -6,7 +6,7 @@ TRIBITS_SUBPACKAGE(Aprepro) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/packages/seacas/applications/blot/CMakeLists.txt b/packages/seacas/applications/blot/CMakeLists.txt index 7f6363402821..191f5a2c15f6 100644 --- a/packages/seacas/applications/blot/CMakeLists.txt +++ b/packages/seacas/applications/blot/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(FortranSettings) TRIBITS_SUBPACKAGE(Blot) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/conjoin/CMakeLists.txt b/packages/seacas/applications/conjoin/CMakeLists.txt index dda1f406a4c1..f4e077fd14b0 100644 --- a/packages/seacas/applications/conjoin/CMakeLists.txt +++ b/packages/seacas/applications/conjoin/CMakeLists.txt @@ -1,7 +1,7 @@ TRIBITS_SUBPACKAGE(Conjoin) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/cpup/CMakeLists.txt b/packages/seacas/applications/cpup/CMakeLists.txt index 27425df8e777..50763858e15c 100644 --- a/packages/seacas/applications/cpup/CMakeLists.txt +++ b/packages/seacas/applications/cpup/CMakeLists.txt @@ -8,7 +8,7 @@ TRIBITS_SUBPACKAGE(Cpup) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/ejoin/CMakeLists.txt b/packages/seacas/applications/ejoin/CMakeLists.txt index 6905cb20de09..33e9eea351e1 100644 --- a/packages/seacas/applications/ejoin/CMakeLists.txt +++ b/packages/seacas/applications/ejoin/CMakeLists.txt @@ -1,7 +1,7 @@ TRIBITS_SUBPACKAGE(Ejoin) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/epu/CMakeLists.txt b/packages/seacas/applications/epu/CMakeLists.txt index c503ee6fc177..f59ef3da3d95 100644 --- a/packages/seacas/applications/epu/CMakeLists.txt +++ b/packages/seacas/applications/epu/CMakeLists.txt @@ -8,7 +8,7 @@ TRIBITS_SUBPACKAGE(Epu) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/ex1ex2v2/CMakeLists.txt b/packages/seacas/applications/ex1ex2v2/CMakeLists.txt index 9ab5a88b8916..f95751391267 100644 --- a/packages/seacas/applications/ex1ex2v2/CMakeLists.txt +++ b/packages/seacas/applications/ex1ex2v2/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(FortranSettings) TRIBITS_SUBPACKAGE(Ex1ex2v2) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/ex2ex1v2/CMakeLists.txt b/packages/seacas/applications/ex2ex1v2/CMakeLists.txt index 47116d797f16..1c0371a9a983 100644 --- a/packages/seacas/applications/ex2ex1v2/CMakeLists.txt +++ b/packages/seacas/applications/ex2ex1v2/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(FortranSettings) TRIBITS_SUBPACKAGE(Ex2ex1v2) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/exo2mat/CMakeLists.txt b/packages/seacas/applications/exo2mat/CMakeLists.txt index 85729277f2b2..e5bcaf796650 100644 --- a/packages/seacas/applications/exo2mat/CMakeLists.txt +++ b/packages/seacas/applications/exo2mat/CMakeLists.txt @@ -3,7 +3,7 @@ IF (TPL_ENABLE_Matio) TRIBITS_SUBPACKAGE(Exo2mat) LINK_DIRECTORIES(${Matio_LIBRARY_DIRS}) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${Matio_INCLUDE_DIRS}" "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/exo_format/CMakeLists.txt b/packages/seacas/applications/exo_format/CMakeLists.txt index dd8de28be3d0..d85e76440172 100644 --- a/packages/seacas/applications/exo_format/CMakeLists.txt +++ b/packages/seacas/applications/exo_format/CMakeLists.txt @@ -1,7 +1,7 @@ TRIBITS_SUBPACKAGE(Exo_format) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/exodiff/CMakeLists.txt b/packages/seacas/applications/exodiff/CMakeLists.txt index 44c24410bbe7..aff6048a1429 100644 --- a/packages/seacas/applications/exodiff/CMakeLists.txt +++ b/packages/seacas/applications/exodiff/CMakeLists.txt @@ -1,7 +1,7 @@ TRIBITS_SUBPACKAGE(Exodiff) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/exomatlab/CMakeLists.txt b/packages/seacas/applications/exomatlab/CMakeLists.txt index c1dc311c45bd..e9d79c3937e5 100644 --- a/packages/seacas/applications/exomatlab/CMakeLists.txt +++ b/packages/seacas/applications/exomatlab/CMakeLists.txt @@ -1,7 +1,7 @@ TRIBITS_SUBPACKAGE(Exomatlab) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/exotec2/CMakeLists.txt b/packages/seacas/applications/exotec2/CMakeLists.txt index 29c6e7532820..8b62aa6553ec 100644 --- a/packages/seacas/applications/exotec2/CMakeLists.txt +++ b/packages/seacas/applications/exotec2/CMakeLists.txt @@ -1,6 +1,6 @@ TRIBITS_SUBPACKAGE(Exotec2) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/exotxt/CMakeLists.txt b/packages/seacas/applications/exotxt/CMakeLists.txt index 6bcfd309c6f1..f2f398dc5805 100644 --- a/packages/seacas/applications/exotxt/CMakeLists.txt +++ b/packages/seacas/applications/exotxt/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(FortranSettings) TRIBITS_SUBPACKAGE(Exotxt) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/explore/CMakeLists.txt b/packages/seacas/applications/explore/CMakeLists.txt index 65521c108e4d..fe46e26a2b84 100644 --- a/packages/seacas/applications/explore/CMakeLists.txt +++ b/packages/seacas/applications/explore/CMakeLists.txt @@ -6,7 +6,7 @@ endif() TRIBITS_SUBPACKAGE(Explore) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/fastq/CMakeLists.txt b/packages/seacas/applications/fastq/CMakeLists.txt index acdee006db99..82c195508fb1 100644 --- a/packages/seacas/applications/fastq/CMakeLists.txt +++ b/packages/seacas/applications/fastq/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(FortranSettings) TRIBITS_SUBPACKAGE(Fastq) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/gen3d/CMakeLists.txt b/packages/seacas/applications/gen3d/CMakeLists.txt index e7cadf984ede..a5bfd5a421d9 100644 --- a/packages/seacas/applications/gen3d/CMakeLists.txt +++ b/packages/seacas/applications/gen3d/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(FortranSettings) TRIBITS_SUBPACKAGE(Gen3D) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/genshell/CMakeLists.txt b/packages/seacas/applications/genshell/CMakeLists.txt index 89094d96b9fb..e8602dd0d9ae 100644 --- a/packages/seacas/applications/genshell/CMakeLists.txt +++ b/packages/seacas/applications/genshell/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(FortranSettings) TRIBITS_SUBPACKAGE(Genshell) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/gjoin/CMakeLists.txt b/packages/seacas/applications/gjoin/CMakeLists.txt index 985338235efc..e57dabdc4b59 100644 --- a/packages/seacas/applications/gjoin/CMakeLists.txt +++ b/packages/seacas/applications/gjoin/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(FortranSettings) TRIBITS_SUBPACKAGE(Gjoin) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/grepos/CMakeLists.txt b/packages/seacas/applications/grepos/CMakeLists.txt index 0fd65fa63535..f16c010f08b2 100644 --- a/packages/seacas/applications/grepos/CMakeLists.txt +++ b/packages/seacas/applications/grepos/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(FortranSettings) TRIBITS_SUBPACKAGE(Grepos) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/mapvar-kd/CMakeLists.txt b/packages/seacas/applications/mapvar-kd/CMakeLists.txt index 0e270295a0a3..cea8076f04cf 100644 --- a/packages/seacas/applications/mapvar-kd/CMakeLists.txt +++ b/packages/seacas/applications/mapvar-kd/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(FortranSettings) TRIBITS_SUBPACKAGE(Mapvar-kd) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/mapvar/CMakeLists.txt b/packages/seacas/applications/mapvar/CMakeLists.txt index 06d0fe0a5eb6..3d34f2e7a4d1 100644 --- a/packages/seacas/applications/mapvar/CMakeLists.txt +++ b/packages/seacas/applications/mapvar/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(FortranSettings) TRIBITS_SUBPACKAGE(Mapvar) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/mat2exo/CMakeLists.txt b/packages/seacas/applications/mat2exo/CMakeLists.txt index 4d55d96f290f..af5b608077ef 100644 --- a/packages/seacas/applications/mat2exo/CMakeLists.txt +++ b/packages/seacas/applications/mat2exo/CMakeLists.txt @@ -3,7 +3,7 @@ IF (TPL_ENABLE_Matio) TRIBITS_SUBPACKAGE(Mat2exo) LINK_DIRECTORIES(${Matio_LIBRARY_DIRS}) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${Matio_INCLUDE_DIRS}" "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/nas2exo/CMakeLists.txt b/packages/seacas/applications/nas2exo/CMakeLists.txt index 02b4c8ba70c8..433df4bb02e8 100644 --- a/packages/seacas/applications/nas2exo/CMakeLists.txt +++ b/packages/seacas/applications/nas2exo/CMakeLists.txt @@ -3,7 +3,7 @@ TRIBITS_SUBPACKAGE(Nas2exo) -INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}") +TRIBITS_INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}") SET(HEADERS "") diff --git a/packages/seacas/applications/nem_slice/CMakeLists.txt b/packages/seacas/applications/nem_slice/CMakeLists.txt index bd5cf47d2955..d1d7e0b47d5a 100644 --- a/packages/seacas/applications/nem_slice/CMakeLists.txt +++ b/packages/seacas/applications/nem_slice/CMakeLists.txt @@ -4,12 +4,12 @@ TRIBITS_SUBPACKAGE(Nemslice) ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_Zoltan) IF (${PROJECT_NAME}_ENABLE_Zoltan) - INCLUDE_DIRECTORIES(${Zoltan_INCLUDE_DIRS}) + TRIBITS_INCLUDE_DIRECTORIES(${Zoltan_INCLUDE_DIRS}) SET(ZOLTAN_DEP zoltan) ADD_DEFINITIONS(-DUSE_ZOLTAN) ENDIF() -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS "") APPEND_GLOB(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.C) diff --git a/packages/seacas/applications/nem_spread/CMakeLists.txt b/packages/seacas/applications/nem_spread/CMakeLists.txt index 77c9f51f699c..e8a2767dd136 100644 --- a/packages/seacas/applications/nem_spread/CMakeLists.txt +++ b/packages/seacas/applications/nem_spread/CMakeLists.txt @@ -1,7 +1,7 @@ TRIBITS_SUBPACKAGE(Nemspread) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/numbers/CMakeLists.txt b/packages/seacas/applications/numbers/CMakeLists.txt index 5b8fe6b40539..cf480b10b1fc 100644 --- a/packages/seacas/applications/numbers/CMakeLists.txt +++ b/packages/seacas/applications/numbers/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(FortranSettings) TRIBITS_SUBPACKAGE(Numbers) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/slice/CMakeLists.txt b/packages/seacas/applications/slice/CMakeLists.txt index c6e4e1b1abed..08d4167478e5 100644 --- a/packages/seacas/applications/slice/CMakeLists.txt +++ b/packages/seacas/applications/slice/CMakeLists.txt @@ -5,7 +5,7 @@ IF (TPL_ENABLE_METIS) ADD_DEFINITIONS(-DUSE_METIS) ENDIF() -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS "") APPEND_GLOB(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.C) diff --git a/packages/seacas/applications/txtexo/CMakeLists.txt b/packages/seacas/applications/txtexo/CMakeLists.txt index bd545d932ba6..931cc80715cc 100644 --- a/packages/seacas/applications/txtexo/CMakeLists.txt +++ b/packages/seacas/applications/txtexo/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(FortranSettings) TRIBITS_SUBPACKAGE(Txtexo) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/applications/zellij/CMakeLists.txt b/packages/seacas/applications/zellij/CMakeLists.txt index 1ba1d8f45aa5..9faf02941b16 100644 --- a/packages/seacas/applications/zellij/CMakeLists.txt +++ b/packages/seacas/applications/zellij/CMakeLists.txt @@ -3,12 +3,12 @@ TRIBITS_SUBPACKAGE(Zellij) ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_Zoltan) IF (${PROJECT_NAME}_ENABLE_Zoltan) - INCLUDE_DIRECTORIES(${Zoltan_INCLUDE_DIRS}) + TRIBITS_INCLUDE_DIRECTORIES(${Zoltan_INCLUDE_DIRS}) SET(ZOLTAN_DEP zoltan) ADD_DEFINITIONS(-DUSE_ZOLTAN) ENDIF() -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt b/packages/seacas/libraries/aprepro_lib/CMakeLists.txt index ef391f1c6034..331bc5841cf5 100644 --- a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt +++ b/packages/seacas/libraries/aprepro_lib/CMakeLists.txt @@ -15,7 +15,7 @@ IF (${CMAKE_PROJECT_NAME}_ENABLE_SEACASExodus) ADD_DEFINITIONS(-DEXODUS_SUPPORT) ENDIF() -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/packages/seacas/libraries/chaco/CMakeLists.txt b/packages/seacas/libraries/chaco/CMakeLists.txt index 5f43a4e0c7fe..576abc8a8440 100644 --- a/packages/seacas/libraries/chaco/CMakeLists.txt +++ b/packages/seacas/libraries/chaco/CMakeLists.txt @@ -6,7 +6,7 @@ SET(CHACO_VERSION_PATCH "0") SET(CHACO_VERSION "${CHACO_VERSION_MAJOR}.${CHACO_VERSION_MINOR}") SET(CHACO_VERSION_FULL "${CHACO_VERSION}.${CHACO_VERSION_PATCH}") -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/main" "${CMAKE_CURRENT_SOURCE_DIR}/util" ) diff --git a/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt b/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt index 855f3899842e..5b680a8a5c27 100644 --- a/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt +++ b/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt @@ -4,7 +4,7 @@ TRIBITS_SUBPACKAGE(ExoIIv2for32) add_definitions(-DDEFAULT_REAL_INT) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../exodus_for/include" "${CMAKE_CURRENT_SOURCE_DIR}/test" ) diff --git a/packages/seacas/libraries/exodus/CMakeLists.txt b/packages/seacas/libraries/exodus/CMakeLists.txt index 2ed3ec4abd01..41f6f30b25b1 100644 --- a/packages/seacas/libraries/exodus/CMakeLists.txt +++ b/packages/seacas/libraries/exodus/CMakeLists.txt @@ -4,7 +4,7 @@ if (SEACASExodus_ENABLE_STATIC) INCLUDE(InstallSymLink) endif() -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/include" ) diff --git a/packages/seacas/libraries/exodus_for/CMakeLists.txt b/packages/seacas/libraries/exodus_for/CMakeLists.txt index b043503fc6c4..c486de45012b 100644 --- a/packages/seacas/libraries/exodus_for/CMakeLists.txt +++ b/packages/seacas/libraries/exodus_for/CMakeLists.txt @@ -6,7 +6,7 @@ endif() TRIBITS_SUBPACKAGE(Exodus_for) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/test" ) diff --git a/packages/seacas/libraries/ioss/src/CMakeLists.txt b/packages/seacas/libraries/ioss/src/CMakeLists.txt index 8ba229bc73e6..d74000f78d13 100644 --- a/packages/seacas/libraries/ioss/src/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/CMakeLists.txt @@ -61,14 +61,14 @@ IF (NOT TPL_ENABLE_MPI) LIST(REMOVE_ITEM HEADERS ${DIR}/Ioss_Decomposition.h) ENDIF() -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" "${Zoltan_INCLUDE_DIRS}" ) IF (NOT TPL_ENABLE_fmt) - INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/private_copy_fmt") + TRIBITS_INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/private_copy_fmt") ENDIF() list(APPEND HEADERS diff --git a/packages/seacas/libraries/ioss/src/adios/CMakeLists.txt b/packages/seacas/libraries/ioss/src/adios/CMakeLists.txt index 7e89884fd80e..cfb59559c276 100644 --- a/packages/seacas/libraries/ioss/src/adios/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/adios/CMakeLists.txt @@ -5,7 +5,7 @@ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h*) APPEND_GLOB(SOURCES ${DIR}/*.C) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" ) diff --git a/packages/seacas/libraries/ioss/src/adios/utest/CMakeLists.txt b/packages/seacas/libraries/ioss/src/adios/utest/CMakeLists.txt index 30df5e2befac..23d861ef1271 100644 --- a/packages/seacas/libraries/ioss/src/adios/utest/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/adios/utest/CMakeLists.txt @@ -10,7 +10,7 @@ TRIBITS_ADD_TEST( NUM_MPI_PROCS 1 ) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" "${CMAKE_CURRENT_SOURCE_DIR}/../../" diff --git a/packages/seacas/libraries/ioss/src/catalyst/CMakeLists.txt b/packages/seacas/libraries/ioss/src/catalyst/CMakeLists.txt index 658bbdc19783..49fb5a0bd932 100644 --- a/packages/seacas/libraries/ioss/src/catalyst/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/catalyst/CMakeLists.txt @@ -5,7 +5,7 @@ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h*) APPEND_GLOB(SOURCES ${DIR}/*.C) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" ) diff --git a/packages/seacas/libraries/ioss/src/cgns/CMakeLists.txt b/packages/seacas/libraries/ioss/src/cgns/CMakeLists.txt index e9b57d50e385..dd5625aa2817 100644 --- a/packages/seacas/libraries/ioss/src/cgns/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/cgns/CMakeLists.txt @@ -23,7 +23,7 @@ IF (NOT TPL_ENABLE_MPI) LIST(REMOVE_ITEM HEADERS ${DIR}/Iocgns_ParallelDatabaseIO.h ${DIR}/Iocgns_DecompositionData.h) ENDIF() -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" ) diff --git a/packages/seacas/libraries/ioss/src/exodus/CMakeLists.txt b/packages/seacas/libraries/ioss/src/exodus/CMakeLists.txt index 9b54cccef5b0..57ed38878839 100644 --- a/packages/seacas/libraries/ioss/src/exodus/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/exodus/CMakeLists.txt @@ -6,7 +6,7 @@ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" ) diff --git a/packages/seacas/libraries/ioss/src/faodel/CMakeLists.txt b/packages/seacas/libraries/ioss/src/faodel/CMakeLists.txt index 335c3c8c20c3..a1efc7ba75a2 100644 --- a/packages/seacas/libraries/ioss/src/faodel/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/faodel/CMakeLists.txt @@ -5,7 +5,7 @@ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" ${Boost_INCLUDE_DIR} diff --git a/packages/seacas/libraries/ioss/src/gen_struc/CMakeLists.txt b/packages/seacas/libraries/ioss/src/gen_struc/CMakeLists.txt index 8b78f41f5fc3..eb791e956021 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/gen_struc/CMakeLists.txt @@ -5,7 +5,7 @@ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" ) diff --git a/packages/seacas/libraries/ioss/src/generated/CMakeLists.txt b/packages/seacas/libraries/ioss/src/generated/CMakeLists.txt index 42eeb7b0a852..88d73a65ca98 100644 --- a/packages/seacas/libraries/ioss/src/generated/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/generated/CMakeLists.txt @@ -6,7 +6,7 @@ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" ) diff --git a/packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt b/packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt index 9774ca3fa8ef..092cda7bb5df 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt @@ -6,7 +6,7 @@ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" ) diff --git a/packages/seacas/libraries/ioss/src/init/CMakeLists.txt b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt index 5728726bc05a..acb0c0d9262a 100644 --- a/packages/seacas/libraries/ioss/src/init/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt @@ -6,7 +6,7 @@ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" ) diff --git a/packages/seacas/libraries/ioss/src/main/CMakeLists.txt b/packages/seacas/libraries/ioss/src/main/CMakeLists.txt index 2d99b7de7edf..742ebe0ebda9 100644 --- a/packages/seacas/libraries/ioss/src/main/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/main/CMakeLists.txt @@ -5,7 +5,7 @@ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" ) diff --git a/packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt b/packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt index 88d46366b37f..6e6d311babc5 100644 --- a/packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt @@ -6,7 +6,7 @@ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" ) diff --git a/packages/seacas/libraries/ioss/src/text_mesh/CMakeLists.txt b/packages/seacas/libraries/ioss/src/text_mesh/CMakeLists.txt index 371a67cb134d..cd18aa547de7 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/text_mesh/CMakeLists.txt @@ -6,7 +6,7 @@ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" ) diff --git a/packages/seacas/libraries/ioss/src/transform/CMakeLists.txt b/packages/seacas/libraries/ioss/src/transform/CMakeLists.txt index eba8de75f4b9..292f9698531b 100644 --- a/packages/seacas/libraries/ioss/src/transform/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/transform/CMakeLists.txt @@ -6,7 +6,7 @@ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" ) diff --git a/packages/seacas/libraries/ioss/src/unit_tests/CMakeLists.txt b/packages/seacas/libraries/ioss/src/unit_tests/CMakeLists.txt index 190f9991becc..d8a21dc400b4 100644 --- a/packages/seacas/libraries/ioss/src/unit_tests/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/unit_tests/CMakeLists.txt @@ -28,7 +28,7 @@ TRIBITS_ADD_TEST( NUM_MPI_PROCS 4 ) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" diff --git a/packages/seacas/libraries/ioss/src/utest/CMakeLists.txt b/packages/seacas/libraries/ioss/src/utest/CMakeLists.txt index cd68d4c2e17f..f19564f89aee 100644 --- a/packages/seacas/libraries/ioss/src/utest/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/utest/CMakeLists.txt @@ -122,7 +122,7 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST( ) ENDIF() -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" ) diff --git a/packages/seacas/libraries/ioss/src/visualization/CMakeLists.txt b/packages/seacas/libraries/ioss/src/visualization/CMakeLists.txt index 53d19c32908e..a3db7f2ddc05 100644 --- a/packages/seacas/libraries/ioss/src/visualization/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/visualization/CMakeLists.txt @@ -10,7 +10,7 @@ APPEND_GLOB(SOURCES ${DIR}/exodus/*.C) APPEND_GLOB(HEADERS ${DIR}/utils/*.h) APPEND_GLOB(SOURCES ${DIR}/utils/*.C) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_BINARY_DIR}/../" ) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/CMakeLists.txt b/packages/seacas/libraries/ioss/src/visualization/catalyst/CMakeLists.txt index 99f798eb024b..a5c1c687843c 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/CMakeLists.txt @@ -37,9 +37,9 @@ IF("${isSystemDir}" STREQUAL "-1") SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") ENDIF() -INCLUDE_DIRECTORIES("manager") -INCLUDE_DIRECTORIES("parser") -INCLUDE_DIRECTORIES("../../") +TRIBITS_INCLUDE_DIRECTORIES("manager") +TRIBITS_INCLUDE_DIRECTORIES("parser") +TRIBITS_INCLUDE_DIRECTORIES("../../") ADD_SUBDIRECTORY(manager) ADD_SUBDIRECTORY(parser) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/parser/CMakeLists.txt b/packages/seacas/libraries/ioss/src/visualization/catalyst/parser/CMakeLists.txt index af3ad3ab34c7..afcef80c27dc 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/parser/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/parser/CMakeLists.txt @@ -34,8 +34,8 @@ ENDIF() SET_SOURCE_FILES_PROPERTIES(${FlexOutput} PROPERTIES GENERATED TRUE) SET_SOURCE_FILES_PROPERTIES(${BisonOutput} PROPERTIES GENERATED TRUE) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FIND_PACKAGE(ParaView QUIET) diff --git a/packages/seacas/libraries/mapvarlib/CMakeLists.txt b/packages/seacas/libraries/mapvarlib/CMakeLists.txt index 2b7708beee9c..31ad5e35a61e 100644 --- a/packages/seacas/libraries/mapvarlib/CMakeLists.txt +++ b/packages/seacas/libraries/mapvarlib/CMakeLists.txt @@ -8,7 +8,7 @@ SET(SUPLIB_VERSION_PATCH "0") SET(MAPVARLIB_VERSION "${MAPVARLIB_VERSION_MAJOR}.${MAPVARLIB_VERSION_MINOR}") SET(MAPVARLIB_VERSION_FULL "${MAPVARLIB_VERSION}.${MAPVARLIB_VERSION_PATCH}") -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/libraries/nemesis/CMakeLists.txt b/packages/seacas/libraries/nemesis/CMakeLists.txt index 154cf9e9e39b..cfee14ffa13a 100644 --- a/packages/seacas/libraries/nemesis/CMakeLists.txt +++ b/packages/seacas/libraries/nemesis/CMakeLists.txt @@ -13,7 +13,7 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_BINARY_DIR}/nemesis_cfg.h @ONLY IMMEDIATE) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" ) diff --git a/packages/seacas/libraries/supes/CMakeLists.txt b/packages/seacas/libraries/supes/CMakeLists.txt index 6a008c2deb30..5859e9e1ff63 100644 --- a/packages/seacas/libraries/supes/CMakeLists.txt +++ b/packages/seacas/libraries/supes/CMakeLists.txt @@ -9,7 +9,7 @@ SET(SUPES_VERSION_PATCH "0") SET(SUPES_VERSION "${SUPES_VERSION_MAJOR}.${SUPES_VERSION_MINOR}") SET(SUPES_VERSION_FULL "${SUPES_VERSION}.${SUPES_VERSION_PATCH}") -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/mem_mgr" "${CMAKE_CURRENT_SOURCE_DIR}/ext_lib" diff --git a/packages/seacas/libraries/suplib/CMakeLists.txt b/packages/seacas/libraries/suplib/CMakeLists.txt index 316f2ea877f0..bdf4ca93b3c5 100644 --- a/packages/seacas/libraries/suplib/CMakeLists.txt +++ b/packages/seacas/libraries/suplib/CMakeLists.txt @@ -8,7 +8,7 @@ SET(SUPLIB_VERSION_PATCH "0") SET(SUPLIB_VERSION "${SUPLIB_VERSION_MAJOR}.${SUPLIB_VERSION_MINOR}") SET(SUPLIB_VERSION_FULL "${SUPLIB_VERSION}.${SUPLIB_VERSION_PATCH}") -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/libraries/suplib_c/CMakeLists.txt b/packages/seacas/libraries/suplib_c/CMakeLists.txt index c5c0d0fd3183..52f7c57f638b 100644 --- a/packages/seacas/libraries/suplib_c/CMakeLists.txt +++ b/packages/seacas/libraries/suplib_c/CMakeLists.txt @@ -6,7 +6,7 @@ SET(SUPLIBC_VERSION_PATCH "0") SET(SUPLIBC_VERSION "${SUPLIBC_VERSION_MAJOR}.${SUPLIBC_VERSION_MINOR}") SET(SUPLIBC_VERSION_FULL "${SUPLIBC_VERSION}.${SUPLIBC_VERSION_PATCH}") -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/libraries/suplib_cpp/CMakeLists.txt b/packages/seacas/libraries/suplib_cpp/CMakeLists.txt index 5eb15b5a76b3..c9f1d5704cac 100644 --- a/packages/seacas/libraries/suplib_cpp/CMakeLists.txt +++ b/packages/seacas/libraries/suplib_cpp/CMakeLists.txt @@ -7,7 +7,7 @@ SET(SUPLIBCPP_VERSION_PATCH "0") SET(SUPLIBCPP_VERSION "${SUPLIBCPP_VERSION_MAJOR}.${SUPLIBCPP_VERSION_MINOR}") SET(SUPLIBCPP_VERSION_FULL "${SUPLIBCPP_VERSION}.${SUPLIBCPP_VERSION_PATCH}") -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) diff --git a/packages/seacas/libraries/svdi/CMakeLists.txt b/packages/seacas/libraries/svdi/CMakeLists.txt index 01351903d9f4..15fd50af94c1 100644 --- a/packages/seacas/libraries/svdi/CMakeLists.txt +++ b/packages/seacas/libraries/svdi/CMakeLists.txt @@ -8,7 +8,7 @@ SET(SVDI_VERSION_PATCH "0") SET(SVDI_VERSION "${SVDI_VERSION_MAJOR}.${SVDI_VERSION_MINOR}") SET(SVDI_VERSION_FULL "${SVDI_VERSION}.${SVDI_VERSION_PATCH}") -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/cgi" "${CMAKE_CURRENT_SOURCE_DIR}/vdi_drivers" diff --git a/packages/seacas/scripts/CMakeLists.txt b/packages/seacas/scripts/CMakeLists.txt index b881c3822cf7..4b15d31b98f6 100644 --- a/packages/seacas/scripts/CMakeLists.txt +++ b/packages/seacas/scripts/CMakeLists.txt @@ -60,7 +60,7 @@ IF (${PROJECT_NAME}_ENABLE_SEACASConjoin) INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pconjoin DESTINATION bin) ENDIF() -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) From a4da95b87cb73eb2ed8d900b389a79fb421abc84 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:41:18 -0700 Subject: [PATCH 39/78] Shards: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/shards/src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/shards/src/CMakeLists.txt b/packages/shards/src/CMakeLists.txt index 2049d4cd8214..2f8924eb311c 100644 --- a/packages/shards/src/CMakeLists.txt +++ b/packages/shards/src/CMakeLists.txt @@ -13,13 +13,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # CORE APPEND_SET(HEADERS From 011d232e143ca5bf3d9b16d68a7b2b28ee089514 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:43:17 -0700 Subject: [PATCH 40/78] ShyLU: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- .../shylu/shylu_dd/common/src/CMakeLists.txt | 8 ++--- .../shylu/shylu_dd/core/src/CMakeLists.txt | 12 +++---- .../shylu/shylu_dd/core/test/CMakeLists.txt | 2 +- .../shylu/shylu_dd/frosch/src/CMakeLists.txt | 32 +++++++++---------- .../shylu_node/basker/src/CMakeLists.txt | 4 +-- .../shylu_node/fastilu/src/CMakeLists.txt | 4 +-- .../shylu/shylu_node/hts/src/CMakeLists.txt | 4 +-- .../shylu_node/tacho/example/CMakeLists.txt | 4 +-- .../shylu/shylu_node/tacho/src/CMakeLists.txt | 6 ++-- .../shylu_node/tacho/unit-test/CMakeLists.txt | 8 ++--- 10 files changed, 42 insertions(+), 42 deletions(-) diff --git a/packages/shylu/shylu_dd/common/src/CMakeLists.txt b/packages/shylu/shylu_dd/common/src/CMakeLists.txt index 6d7e34df5d70..5736528006a1 100644 --- a/packages/shylu/shylu_dd/common/src/CMakeLists.txt +++ b/packages/shylu/shylu_dd/common/src/CMakeLists.txt @@ -25,20 +25,20 @@ SET(SOURCES "") ASSERT_DEFINED(PROJECT_SOURCE_DIR) ASSERT_DEFINED(PROJECT_BINARY_DIR) -INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) # # Include packages/src directory # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Set sources diff --git a/packages/shylu/shylu_dd/core/src/CMakeLists.txt b/packages/shylu/shylu_dd/core/src/CMakeLists.txt index c98a58963236..5a67913f1918 100644 --- a/packages/shylu/shylu_dd/core/src/CMakeLists.txt +++ b/packages/shylu/shylu_dd/core/src/CMakeLists.txt @@ -26,22 +26,22 @@ SET(SOURCES "") ASSERT_DEFINED(PROJECT_SOURCE_DIR) ASSERT_DEFINED(PROJECT_BINARY_DIR) -INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) # # Include packages/src directory # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/interfaces) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/interfaces) APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS epetra/shylu_internal_gmres.h diff --git a/packages/shylu/shylu_dd/core/test/CMakeLists.txt b/packages/shylu/shylu_dd/core/test/CMakeLists.txt index 1104080440f5..d8c7f87e5113 100644 --- a/packages/shylu/shylu_dd/core/test/CMakeLists.txt +++ b/packages/shylu/shylu_dd/core/test/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../src/interfaces) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../src/interfaces) #TRIBITS_ADD_EXECUTABLE_AND_TEST( # aztec_driver diff --git a/packages/shylu/shylu_dd/frosch/src/CMakeLists.txt b/packages/shylu/shylu_dd/frosch/src/CMakeLists.txt index 4c41a6965a72..e156e228abdd 100644 --- a/packages/shylu/shylu_dd/frosch/src/CMakeLists.txt +++ b/packages/shylu/shylu_dd/frosch/src/CMakeLists.txt @@ -23,20 +23,20 @@ SET(SOURCES "") ASSERT_DEFINED(PROJECT_SOURCE_DIR) ASSERT_DEFINED(PROJECT_BINARY_DIR) -INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) # # Include packages/src directory # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/CoarseSpaces) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/InterfaceSets) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/SchwarzOperators) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/SchwarzPreconditioners) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/SolverInterfaces) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Tools) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Adapters) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/CoarseSpaces) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/InterfaceSets) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/SchwarzOperators) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/SchwarzPreconditioners) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/SolverInterfaces) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Tools) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Adapters) @@ -44,15 +44,15 @@ APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ## AH 09/13/2017: ## There is a problem with the dependecies of the packages... We have to discuss this -#INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/packages/amesos2/src) -#INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/packages/amesos2/src/KLU2/Include) -#INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/packages/amesos2/src/KLU2/Source) -#INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/packages/amesos2/src) -#INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/packages/muelu/adapters/belos) +#TRIBITS_INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/packages/amesos2/src) +#TRIBITS_INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/packages/amesos2/src/KLU2/Include) +#TRIBITS_INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/packages/amesos2/src/KLU2/Source) +#TRIBITS_INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/packages/amesos2/src) +#TRIBITS_INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/packages/muelu/adapters/belos) APPEND_SET(HEADERS Adapters/Stratimikos_FROSch_decl.hpp diff --git a/packages/shylu/shylu_node/basker/src/CMakeLists.txt b/packages/shylu/shylu_node/basker/src/CMakeLists.txt index 06f50de1c227..bf52c6891b83 100644 --- a/packages/shylu/shylu_node/basker/src/CMakeLists.txt +++ b/packages/shylu/shylu_node/basker/src/CMakeLists.txt @@ -1,8 +1,8 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) #----------------------------------------------------------------------------- diff --git a/packages/shylu/shylu_node/fastilu/src/CMakeLists.txt b/packages/shylu/shylu_node/fastilu/src/CMakeLists.txt index d959a9f00e49..5be4989754d7 100644 --- a/packages/shylu/shylu_node/fastilu/src/CMakeLists.txt +++ b/packages/shylu/shylu_node/fastilu/src/CMakeLists.txt @@ -1,8 +1,8 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) #----------------------------------------------------------------------------- diff --git a/packages/shylu/shylu_node/hts/src/CMakeLists.txt b/packages/shylu/shylu_node/hts/src/CMakeLists.txt index 2ba575c3c75f..4350d2f5f1a3 100644 --- a/packages/shylu/shylu_node/hts/src/CMakeLists.txt +++ b/packages/shylu/shylu_node/hts/src/CMakeLists.txt @@ -16,8 +16,8 @@ TRIBITS_ADD_OPTION_AND_DEFINE( TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) diff --git a/packages/shylu/shylu_node/tacho/example/CMakeLists.txt b/packages/shylu/shylu_node/tacho/example/CMakeLists.txt index db060b446210..edd009e6c9ca 100644 --- a/packages/shylu/shylu_node/tacho/example/CMakeLists.txt +++ b/packages/shylu/shylu_node/tacho/example/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES "") diff --git a/packages/shylu/shylu_node/tacho/src/CMakeLists.txt b/packages/shylu/shylu_node/tacho/src/CMakeLists.txt index d57d73143504..d36650a41e19 100644 --- a/packages/shylu/shylu_node/tacho/src/CMakeLists.txt +++ b/packages/shylu/shylu_node/tacho/src/CMakeLists.txt @@ -22,9 +22,9 @@ SET(TACHO_HAVE_VTUNE ${TPL_ENABLE_VTune}) TRIBITS_CONFIGURE_FILE(Tacho_config.h) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/impl) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/impl) #----------------------------------------------------------------------------- SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) diff --git a/packages/shylu/shylu_node/tacho/unit-test/CMakeLists.txt b/packages/shylu/shylu_node/tacho/unit-test/CMakeLists.txt index b4b338acafc2..832273adbc46 100644 --- a/packages/shylu/shylu_node/tacho/unit-test/CMakeLists.txt +++ b/packages/shylu/shylu_node/tacho/unit-test/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) TRIBITS_COPY_FILES_TO_BINARY_DIR( Tacho_UnitTest_SparseMatrixFile @@ -11,8 +11,8 @@ TRIBITS_COPY_FILES_TO_BINARY_DIR( # # gtest library # -INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/googletest") -INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/googletest/include") +TRIBITS_INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/googletest") +TRIBITS_INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/googletest/include") TRIBITS_ADD_LIBRARY( tacho-gtest From 6312eb4cc2321a3fddbed6bb99198cb2a49c57bc Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:45:17 -0700 Subject: [PATCH 41/78] STK: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/stk/CMakeLists.txt | 2 +- .../stk/stk_balance/stk_balance/CMakeLists.txt | 2 +- packages/stk/stk_coupling/CMakeLists.txt | 2 +- .../stk_coupling/stk_coupling/CMakeLists.txt | 2 +- .../stk_doc_tests/stk_balance/CMakeLists.txt | 4 ++-- .../stk/stk_doc_tests/stk_io/CMakeLists.txt | 16 ++++++++-------- .../stk/stk_doc_tests/stk_mesh/CMakeLists.txt | 6 +++--- .../stk/stk_doc_tests/stk_simd/CMakeLists.txt | 4 ++-- .../stk_doc_tests/stk_topology/CMakeLists.txt | 2 +- .../stk_doc_tests/stk_transfer/CMakeLists.txt | 6 +++--- .../stk/stk_doc_tests/stk_util/CMakeLists.txt | 2 +- .../stk_emend/independent_set/CMakeLists.txt | 2 +- .../independent_set/unit_tests/CMakeLists.txt | 8 ++++---- .../stk_expreval/stk_expreval/CMakeLists.txt | 6 +++--- .../stk/stk_expreval/unit_tests/CMakeLists.txt | 8 ++++---- .../stk_balance/CMakeLists.txt | 6 +++--- .../stk_mesh/CMakeLists.txt | 12 ++++++------ .../stk_search/CMakeLists.txt | 2 +- .../stk_transfer/CMakeLists.txt | 12 ++++++------ packages/stk/stk_io/stk_io/CMakeLists.txt | 18 +++++++++--------- packages/stk/stk_io/stk_io/util/CMakeLists.txt | 8 ++++---- packages/stk/stk_math/stk_math/CMakeLists.txt | 2 +- .../stk/stk_mesh/stk_mesh/base/CMakeLists.txt | 2 +- .../stk_ngp_test/stk_ngp_test/CMakeLists.txt | 8 ++++---- .../stk_mesh/CMakeLists.txt | 14 +++++++------- .../stk/stk_search/stk_search/CMakeLists.txt | 2 +- .../stk_search_util/CMakeLists.txt | 2 +- .../stk_search_util/unit_tests/CMakeLists.txt | 8 ++++---- packages/stk/stk_simd/stk_math/CMakeLists.txt | 6 +++--- packages/stk/stk_simd/stk_simd/CMakeLists.txt | 6 +++--- .../stk_simd/kokkos_simd/CMakeLists.txt | 6 +++--- .../stk/stk_simd/stk_simd_view/CMakeLists.txt | 6 +++--- .../stk/stk_tools/stk_tools/CMakeLists.txt | 2 +- .../stk_topology/stk_topology/CMakeLists.txt | 2 +- packages/stk/stk_transfer/CMakeLists.txt | 2 +- .../stk_unit_test_utils/CMakeLists.txt | 10 +++++----- .../stk_mesh_fixtures/CMakeLists.txt | 4 ++-- .../stk_unit_tests/stk_balance/CMakeLists.txt | 4 ++-- .../stk_unit_tests/stk_coupling/CMakeLists.txt | 2 +- .../stk/stk_unit_tests/stk_io/CMakeLists.txt | 6 +++--- .../stk/stk_unit_tests/stk_math/CMakeLists.txt | 8 ++++---- .../stk/stk_unit_tests/stk_mesh/CMakeLists.txt | 2 +- .../stk_unit_tests/stk_ngp_test/CMakeLists.txt | 4 ++-- .../stk_unit_tests/stk_search/CMakeLists.txt | 2 +- .../stk/stk_unit_tests/stk_simd/CMakeLists.txt | 8 ++++---- .../stk_unit_tests/stk_simd_old/CMakeLists.txt | 8 ++++---- .../stk_unit_tests/stk_tools/CMakeLists.txt | 4 ++-- .../stk_unit_tests/stk_topology/CMakeLists.txt | 6 +++--- .../stk_unit_tests/stk_transfer/CMakeLists.txt | 8 ++++---- .../stk/stk_unit_tests/stk_util/CMakeLists.txt | 2 +- packages/stk/stk_util/stk_util/CMakeLists.txt | 2 +- .../stk_util/command_line/CMakeLists.txt | 2 +- .../stk/stk_util/stk_util/diag/CMakeLists.txt | 2 +- .../stk_util/environment/CMakeLists.txt | 2 +- .../stk/stk_util/stk_util/ngp/CMakeLists.txt | 2 +- .../stk_util/stk_util/parallel/CMakeLists.txt | 2 +- .../stk_util/stk_util/registry/CMakeLists.txt | 2 +- .../stk/stk_util/stk_util/util/CMakeLists.txt | 2 +- 58 files changed, 146 insertions(+), 146 deletions(-) diff --git a/packages/stk/CMakeLists.txt b/packages/stk/CMakeLists.txt index 002641577f39..39f06c1357d2 100644 --- a/packages/stk/CMakeLists.txt +++ b/packages/stk/CMakeLists.txt @@ -97,7 +97,7 @@ ELSE() ENDIF() TRIBITS_CONFIGURE_FILE(STK_Trilinos_config.h) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STK_Trilinos_config.h DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/) diff --git a/packages/stk/stk_balance/stk_balance/CMakeLists.txt b/packages/stk/stk_balance/stk_balance/CMakeLists.txt index 5095dfcd8c7c..b8efbd36c239 100644 --- a/packages/stk/stk_balance/stk_balance/CMakeLists.txt +++ b/packages/stk/stk_balance/stk_balance/CMakeLists.txt @@ -51,7 +51,7 @@ SET(SOURCES "") SET(HEADERS_IMPL "") SET(SOURCES_IMPL "") -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) # # Core headers diff --git a/packages/stk/stk_coupling/CMakeLists.txt b/packages/stk/stk_coupling/CMakeLists.txt index 9ac350d83c29..9938d8b49c2a 100644 --- a/packages/stk/stk_coupling/CMakeLists.txt +++ b/packages/stk/stk_coupling/CMakeLists.txt @@ -34,7 +34,7 @@ TRIBITS_SUBPACKAGE(Coupling) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ADD_SUBDIRECTORY(stk_coupling) diff --git a/packages/stk/stk_coupling/stk_coupling/CMakeLists.txt b/packages/stk/stk_coupling/stk_coupling/CMakeLists.txt index 7811aedf9d9d..dc997f2c9453 100644 --- a/packages/stk/stk_coupling/stk_coupling/CMakeLists.txt +++ b/packages/stk/stk_coupling/stk_coupling/CMakeLists.txt @@ -32,7 +32,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_doc_tests/stk_balance/CMakeLists.txt b/packages/stk/stk_doc_tests/stk_balance/CMakeLists.txt index 6756725c8065..8e0b951b90fa 100644 --- a/packages/stk/stk_doc_tests/stk_balance/CMakeLists.txt +++ b/packages/stk/stk_doc_tests/stk_balance/CMakeLists.txt @@ -33,8 +33,8 @@ # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_doc_tests/stk_io/CMakeLists.txt b/packages/stk/stk_doc_tests/stk_io/CMakeLists.txt index 9e794af0e4a7..4d9bd3830403 100644 --- a/packages/stk/stk_doc_tests/stk_io/CMakeLists.txt +++ b/packages/stk/stk_doc_tests/stk_io/CMakeLists.txt @@ -32,15 +32,15 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_io) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_io/util) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../teuchos/src) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../../seacas/libraries/ioss/src) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_io) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_io/util) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../teuchos/src) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../../seacas/libraries/ioss/src) #TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) diff --git a/packages/stk/stk_doc_tests/stk_mesh/CMakeLists.txt b/packages/stk/stk_doc_tests/stk_mesh/CMakeLists.txt index 5c3278dac9e8..a8aed2874ebd 100644 --- a/packages/stk/stk_doc_tests/stk_mesh/CMakeLists.txt +++ b/packages/stk/stk_doc_tests/stk_mesh/CMakeLists.txt @@ -33,9 +33,9 @@ # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_doc_tests/stk_simd/CMakeLists.txt b/packages/stk/stk_doc_tests/stk_simd/CMakeLists.txt index e008f338a6c3..3719e46bd4c0 100644 --- a/packages/stk/stk_doc_tests/stk_simd/CMakeLists.txt +++ b/packages/stk/stk_doc_tests/stk_simd/CMakeLists.txt @@ -1,8 +1,8 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_simd) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/stk_simd) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_simd) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/stk_simd) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_doc_tests/stk_topology/CMakeLists.txt b/packages/stk/stk_doc_tests/stk_topology/CMakeLists.txt index 55ec713e3fa7..73f85c12b03d 100644 --- a/packages/stk/stk_doc_tests/stk_topology/CMakeLists.txt +++ b/packages/stk/stk_doc_tests/stk_topology/CMakeLists.txt @@ -2,7 +2,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_BINARY_DIR}/stk_topology) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_BINARY_DIR}/stk_topology) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_doc_tests/stk_transfer/CMakeLists.txt b/packages/stk/stk_doc_tests/stk_transfer/CMakeLists.txt index 55fca275d6cd..aff74b4db328 100644 --- a/packages/stk/stk_doc_tests/stk_transfer/CMakeLists.txt +++ b/packages/stk/stk_doc_tests/stk_transfer/CMakeLists.txt @@ -33,9 +33,9 @@ # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_doc_tests/stk_util/CMakeLists.txt b/packages/stk/stk_doc_tests/stk_util/CMakeLists.txt index e3280f42c4a5..0614a986f8ca 100644 --- a/packages/stk/stk_doc_tests/stk_util/CMakeLists.txt +++ b/packages/stk/stk_doc_tests/stk_util/CMakeLists.txt @@ -2,7 +2,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_BINARY_DIR}/stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_BINARY_DIR}/stk_util) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_emend/stk_emend/independent_set/CMakeLists.txt b/packages/stk/stk_emend/stk_emend/independent_set/CMakeLists.txt index b94422e96669..4fcff5105fd6 100644 --- a/packages/stk/stk_emend/stk_emend/independent_set/CMakeLists.txt +++ b/packages/stk/stk_emend/stk_emend/independent_set/CMakeLists.txt @@ -48,7 +48,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_emend/stk_emend/independent_set/unit_tests/CMakeLists.txt b/packages/stk/stk_emend/stk_emend/independent_set/unit_tests/CMakeLists.txt index 3d5df672be44..d0fa2597e0d1 100644 --- a/packages/stk/stk_emend/stk_emend/independent_set/unit_tests/CMakeLists.txt +++ b/packages/stk/stk_emend/stk_emend/independent_set/unit_tests/CMakeLists.txt @@ -1,9 +1,9 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../../stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../../stk_util) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt index 12c44b29517b..2b7cc86d8211 100644 --- a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt +++ b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt @@ -52,14 +52,14 @@ SET(SOURCES "") SET(HEADERS_IMPL "") SET(SOURCES_IMPL "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) # # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_expreval/unit_tests/CMakeLists.txt b/packages/stk/stk_expreval/unit_tests/CMakeLists.txt index 12a995be6a6e..e1db842d7b18 100644 --- a/packages/stk/stk_expreval/unit_tests/CMakeLists.txt +++ b/packages/stk/stk_expreval/unit_tests/CMakeLists.txt @@ -1,10 +1,10 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_util) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_integration_tests/stk_balance/CMakeLists.txt b/packages/stk/stk_integration_tests/stk_balance/CMakeLists.txt index fc7444300ea4..a793628127d2 100644 --- a/packages/stk/stk_integration_tests/stk_balance/CMakeLists.txt +++ b/packages/stk/stk_integration_tests/stk_balance/CMakeLists.txt @@ -1,9 +1,9 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_integration_tests/stk_mesh/CMakeLists.txt b/packages/stk/stk_integration_tests/stk_mesh/CMakeLists.txt index f4887717036c..536bc6d49e54 100644 --- a/packages/stk/stk_integration_tests/stk_mesh/CMakeLists.txt +++ b/packages/stk/stk_integration_tests/stk_mesh/CMakeLists.txt @@ -1,12 +1,12 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_util) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_mesh) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../teuchos/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_mesh) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../teuchos/src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_integration_tests/stk_search/CMakeLists.txt b/packages/stk/stk_integration_tests/stk_search/CMakeLists.txt index b3af37f6afe0..9a488692ee5b 100644 --- a/packages/stk/stk_integration_tests/stk_search/CMakeLists.txt +++ b/packages/stk/stk_integration_tests/stk_search/CMakeLists.txt @@ -32,7 +32,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -#INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) +#TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) FILE(GLOB SOURCES *.cpp) #removing due to dependence on geometry toolkit which is not available to Trilinos diff --git a/packages/stk/stk_integration_tests/stk_transfer/CMakeLists.txt b/packages/stk/stk_integration_tests/stk_transfer/CMakeLists.txt index e31243311a65..95fc60686ccb 100644 --- a/packages/stk/stk_integration_tests/stk_transfer/CMakeLists.txt +++ b/packages/stk/stk_integration_tests/stk_transfer/CMakeLists.txt @@ -1,12 +1,12 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_util) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_mesh) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_transfer) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_mesh) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_transfer) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_io/stk_io/CMakeLists.txt b/packages/stk/stk_io/stk_io/CMakeLists.txt index 2b492b928c73..f98866ae57b8 100644 --- a/packages/stk/stk_io/stk_io/CMakeLists.txt +++ b/packages/stk/stk_io/stk_io/CMakeLists.txt @@ -54,15 +54,15 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../util/) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../stk_util) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../seacas/ioss/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../util/) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../stk_util) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../seacas/ioss/src) FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_io/stk_io/util/CMakeLists.txt b/packages/stk/stk_io/stk_io/util/CMakeLists.txt index 40a03cc6d45d..a352ec19f1b4 100644 --- a/packages/stk/stk_io/stk_io/util/CMakeLists.txt +++ b/packages/stk/stk_io/stk_io/util/CMakeLists.txt @@ -53,10 +53,10 @@ SET(SOURCES "") FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES *.cpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../../seacas/libraries/ioss/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../../seacas/libraries/ioss/src) # # Core headers diff --git a/packages/stk/stk_math/stk_math/CMakeLists.txt b/packages/stk/stk_math/stk_math/CMakeLists.txt index ce7f57eee26f..84c0e27035db 100644 --- a/packages/stk/stk_math/stk_math/CMakeLists.txt +++ b/packages/stk/stk_math/stk_math/CMakeLists.txt @@ -47,7 +47,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) # # Core headers diff --git a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt index 1f48ebe0b917..682aedd71605 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt +++ b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt @@ -51,7 +51,7 @@ SET(SOURCES "") SET(HEADERS_IMPL "") SET(SOURCES_IMPL "") -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) # # Core headers # diff --git a/packages/stk/stk_ngp_test/stk_ngp_test/CMakeLists.txt b/packages/stk/stk_ngp_test/stk_ngp_test/CMakeLists.txt index d236e2a5d7d3..235b3cc27917 100644 --- a/packages/stk/stk_ngp_test/stk_ngp_test/CMakeLists.txt +++ b/packages/stk/stk_ngp_test/stk_ngp_test/CMakeLists.txt @@ -33,10 +33,10 @@ # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_ngp_test/stk_ngp_test) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_ngp_test/stk_ngp_test) FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES ngp_test.cpp) diff --git a/packages/stk/stk_performance_tests/stk_mesh/CMakeLists.txt b/packages/stk/stk_performance_tests/stk_mesh/CMakeLists.txt index 833ade76f383..a4bf82115e51 100644 --- a/packages/stk/stk_performance_tests/stk_mesh/CMakeLists.txt +++ b/packages/stk/stk_performance_tests/stk_mesh/CMakeLists.txt @@ -32,14 +32,14 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_util) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_mesh) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../teuchos/src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_mesh) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../teuchos/src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) diff --git a/packages/stk/stk_search/stk_search/CMakeLists.txt b/packages/stk/stk_search/stk_search/CMakeLists.txt index f7dc7aa26dcd..1396b2a47d41 100644 --- a/packages/stk/stk_search/stk_search/CMakeLists.txt +++ b/packages/stk/stk_search/stk_search/CMakeLists.txt @@ -47,7 +47,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) # # Core headers diff --git a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt index 08df298556c8..b408e67d7533 100644 --- a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt +++ b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt @@ -51,7 +51,7 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) diff --git a/packages/stk/stk_search_util/unit_tests/CMakeLists.txt b/packages/stk/stk_search_util/unit_tests/CMakeLists.txt index 54a7a6223f5c..ff059518edb7 100644 --- a/packages/stk/stk_search_util/unit_tests/CMakeLists.txt +++ b/packages/stk/stk_search_util/unit_tests/CMakeLists.txt @@ -1,9 +1,9 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_util) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_simd/stk_math/CMakeLists.txt b/packages/stk/stk_simd/stk_math/CMakeLists.txt index d4b4f4335bf9..934e9872b89c 100644 --- a/packages/stk/stk_simd/stk_math/CMakeLists.txt +++ b/packages/stk/stk_simd/stk_math/CMakeLists.txt @@ -54,9 +54,9 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) diff --git a/packages/stk/stk_simd/stk_simd/CMakeLists.txt b/packages/stk/stk_simd/stk_simd/CMakeLists.txt index 0b25468d9199..4ab6a0c401ee 100644 --- a/packages/stk/stk_simd/stk_simd/CMakeLists.txt +++ b/packages/stk/stk_simd/stk_simd/CMakeLists.txt @@ -56,9 +56,9 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) FILE(GLOB KOKKOS_SIMD_HEADERS kokkos_simd/*.hpp) diff --git a/packages/stk/stk_simd/stk_simd/kokkos_simd/CMakeLists.txt b/packages/stk/stk_simd/stk_simd/kokkos_simd/CMakeLists.txt index 9d261ee0ca42..b356dd891bc3 100644 --- a/packages/stk/stk_simd/stk_simd/kokkos_simd/CMakeLists.txt +++ b/packages/stk/stk_simd/stk_simd/kokkos_simd/CMakeLists.txt @@ -43,9 +43,9 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) diff --git a/packages/stk/stk_simd/stk_simd_view/CMakeLists.txt b/packages/stk/stk_simd/stk_simd_view/CMakeLists.txt index e4b65ec063b8..772942dbfabb 100644 --- a/packages/stk/stk_simd/stk_simd_view/CMakeLists.txt +++ b/packages/stk/stk_simd/stk_simd_view/CMakeLists.txt @@ -54,9 +54,9 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) diff --git a/packages/stk/stk_tools/stk_tools/CMakeLists.txt b/packages/stk/stk_tools/stk_tools/CMakeLists.txt index d551a5bed9a3..c800efad80ad 100644 --- a/packages/stk/stk_tools/stk_tools/CMakeLists.txt +++ b/packages/stk/stk_tools/stk_tools/CMakeLists.txt @@ -59,7 +59,7 @@ FILE(GLOB TRANSFER_UTILS_HEADERS transfer_utils/*.hpp) FILE(GLOB TRANSFER_UTILS_SOURCES transfer_utils/*.cpp) LIST(REMOVE_ITEM BLOCK_EXTRACTOR_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/block_extractor/main.cpp) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) # # C) Define the targets for package's library(s) diff --git a/packages/stk/stk_topology/stk_topology/CMakeLists.txt b/packages/stk/stk_topology/stk_topology/CMakeLists.txt index ef6a8d910eda..37a5eb9561f7 100644 --- a/packages/stk/stk_topology/stk_topology/CMakeLists.txt +++ b/packages/stk/stk_topology/stk_topology/CMakeLists.txt @@ -53,7 +53,7 @@ FILE(GLOB HEADERS *.hpp *.tcc) FILE(GLOB SOURCES *.cpp) FILE(GLOB SOURCES_DETAIL topology_detail/*.cpp) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) # # Core headers diff --git a/packages/stk/stk_transfer/CMakeLists.txt b/packages/stk/stk_transfer/CMakeLists.txt index 08e5803bbb63..a2cea50071d1 100644 --- a/packages/stk/stk_transfer/CMakeLists.txt +++ b/packages/stk/stk_transfer/CMakeLists.txt @@ -34,7 +34,7 @@ TRIBITS_SUBPACKAGE(Transfer) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ADD_SUBDIRECTORY(stk_transfer) diff --git a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/CMakeLists.txt b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/CMakeLists.txt index 8ec84b6e51a5..5ce0b03894aa 100644 --- a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/CMakeLists.txt +++ b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/CMakeLists.txt @@ -1,9 +1,9 @@ -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_ngp_test) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_util) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_ngp_test) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util) SET(HEADERS_NEED_IO ElemGraphMultipleSharedSidesUtils.hpp diff --git a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/stk_mesh_fixtures/CMakeLists.txt b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/stk_mesh_fixtures/CMakeLists.txt index a4f878d244ba..9bade1089e39 100644 --- a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/stk_mesh_fixtures/CMakeLists.txt +++ b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/stk_mesh_fixtures/CMakeLists.txt @@ -52,8 +52,8 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${PARENT_PACKAGE}_SOURCE_DIR/stk_mesh) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../..) +TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE}_SOURCE_DIR/stk_mesh) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../..) FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_unit_tests/stk_balance/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_balance/CMakeLists.txt index d1894e7fb7e5..1e1c1d3e8ddd 100644 --- a/packages/stk/stk_unit_tests/stk_balance/CMakeLists.txt +++ b/packages/stk/stk_unit_tests/stk_balance/CMakeLists.txt @@ -32,8 +32,8 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_unit_tests/stk_coupling/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_coupling/CMakeLists.txt index 03ab34a5232d..5101bd1a7934 100644 --- a/packages/stk/stk_unit_tests/stk_coupling/CMakeLists.txt +++ b/packages/stk/stk_unit_tests/stk_coupling/CMakeLists.txt @@ -32,7 +32,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB SOURCES *.cpp diff --git a/packages/stk/stk_unit_tests/stk_io/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_io/CMakeLists.txt index 8c4ff1e46bb6..45ba3ca82c1c 100644 --- a/packages/stk/stk_unit_tests/stk_io/CMakeLists.txt +++ b/packages/stk/stk_unit_tests/stk_io/CMakeLists.txt @@ -33,9 +33,9 @@ # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) FILE(GLOB SOURCES *.cpp) LIST(REMOVE_ITEM SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/UnitTestMeshData.cpp) diff --git a/packages/stk/stk_unit_tests/stk_math/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_math/CMakeLists.txt index 5e95bb8aacb2..0092fc04516d 100644 --- a/packages/stk/stk_unit_tests/stk_math/CMakeLists.txt +++ b/packages/stk/stk_unit_tests/stk_math/CMakeLists.txt @@ -32,10 +32,10 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_math) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_math) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_unit_tests/stk_mesh/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_mesh/CMakeLists.txt index a47d0f0c62c5..3d482570e523 100644 --- a/packages/stk/stk_unit_tests/stk_mesh/CMakeLists.txt +++ b/packages/stk/stk_unit_tests/stk_mesh/CMakeLists.txt @@ -32,7 +32,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB SOURCES *.cpp diff --git a/packages/stk/stk_unit_tests/stk_ngp_test/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_ngp_test/CMakeLists.txt index 677c67570597..1ee95dd2b8d7 100644 --- a/packages/stk/stk_unit_tests/stk_ngp_test/CMakeLists.txt +++ b/packages/stk/stk_unit_tests/stk_ngp_test/CMakeLists.txt @@ -32,8 +32,8 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_unit_tests/stk_search/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_search/CMakeLists.txt index dfe105df91f4..a58e34d0179c 100644 --- a/packages/stk/stk_unit_tests/stk_search/CMakeLists.txt +++ b/packages/stk/stk_unit_tests/stk_search/CMakeLists.txt @@ -32,7 +32,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_unit_tests/stk_simd/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_simd/CMakeLists.txt index 7ab8104ca941..ef68c2245c53 100644 --- a/packages/stk/stk_unit_tests/stk_simd/CMakeLists.txt +++ b/packages/stk/stk_unit_tests/stk_simd/CMakeLists.txt @@ -2,10 +2,10 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_simd) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/stk_simd) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_BINARY_DIR}/stk_simd) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_simd) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/stk_simd) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_BINARY_DIR}/stk_simd) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_unit_tests/stk_simd_old/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_simd_old/CMakeLists.txt index 2c10ab91015a..c79e55b69831 100644 --- a/packages/stk/stk_unit_tests/stk_simd_old/CMakeLists.txt +++ b/packages/stk/stk_unit_tests/stk_simd_old/CMakeLists.txt @@ -2,10 +2,10 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_simd) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/stk_simd) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_BINARY_DIR}/stk_simd) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_simd) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/stk_simd) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_BINARY_DIR}/stk_simd) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_unit_tests/stk_tools/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_tools/CMakeLists.txt index 080d8cc8c0fe..e7b3e6f0e384 100644 --- a/packages/stk/stk_unit_tests/stk_tools/CMakeLists.txt +++ b/packages/stk/stk_unit_tests/stk_tools/CMakeLists.txt @@ -32,8 +32,8 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_tools) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_tools) FILE(GLOB SOURCES mesh_clone/*.cpp mesh_tools/*.cpp block_extractor/*.cpp) LIST(REMOVE_ITEM SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/block_extractor/UnitTestExtractBlocks.cpp) diff --git a/packages/stk/stk_unit_tests/stk_topology/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_topology/CMakeLists.txt index 2719b83fdcff..f804abe8bb6e 100644 --- a/packages/stk/stk_unit_tests/stk_topology/CMakeLists.txt +++ b/packages/stk/stk_unit_tests/stk_topology/CMakeLists.txt @@ -1,7 +1,7 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_unit_tests/stk_transfer/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_transfer/CMakeLists.txt index cb21f555ae97..977ec0ff01e2 100644 --- a/packages/stk/stk_unit_tests/stk_transfer/CMakeLists.txt +++ b/packages/stk/stk_unit_tests/stk_transfer/CMakeLists.txt @@ -32,10 +32,10 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_transfer) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/stk_transfer) FILE(GLOB SOURCES *.cpp) diff --git a/packages/stk/stk_unit_tests/stk_util/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_util/CMakeLists.txt index b2c6b30f71c5..8f98e3efe8ed 100644 --- a/packages/stk/stk_unit_tests/stk_util/CMakeLists.txt +++ b/packages/stk/stk_unit_tests/stk_util/CMakeLists.txt @@ -57,7 +57,7 @@ LIST(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/parallel/UnitTestImprobeAl LIST(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/parallel/UnitTestImprobeSelf.cpp") ENDIF() -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_BINARY_DIR}/stk_util) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_BINARY_DIR}/stk_util) TRIBITS_ADD_EXECUTABLE_AND_TEST( stk_util_unit_tests diff --git a/packages/stk/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_util/stk_util/CMakeLists.txt index d33e47671736..32f6c4121907 100644 --- a/packages/stk/stk_util/stk_util/CMakeLists.txt +++ b/packages/stk/stk_util/stk_util/CMakeLists.txt @@ -7,7 +7,7 @@ ADD_SUBDIRECTORY(diag) ADD_SUBDIRECTORY(command_line) ADD_SUBDIRECTORY(ngp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) INSTALL(FILES stk_config.h stk_kokkos_macros.h DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) diff --git a/packages/stk/stk_util/stk_util/command_line/CMakeLists.txt b/packages/stk/stk_util/stk_util/command_line/CMakeLists.txt index 3a74f9b31866..f8eb6ce542fc 100644 --- a/packages/stk/stk_util/stk_util/command_line/CMakeLists.txt +++ b/packages/stk/stk_util/stk_util/command_line/CMakeLists.txt @@ -51,7 +51,7 @@ SET(SOURCES "") FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES *.cpp) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) # # C) Define the targets for package's library(s) diff --git a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt index 343a9ae8a7fc..247c6f997ae8 100644 --- a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt +++ b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt @@ -51,7 +51,7 @@ SET(SOURCES "") # Core headers # -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp *.h) #removing references to mpih which is not available in Trilinos diff --git a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt index f365a111c6de..faacac0b7e37 100644 --- a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt +++ b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt @@ -55,7 +55,7 @@ SET(SOURCES "") FILE(GLOB HEADERS *.hpp *.h) FILE(GLOB SOURCES *.cpp) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) # # C) Define the targets for package's library(s) diff --git a/packages/stk/stk_util/stk_util/ngp/CMakeLists.txt b/packages/stk/stk_util/stk_util/ngp/CMakeLists.txt index d04ea2593095..7ef4509f30b0 100644 --- a/packages/stk/stk_util/stk_util/ngp/CMakeLists.txt +++ b/packages/stk/stk_util/stk_util/ngp/CMakeLists.txt @@ -50,7 +50,7 @@ SET(SOURCES "") FILE(GLOB HEADERS *.hpp *.h) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/ngp/) diff --git a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt index 9e9d19778917..e35319bb3637 100644 --- a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt +++ b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt @@ -48,7 +48,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) IF (TPL_ENABLE_MPI) diff --git a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt index f91fccfefefc..4c34bcb48eb9 100644 --- a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt +++ b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt @@ -47,7 +47,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) # # Core headers diff --git a/packages/stk/stk_util/stk_util/util/CMakeLists.txt b/packages/stk/stk_util/stk_util/util/CMakeLists.txt index 2b4bf5769a9b..b3f14ce07e63 100644 --- a/packages/stk/stk_util/stk_util/util/CMakeLists.txt +++ b/packages/stk/stk_util/stk_util/util/CMakeLists.txt @@ -51,7 +51,7 @@ SET(SOURCES "") FILE(GLOB HEADERS *.hpp *.h) FILE(GLOB SOURCES *.cpp) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) # # C) Define the targets for package's library(s) From c42de671f4b41ecd4b583303ee4433ca0e1db224 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:45:54 -0700 Subject: [PATCH 42/78] Stokhos: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/stokhos/src/CMakeLists.txt | 70 +++++++++---------- .../test/Performance/CuspAMG/CMakeLists.txt | 4 +- .../test/Performance/CuspSpMM/CMakeLists.txt | 4 +- .../Performance/FadMPAssembly/CMakeLists.txt | 4 +- .../KokkosArraySPMVKernels/CMakeLists.txt | 4 +- .../Performance/KokkosSpMM/CMakeLists.txt | 4 +- .../Performance/MPAssembly/CMakeLists.txt | 4 +- .../MPVectorKernels/CMakeLists.txt | 4 +- .../PCEMeanMultiply/CMakeLists.txt | 4 +- 9 files changed, 51 insertions(+), 51 deletions(-) diff --git a/packages/stokhos/src/CMakeLists.txt b/packages/stokhos/src/CMakeLists.txt index 468227e40696..a073e5b5aa1e 100644 --- a/packages/stokhos/src/CMakeLists.txt +++ b/packages/stokhos/src/CMakeLists.txt @@ -207,11 +207,11 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # Add path to Dakota headers in installed directory IF (${PACKAGE_NAME}_ENABLE_TriKota) -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/../../TriKota/Dakota/install/include ) ENDIF() @@ -221,7 +221,7 @@ SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS ${HEADERS} Stokhos.hpp @@ -374,7 +374,7 @@ SET(SOURCES ${SOURCES} # Epetra IF (Stokhos_ENABLE_EpetraExt) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra) SET(HEADERS ${HEADERS} epetra/Stokhos_Sparse3TensorUtilities.hpp epetra/Stokhos_EpetraSparse3Tensor.hpp @@ -488,8 +488,8 @@ IF (Stokhos_ENABLE_EpetraExt) ) ENDIF() -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/kokkos) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/kokkos/kl) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/kokkos) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/kokkos/kl) SET(HEADERS ${HEADERS} kokkos/Stokhos_Multiply.hpp kokkos/Stokhos_CrsMatrix.hpp @@ -509,26 +509,26 @@ SET(HEADERS ${HEADERS} kokkos/Stokhos_MatrixMarket.hpp ) IF(Kokkos_ENABLE_SERIAL) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/kokkos/Serial) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/kokkos/Serial) SET(HEADERS ${HEADERS} kokkos/Serial/Stokhos_Serial_CrsProductTensor.hpp ) ENDIF() IF(Kokkos_ENABLE_THREADS) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/kokkos/Threads) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/kokkos/Threads) SET(HEADERS ${HEADERS} kokkos/Threads/Stokhos_Threads_CrsProductTensor.hpp ) ENDIF() IF(Kokkos_ENABLE_OPENMP) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/kokkos/OpenMP) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/kokkos/OpenMP) SET(HEADERS ${HEADERS} kokkos/OpenMP/Stokhos_OpenMP_CrsProductTensor.hpp kokkos/OpenMP/Stokhos_OpenMP_MKL_CrsMatrix.hpp ) ENDIF() IF(Stokhos_ENABLE_CUDA AND Kokkos_ENABLE_CUDA) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/kokkos/Cuda) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/kokkos/Cuda) SET(HEADERS ${HEADERS} kokkos/Cuda/Stokhos_Cuda_DeviceProp.hpp kokkos/Cuda/Stokhos_Cuda_WarpShuffle.hpp @@ -550,7 +550,7 @@ ENDIF() # NOX IF (Stokhos_ENABLE_NOX AND NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_EpetraExt) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nox) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nox) SET(HEADERS ${HEADERS} epetra/Stokhos_GaussSeidelPreconditioner.hpp nox/NOX_Epetra_LinearSystem_SGJacobi.hpp @@ -567,7 +567,7 @@ ENDIF() # Include cusp IF (Stokhos_ENABLE_Cusp) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/cusp) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/cusp) SET(HEADERS ${HEADERS} cusp/krylov/blockcg.h cusp/block_monitor.h @@ -600,7 +600,7 @@ TRIBITS_ADD_LIBRARY( # Sacado IF (Stokhos_ENABLE_Sacado) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado) SET(SACADO_HEADERS "") SET(SACADO_SOURCES "") SET(STOKHOS_DEPLIBS stokhos) @@ -623,7 +623,7 @@ IF (Stokhos_ENABLE_Sacado) sacado/Sacado_ETPCE_OrthogPoly.cpp ) ENDIF() - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos) LIST(APPEND SACADO_HEADERS sacado/kokkos/Stokhos_Sacado_Kokkos.hpp sacado/kokkos/Stokhos_Sacado_Kokkos_MathFunctions.hpp @@ -649,7 +649,7 @@ IF (Stokhos_ENABLE_Sacado) sacado/kokkos/Stokhos_MemoryTraits.cpp ) IF(Stokhos_ENABLE_Ensemble_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector) LIST(APPEND SACADO_HEADERS sacado/kokkos/vector/Stokhos_Sacado_Kokkos_MP_Vector.hpp sacado/kokkos/vector/Stokhos_MP_Vector_MaskTraits.hpp @@ -689,7 +689,7 @@ IF (Stokhos_ENABLE_Sacado) sacado/kokkos/vector/Kokkos_View_MP_Vector.cpp ) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/Fad) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/Fad) LIST(APPEND SACADO_HEADERS sacado/kokkos/vector/Fad/Sacado_Fad_ExprSpec_MP_Vector.hpp sacado/kokkos/vector/Fad/Sacado_Fad_Expr_MP_Vector.hpp @@ -704,7 +704,7 @@ IF (Stokhos_ENABLE_Sacado) ) ENDIF() IF(Stokhos_ENABLE_PCE_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce) LIST(APPEND SACADO_HEADERS sacado/kokkos/pce/Stokhos_Sacado_Kokkos_UQ_PCE.hpp sacado/kokkos/pce/Sacado_UQ_PCE.hpp @@ -724,7 +724,7 @@ IF (Stokhos_ENABLE_Sacado) IF (Stokhos_ENABLE_KokkosKernels) IF(Stokhos_ENABLE_Ensemble_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/linalg) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/linalg) LIST(APPEND SACADO_HEADERS sacado/kokkos/vector/linalg/Kokkos_MV_MP_Vector.hpp sacado/kokkos/vector/linalg/Kokkos_Blas1_MP_Vector.hpp @@ -735,7 +735,7 @@ IF (Stokhos_ENABLE_Sacado) ) ENDIF() IF(Stokhos_ENABLE_PCE_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/linalg) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/linalg) LIST(APPEND SACADO_HEADERS sacado/kokkos/pce/linalg/Kokkos_MV_UQ_PCE.hpp sacado/kokkos/pce/linalg/Kokkos_Blas1_UQ_PCE.hpp @@ -749,13 +749,13 @@ IF (Stokhos_ENABLE_Sacado) IF (Stokhos_ENABLE_TeuchosKokkosComm) IF(Stokhos_ENABLE_Ensemble_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/mpicomm) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/mpicomm) LIST(APPEND SACADO_HEADERS sacado/kokkos/vector/mpicomm/Kokkos_TeuchosCommAdapters_MP_Vector.hpp ) ENDIF() IF(Stokhos_ENABLE_PCE_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/mpicomm) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/mpicomm) LIST(APPEND SACADO_HEADERS sacado/kokkos/pce/mpicomm/Kokkos_TeuchosCommAdapters_UQ_PCE.hpp ) @@ -764,13 +764,13 @@ IF (Stokhos_ENABLE_Sacado) IF (Stokhos_ENABLE_KokkosAlgorithms) IF(Stokhos_ENABLE_Ensemble_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/algorithms) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/algorithms) LIST(APPEND SACADO_HEADERS sacado/kokkos/vector/algorithms/Kokkos_Random_MP_Vector.hpp ) ENDIF() IF(Stokhos_ENABLE_PCE_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/algorithms) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/algorithms) LIST(APPEND SACADO_HEADERS sacado/kokkos/pce/algorithms/Kokkos_Random_UQ_PCE.hpp ) @@ -817,7 +817,7 @@ IF (Stokhos_ENABLE_Sacado) LocalCrsMatrixOperator ) IF(Stokhos_ENABLE_Ensemble_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/tpetra) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/tpetra) APPEND_GLOB(TPETRA_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/tpetra/*.hpp) IF(TpetraCore_ENABLE_EXPLICIT_INSTANTIATION) IF (NOT ("${TPETRA_SD_ETI_CLASSES}" STREQUAL "")) @@ -857,7 +857,7 @@ IF (Stokhos_ENABLE_Sacado) ENDIF() ENDIF() IF(Stokhos_ENABLE_PCE_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/tpetra) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/tpetra) APPEND_GLOB(TPETRA_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/tpetra/*.hpp) IF(TpetraCore_ENABLE_EXPLICIT_INSTANTIATION) # We have manually written cpp files for CrsMatrix @@ -906,7 +906,7 @@ IF (Stokhos_ENABLE_Sacado) # adapters if either is enabled. IF (Stokhos_ENABLE_Belos OR Stokhos_ENABLE_Ifpack2) IF(Stokhos_ENABLE_Ensemble_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/belos) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/belos) LIST(APPEND TPETRA_HEADERS sacado/kokkos/vector/belos/Belos_Tpetra_MP_Vector.hpp sacado/kokkos/vector/belos/Belos_TpetraAdapter_MP_Vector.hpp @@ -921,7 +921,7 @@ IF (Stokhos_ENABLE_Sacado) ) ENDIF() IF(Stokhos_ENABLE_PCE_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/belos) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/belos) LIST(APPEND TPETRA_HEADERS sacado/kokkos/pce/belos/Belos_TpetraAdapter_UQ_PCE.hpp ) @@ -954,7 +954,7 @@ IF (Stokhos_ENABLE_Sacado) ENDIF() IF(Stokhos_ENABLE_Ensemble_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/xpetra) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/xpetra) APPEND_GLOB(XPETRA_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/xpetra/*.hpp) IF (Xpetra_ENABLE_EXPLICIT_INSTANTIATION) PROCESS_ENSEMBLE_ETI( @@ -969,7 +969,7 @@ IF (Stokhos_ENABLE_Sacado) ENDIF() ENDIF() IF(Stokhos_ENABLE_PCE_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/xpetra) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/xpetra) APPEND_GLOB(XPETRA_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/xpetra/*.hpp) IF(Xpetra_ENABLE_EXPLICIT_INSTANTIATION) PROCESS_PCE_ETI( @@ -1006,7 +1006,7 @@ IF (Stokhos_ENABLE_Sacado) ENDIF() SET(STOKHOS_AMESOS2_DEPLIBS "") IF(Stokhos_ENABLE_Ensemble_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/amesos2) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/amesos2) APPEND_GLOB(AMESOS2_HEADERS sacado/kokkos/vector/amesos2/*.hpp ) @@ -1026,7 +1026,7 @@ IF (Stokhos_ENABLE_Sacado) ENDIF() ENDIF() IF(Stokhos_ENABLE_PCE_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/amesos2) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/amesos2) APPEND_GLOB(AMESOS2_HEADERS sacado/kokkos/pce/amesos2/*.hpp ) @@ -1051,7 +1051,7 @@ IF (Stokhos_ENABLE_Sacado) SET(IFPACK2_CPP_SOURCES Stokhos_Dummy.cpp) SET(STOKHOS_IFPACK2_DEPLIBS "") IF(Stokhos_ENABLE_Ensemble_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/ifpack2) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/ifpack2) APPEND_GLOB(IFPACK2_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/ifpack2/*.hpp) IF(Ifpack2_ENABLE_EXPLICIT_INSTANTIATION) APPEND_GLOB(IFPACK2_CPP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/ifpack2/*.cpp) @@ -1067,7 +1067,7 @@ IF (Stokhos_ENABLE_Sacado) ENDIF() ENDIF() IF(Stokhos_ENABLE_PCE_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/ifpack2) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/ifpack2) APPEND_GLOB(IFPACK2_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/ifpack2/*.hpp) IF(Ifpack2_ENABLE_EXPLICIT_INSTANTIATION) APPEND_GLOB(IFPACK2_CPP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/ifpack2/*.cpp) @@ -1113,7 +1113,7 @@ IF (Stokhos_ENABLE_Sacado) ENDIF() IF(Stokhos_ENABLE_Ensemble_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/muelu) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/muelu) APPEND_GLOB(MUELU_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/muelu/*.hpp) IF (MueLu_ENABLE_EXPLICIT_INSTANTIATION) PROCESS_ENSEMBLE_ETI( @@ -1128,7 +1128,7 @@ IF (Stokhos_ENABLE_Sacado) ENDIF() ENDIF() IF(Stokhos_ENABLE_PCE_Scalar_Type) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/muelu) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/muelu) APPEND_GLOB(MUELU_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/pce/muelu/*.hpp) IF(MueLu_ENABLE_EXPLICIT_INSTANTIATION) PROCESS_PCE_ETI( diff --git a/packages/stokhos/test/Performance/CuspAMG/CMakeLists.txt b/packages/stokhos/test/Performance/CuspAMG/CMakeLists.txt index ce053e45c19d..a118796c6c25 100644 --- a/packages/stokhos/test/Performance/CuspAMG/CMakeLists.txt +++ b/packages/stokhos/test/Performance/CuspAMG/CMakeLists.txt @@ -1,8 +1,8 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) IF (Stokhos_ENABLE_Cusp) diff --git a/packages/stokhos/test/Performance/CuspSpMM/CMakeLists.txt b/packages/stokhos/test/Performance/CuspSpMM/CMakeLists.txt index f3a9d64e5eb9..8d1cf67d2be7 100644 --- a/packages/stokhos/test/Performance/CuspSpMM/CMakeLists.txt +++ b/packages/stokhos/test/Performance/CuspSpMM/CMakeLists.txt @@ -1,8 +1,8 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) IF (Stokhos_ENABLE_Cusp) diff --git a/packages/stokhos/test/Performance/FadMPAssembly/CMakeLists.txt b/packages/stokhos/test/Performance/FadMPAssembly/CMakeLists.txt index 03df7caea2fa..5937f3119637 100644 --- a/packages/stokhos/test/Performance/FadMPAssembly/CMakeLists.txt +++ b/packages/stokhos/test/Performance/FadMPAssembly/CMakeLists.txt @@ -1,7 +1,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) TRIBITS_ADD_EXECUTABLE( FadMPVectorAssemblyTest diff --git a/packages/stokhos/test/Performance/KokkosArraySPMVKernels/CMakeLists.txt b/packages/stokhos/test/Performance/KokkosArraySPMVKernels/CMakeLists.txt index 44735e6c13f7..9192f807700c 100644 --- a/packages/stokhos/test/Performance/KokkosArraySPMVKernels/CMakeLists.txt +++ b/packages/stokhos/test/Performance/KokkosArraySPMVKernels/CMakeLists.txt @@ -1,7 +1,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) IF (Stokhos_ENABLE_EpetraExt AND Stokhos_ENABLE_KokkosContainers) diff --git a/packages/stokhos/test/Performance/KokkosSpMM/CMakeLists.txt b/packages/stokhos/test/Performance/KokkosSpMM/CMakeLists.txt index bb1df3bcb325..c8123d9a32d7 100644 --- a/packages/stokhos/test/Performance/KokkosSpMM/CMakeLists.txt +++ b/packages/stokhos/test/Performance/KokkosSpMM/CMakeLists.txt @@ -1,8 +1,8 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(CUDA_SOURCES "") IF (Stokhos_ENABLE_CUDA AND HAVE_TPETRA_CUDA) diff --git a/packages/stokhos/test/Performance/MPAssembly/CMakeLists.txt b/packages/stokhos/test/Performance/MPAssembly/CMakeLists.txt index 0e0637cb3a06..03dcdc0984e8 100644 --- a/packages/stokhos/test/Performance/MPAssembly/CMakeLists.txt +++ b/packages/stokhos/test/Performance/MPAssembly/CMakeLists.txt @@ -1,7 +1,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) TRIBITS_ADD_EXECUTABLE( MPVectorAssemblyTest diff --git a/packages/stokhos/test/Performance/MPVectorKernels/CMakeLists.txt b/packages/stokhos/test/Performance/MPVectorKernels/CMakeLists.txt index 3a425829a62b..f03bbff3691d 100644 --- a/packages/stokhos/test/Performance/MPVectorKernels/CMakeLists.txt +++ b/packages/stokhos/test/Performance/MPVectorKernels/CMakeLists.txt @@ -1,7 +1,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(CUDA_SOURCES "") IF (Stokhos_ENABLE_CUDA AND HAVE_TPETRA_CUDA) diff --git a/packages/stokhos/test/Performance/PCEMeanMultiply/CMakeLists.txt b/packages/stokhos/test/Performance/PCEMeanMultiply/CMakeLists.txt index 2b82cf5f4ae2..2d315ac5c2d3 100644 --- a/packages/stokhos/test/Performance/PCEMeanMultiply/CMakeLists.txt +++ b/packages/stokhos/test/Performance/PCEMeanMultiply/CMakeLists.txt @@ -1,8 +1,8 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(CUDA_SOURCES "") IF (Stokhos_ENABLE_CUDA AND HAVE_TPETRA_CUDA) From afda592c6cc7bec7b1e57994093c75515c694c7a Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:46:26 -0700 Subject: [PATCH 43/78] Stratimikos: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/stratimikos/adapters/amesos/src/CMakeLists.txt | 2 +- packages/stratimikos/adapters/amesos2/src/CMakeLists.txt | 2 +- packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt | 2 +- packages/stratimikos/adapters/belos/src/CMakeLists.txt | 2 +- packages/stratimikos/adapters/ifpack/src/CMakeLists.txt | 2 +- packages/stratimikos/adapters/ml/src/CMakeLists.txt | 2 +- packages/stratimikos/doc/parameterList/CMakeLists.txt | 2 +- packages/stratimikos/src/CMakeLists.txt | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/stratimikos/adapters/amesos/src/CMakeLists.txt b/packages/stratimikos/adapters/amesos/src/CMakeLists.txt index 0b2a9cf6c46a..b4f29f242915 100644 --- a/packages/stratimikos/adapters/amesos/src/CMakeLists.txt +++ b/packages/stratimikos/adapters/amesos/src/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS Thyra_AmesosTypes.hpp diff --git a/packages/stratimikos/adapters/amesos2/src/CMakeLists.txt b/packages/stratimikos/adapters/amesos2/src/CMakeLists.txt index f9180346fc6f..0aec51dcd3d2 100644 --- a/packages/stratimikos/adapters/amesos2/src/CMakeLists.txt +++ b/packages/stratimikos/adapters/amesos2/src/CMakeLists.txt @@ -7,7 +7,7 @@ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) TRIBITS_ADD_LIBRARY( stratimikosamesos2 diff --git a/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt b/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt index 0965ba6586dd..f6a835b67703 100644 --- a/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt +++ b/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS AztecOOParameterList.hpp diff --git a/packages/stratimikos/adapters/belos/src/CMakeLists.txt b/packages/stratimikos/adapters/belos/src/CMakeLists.txt index 61c8380e724c..d409d884f7d8 100644 --- a/packages/stratimikos/adapters/belos/src/CMakeLists.txt +++ b/packages/stratimikos/adapters/belos/src/CMakeLists.txt @@ -17,7 +17,7 @@ APPEND_GLOB(HEADERS ${tpetraSrcDir}/*.hpp) APPEND_GLOB(SOURCES ${tpetraSrcDir}/*.cpp) APPEND_GLOB(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/*.hpp) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../../../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../../../src) TRIBITS_ADD_LIBRARY( stratimikosbelos diff --git a/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt b/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt index da2c35d84f9a..cd2712cfd61c 100644 --- a/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt +++ b/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS Thyra_IfpackPreconditionerFactory.hpp diff --git a/packages/stratimikos/adapters/ml/src/CMakeLists.txt b/packages/stratimikos/adapters/ml/src/CMakeLists.txt index a8ad6b63161f..edf6a2ff14ba 100644 --- a/packages/stratimikos/adapters/ml/src/CMakeLists.txt +++ b/packages/stratimikos/adapters/ml/src/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS Thyra_MLPreconditionerFactory.hpp diff --git a/packages/stratimikos/doc/parameterList/CMakeLists.txt b/packages/stratimikos/doc/parameterList/CMakeLists.txt index 3a05da79fedd..dc4c7a497169 100644 --- a/packages/stratimikos/doc/parameterList/CMakeLists.txt +++ b/packages/stratimikos/doc/parameterList/CMakeLists.txt @@ -1,6 +1,6 @@ # -*- cmake -*- -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Create the ValidParameters executable TRIBITS_ADD_EXECUTABLE( diff --git a/packages/stratimikos/src/CMakeLists.txt b/packages/stratimikos/src/CMakeLists.txt index ad7fb4f1af9c..54106fcf3277 100644 --- a/packages/stratimikos/src/CMakeLists.txt +++ b/packages/stratimikos/src/CMakeLists.txt @@ -34,13 +34,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_InternalConfig.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_Config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS Stratimikos_ConfigDefs.hpp From 9fb3557fd8f8f1ad05d3450d7150ec715d4e2371 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:47:00 -0700 Subject: [PATCH 44/78] Teko: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- .../teko/examples/AddMultiplyPrecs/CMakeLists.txt | 2 +- packages/teko/examples/BasicExamples/CMakeLists.txt | 2 +- .../teko/examples/BuildPreconditioner/CMakeLists.txt | 2 +- .../BuildPreconditioner/step1/CMakeLists.txt | 2 +- .../teko/examples/ML-Teko-Coupling/CMakeLists.txt | 2 +- packages/teko/examples/StridedSolve/CMakeLists.txt | 2 +- packages/teko/src/CMakeLists.txt | 12 ++++++------ 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/teko/examples/AddMultiplyPrecs/CMakeLists.txt b/packages/teko/examples/AddMultiplyPrecs/CMakeLists.txt index f529c5c61fbd..707da70e0165 100644 --- a/packages/teko/examples/AddMultiplyPrecs/CMakeLists.txt +++ b/packages/teko/examples/AddMultiplyPrecs/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE( AddMultiply_Example diff --git a/packages/teko/examples/BasicExamples/CMakeLists.txt b/packages/teko/examples/BasicExamples/CMakeLists.txt index 7ae2ad9a5969..39f8b1f5fad7 100644 --- a/packages/teko/examples/BasicExamples/CMakeLists.txt +++ b/packages/teko/examples/BasicExamples/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE( InverseFactoryOperator-Epetra diff --git a/packages/teko/examples/BuildPreconditioner/CMakeLists.txt b/packages/teko/examples/BuildPreconditioner/CMakeLists.txt index 44aa98a037b2..a0cbe45ad5c3 100644 --- a/packages/teko/examples/BuildPreconditioner/CMakeLists.txt +++ b/packages/teko/examples/BuildPreconditioner/CMakeLists.txt @@ -1,7 +1,7 @@ ADD_SUBDIRECTORY(step1) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Ifpack2) ASSERT_DEFINED(Tpetra_INST_DOUBLE) diff --git a/packages/teko/examples/BuildPreconditioner/step1/CMakeLists.txt b/packages/teko/examples/BuildPreconditioner/step1/CMakeLists.txt index c71b22172436..8b4c1d802fbe 100644 --- a/packages/teko/examples/BuildPreconditioner/step1/CMakeLists.txt +++ b/packages/teko/examples/BuildPreconditioner/step1/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE( BuilderPreconditioner_Step1_Example diff --git a/packages/teko/examples/ML-Teko-Coupling/CMakeLists.txt b/packages/teko/examples/ML-Teko-Coupling/CMakeLists.txt index 8641d8e8f282..7c8dbbc9bfd0 100644 --- a/packages/teko/examples/ML-Teko-Coupling/CMakeLists.txt +++ b/packages/teko/examples/ML-Teko-Coupling/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE( ml_ns diff --git a/packages/teko/examples/StridedSolve/CMakeLists.txt b/packages/teko/examples/StridedSolve/CMakeLists.txt index 5760f0ded2af..c2e373adc8aa 100644 --- a/packages/teko/examples/StridedSolve/CMakeLists.txt +++ b/packages/teko/examples/StridedSolve/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE( StridedSolve_Example diff --git a/packages/teko/src/CMakeLists.txt b/packages/teko/src/CMakeLists.txt index 81fc3e69776d..594101e865c6 100644 --- a/packages/teko/src/CMakeLists.txt +++ b/packages/teko/src/CMakeLists.txt @@ -17,7 +17,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_Config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_Config.h @@ -27,12 +27,12 @@ SET(HEADERS ${HEADERS} # Core files # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/NS) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Epetra) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Tpetra) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/NS) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Epetra) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Tpetra) IF (ML_ENABLE_TekoSmoothers) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/mlutils) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/mlutils) ENDIF() APPEND_GLOB(HEADERS From 35c80c10a58f016db4ce80d2731f7d002afa4168 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:48:01 -0700 Subject: [PATCH 45/78] Tempus: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/tempus/examples/00_Basic_Problem/CMakeLists.txt | 2 +- packages/tempus/examples/01_Utilize_Thyra/CMakeLists.txt | 2 +- packages/tempus/examples/02_Use_ModelEvaluator/CMakeLists.txt | 2 +- packages/tempus/src/deprecated/CMakeLists.txt | 2 +- packages/tempus/test/BDF2/CMakeLists.txt | 2 +- packages/tempus/test/BackwardEuler/CMakeLists.txt | 2 +- packages/tempus/test/DIRK/CMakeLists.txt | 2 +- packages/tempus/test/ExplicitRK/CMakeLists.txt | 2 +- packages/tempus/test/ForwardEuler/CMakeLists.txt | 2 +- packages/tempus/test/HHTAlpha/CMakeLists.txt | 2 +- packages/tempus/test/IMEX_RK/CMakeLists.txt | 2 +- packages/tempus/test/IMEX_RK_Partitioned/CMakeLists.txt | 2 +- packages/tempus/test/Leapfrog/CMakeLists.txt | 2 +- packages/tempus/test/Newmark/CMakeLists.txt | 2 +- packages/tempus/test/OperatorSplit/CMakeLists.txt | 2 +- packages/tempus/test/PhysicsState/CMakeLists.txt | 2 +- packages/tempus/test/Subcycling/CMakeLists.txt | 2 +- packages/tempus/test/TestModels/CMakeLists.txt | 2 +- packages/tempus/test/TestUtils/CMakeLists.txt | 2 +- packages/tempus/test/Trapezoidal/CMakeLists.txt | 2 +- packages/tempus/unit_test/CMakeLists.txt | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/tempus/examples/00_Basic_Problem/CMakeLists.txt b/packages/tempus/examples/00_Basic_Problem/CMakeLists.txt index 95d4363591d0..d2fe5cea8f99 100644 --- a/packages/tempus/examples/00_Basic_Problem/CMakeLists.txt +++ b/packages/tempus/examples/00_Basic_Problem/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( 00_Basic_Problem diff --git a/packages/tempus/examples/01_Utilize_Thyra/CMakeLists.txt b/packages/tempus/examples/01_Utilize_Thyra/CMakeLists.txt index a1eb75b337b0..2aee8c977cb5 100644 --- a/packages/tempus/examples/01_Utilize_Thyra/CMakeLists.txt +++ b/packages/tempus/examples/01_Utilize_Thyra/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( 01_Utilize_Thyra diff --git a/packages/tempus/examples/02_Use_ModelEvaluator/CMakeLists.txt b/packages/tempus/examples/02_Use_ModelEvaluator/CMakeLists.txt index 1e862fccb64d..e81cfd0d4568 100644 --- a/packages/tempus/examples/02_Use_ModelEvaluator/CMakeLists.txt +++ b/packages/tempus/examples/02_Use_ModelEvaluator/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( 02_Use_ModelEvaluator diff --git a/packages/tempus/src/deprecated/CMakeLists.txt b/packages/tempus/src/deprecated/CMakeLists.txt index 08fd580a92f7..8a08229a4b6f 100644 --- a/packages/tempus/src/deprecated/CMakeLists.txt +++ b/packages/tempus/src/deprecated/CMakeLists.txt @@ -6,7 +6,7 @@ append_glob(HEADERS ${DIR}/*.hpp) append_glob(SOURCES ${DIR}/*.cpp) if (NOT ${PACKAGE_NAME}_HIDE_DEPRECATED_CODE) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/deprecated) + tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/deprecated) append_set(HEADERS ) append_set(SOURCES diff --git a/packages/tempus/test/BDF2/CMakeLists.txt b/packages/tempus/test/BDF2/CMakeLists.txt index 65ce8b84368e..3ae39829606d 100644 --- a/packages/tempus/test/BDF2/CMakeLists.txt +++ b/packages/tempus/test/BDF2/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/tempus/test/BackwardEuler/CMakeLists.txt b/packages/tempus/test/BackwardEuler/CMakeLists.txt index 64a511ed37ce..d3b2092e4db6 100644 --- a/packages/tempus/test/BackwardEuler/CMakeLists.txt +++ b/packages/tempus/test/BackwardEuler/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/tempus/test/DIRK/CMakeLists.txt b/packages/tempus/test/DIRK/CMakeLists.txt index c2dfebaf5228..aa949af92de2 100644 --- a/packages/tempus/test/DIRK/CMakeLists.txt +++ b/packages/tempus/test/DIRK/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/tempus/test/ExplicitRK/CMakeLists.txt b/packages/tempus/test/ExplicitRK/CMakeLists.txt index 3d6bf0076c8d..245299c44ecf 100644 --- a/packages/tempus/test/ExplicitRK/CMakeLists.txt +++ b/packages/tempus/test/ExplicitRK/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/tempus/test/ForwardEuler/CMakeLists.txt b/packages/tempus/test/ForwardEuler/CMakeLists.txt index 461dfe35a334..e4db3278301a 100644 --- a/packages/tempus/test/ForwardEuler/CMakeLists.txt +++ b/packages/tempus/test/ForwardEuler/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/tempus/test/HHTAlpha/CMakeLists.txt b/packages/tempus/test/HHTAlpha/CMakeLists.txt index c60129091f90..e14dc8282001 100644 --- a/packages/tempus/test/HHTAlpha/CMakeLists.txt +++ b/packages/tempus/test/HHTAlpha/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) #IKT, replace TRILINOS_ADD_EXECUTABLE code with diff --git a/packages/tempus/test/IMEX_RK/CMakeLists.txt b/packages/tempus/test/IMEX_RK/CMakeLists.txt index bfaf42be3eb8..689ad53de4ca 100644 --- a/packages/tempus/test/IMEX_RK/CMakeLists.txt +++ b/packages/tempus/test/IMEX_RK/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/tempus/test/IMEX_RK_Partitioned/CMakeLists.txt b/packages/tempus/test/IMEX_RK_Partitioned/CMakeLists.txt index cac9493fd002..a642d4136686 100644 --- a/packages/tempus/test/IMEX_RK_Partitioned/CMakeLists.txt +++ b/packages/tempus/test/IMEX_RK_Partitioned/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/tempus/test/Leapfrog/CMakeLists.txt b/packages/tempus/test/Leapfrog/CMakeLists.txt index c355b53e4a39..bb6d5b7d1d6d 100644 --- a/packages/tempus/test/Leapfrog/CMakeLists.txt +++ b/packages/tempus/test/Leapfrog/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/tempus/test/Newmark/CMakeLists.txt b/packages/tempus/test/Newmark/CMakeLists.txt index 49004aa70955..059f994b73e3 100644 --- a/packages/tempus/test/Newmark/CMakeLists.txt +++ b/packages/tempus/test/Newmark/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) #IKT, replace TRILINOS_ADD_EXECUTABLE code with diff --git a/packages/tempus/test/OperatorSplit/CMakeLists.txt b/packages/tempus/test/OperatorSplit/CMakeLists.txt index 2a4cfc54727c..ae9ee5e3a5c0 100644 --- a/packages/tempus/test/OperatorSplit/CMakeLists.txt +++ b/packages/tempus/test/OperatorSplit/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/tempus/test/PhysicsState/CMakeLists.txt b/packages/tempus/test/PhysicsState/CMakeLists.txt index 271c2cabec70..eb73a260fbc3 100644 --- a/packages/tempus/test/PhysicsState/CMakeLists.txt +++ b/packages/tempus/test/PhysicsState/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/tempus/test/Subcycling/CMakeLists.txt b/packages/tempus/test/Subcycling/CMakeLists.txt index 84b514ee809e..22c7d3352521 100644 --- a/packages/tempus/test/Subcycling/CMakeLists.txt +++ b/packages/tempus/test/Subcycling/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/tempus/test/TestModels/CMakeLists.txt b/packages/tempus/test/TestModels/CMakeLists.txt index 164b678a3f35..0a82ec345018 100644 --- a/packages/tempus/test/TestModels/CMakeLists.txt +++ b/packages/tempus/test/TestModels/CMakeLists.txt @@ -4,7 +4,7 @@ INCLUDE(TribitsLibraryMacros) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) diff --git a/packages/tempus/test/TestUtils/CMakeLists.txt b/packages/tempus/test/TestUtils/CMakeLists.txt index d0b8b3c9110c..a553a0d6e166 100644 --- a/packages/tempus/test/TestUtils/CMakeLists.txt +++ b/packages/tempus/test/TestUtils/CMakeLists.txt @@ -4,7 +4,7 @@ INCLUDE(TribitsLibraryMacros) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS Tempus_ConvergenceTestUtils.hpp diff --git a/packages/tempus/test/Trapezoidal/CMakeLists.txt b/packages/tempus/test/Trapezoidal/CMakeLists.txt index ea9353c6d2f8..5175c19abbab 100644 --- a/packages/tempus/test/Trapezoidal/CMakeLists.txt +++ b/packages/tempus/test/Trapezoidal/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/tempus/unit_test/CMakeLists.txt b/packages/tempus/unit_test/CMakeLists.txt index e7d89d30a81a..5fef9cc180b9 100644 --- a/packages/tempus/unit_test/CMakeLists.txt +++ b/packages/tempus/unit_test/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( From 351aaa060adefee789f8359c1f972ce4af81d681 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:48:42 -0700 Subject: [PATCH 46/78] Teuchos: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/teuchos/comm/src/CMakeLists.txt | 2 +- packages/teuchos/core/src/CMakeLists.txt | 8 ++++---- packages/teuchos/core/test/CWrapperSupport/CMakeLists.txt | 2 +- packages/teuchos/kokkoscomm/src/CMakeLists.txt | 4 ++-- packages/teuchos/kokkoscompat/src/CMakeLists.txt | 4 ++-- packages/teuchos/kokkoscompat/test/CMakeLists.txt | 6 +++--- packages/teuchos/numerics/src/CMakeLists.txt | 2 +- packages/teuchos/parameterlist/src/CMakeLists.txt | 2 +- .../teuchos/parameterlist/test/Validators/CMakeLists.txt | 2 +- packages/teuchos/parser/src/CMakeLists.txt | 2 +- packages/teuchos/remainder/src/CMakeLists.txt | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/teuchos/comm/src/CMakeLists.txt b/packages/teuchos/comm/src/CMakeLists.txt index 51da61da4c94..b4f800dbfbcf 100644 --- a/packages/teuchos/comm/src/CMakeLists.txt +++ b/packages/teuchos/comm/src/CMakeLists.txt @@ -7,7 +7,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) diff --git a/packages/teuchos/core/src/CMakeLists.txt b/packages/teuchos/core/src/CMakeLists.txt index f37e97637f2c..5b560b0e9fb7 100644 --- a/packages/teuchos/core/src/CMakeLists.txt +++ b/packages/teuchos/core/src/CMakeLists.txt @@ -46,11 +46,11 @@ SET(SOURCES "") # Set the base Trilinos directory in order to find Trilinos_version.h ASSERT_DEFINED(${${PACKAGE_NAME}_PARENT_REPOSITORY}_BINARY_DIR) -INCLUDE_DIRECTORIES(${${${PACKAGE_NAME}_PARENT_REPOSITORY}_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${${${PACKAGE_NAME}_PARENT_REPOSITORY}_BINARY_DIR}) # Set headers (for IDEs and installing) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PARENT_PACKAGE_NAME}_config.h @@ -60,7 +60,7 @@ APPEND_SET(HEADERS # NOTE: Above, we add the XXX_config.h file so tht MS Visual Studio # will know to include this file in the dependency analysis -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) @@ -85,7 +85,7 @@ ENDIF() ASSERT_DEFINED(TPL_ENABLE_Valgrind) IF(TPL_ENABLE_Valgrind) - INCLUDE_DIRECTORIES(${TPL_Valgrind_INCLUDE_DIRS}) + TRIBITS_INCLUDE_DIRECTORIES(${TPL_Valgrind_INCLUDE_DIRS}) ENDIF() # diff --git a/packages/teuchos/core/test/CWrapperSupport/CMakeLists.txt b/packages/teuchos/core/test/CWrapperSupport/CMakeLists.txt index f1b265140ac1..43f275592a70 100644 --- a/packages/teuchos/core/test/CWrapperSupport/CMakeLists.txt +++ b/packages/teuchos/core/test/CWrapperSupport/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( CWrapperSupport_UnitTests diff --git a/packages/teuchos/kokkoscomm/src/CMakeLists.txt b/packages/teuchos/kokkoscomm/src/CMakeLists.txt index a7b8d3b9be96..5172361de6c7 100644 --- a/packages/teuchos/kokkoscomm/src/CMakeLists.txt +++ b/packages/teuchos/kokkoscomm/src/CMakeLists.txt @@ -1,8 +1,8 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) #----------------------------------------------------------------------------- diff --git a/packages/teuchos/kokkoscompat/src/CMakeLists.txt b/packages/teuchos/kokkoscompat/src/CMakeLists.txt index 231fc54c6d14..f8b5b16f1319 100644 --- a/packages/teuchos/kokkoscompat/src/CMakeLists.txt +++ b/packages/teuchos/kokkoscompat/src/CMakeLists.txt @@ -1,7 +1,7 @@ TRIBITS_CONFIGURE_FILE( ${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS "") SET(SOURCES "") diff --git a/packages/teuchos/kokkoscompat/test/CMakeLists.txt b/packages/teuchos/kokkoscompat/test/CMakeLists.txt index 87fcee6e2bb2..7a55f99c2230 100644 --- a/packages/teuchos/kokkoscompat/test/CMakeLists.txt +++ b/packages/teuchos/kokkoscompat/test/CMakeLists.txt @@ -1,13 +1,13 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # mfh 25 Jun 2013: Some hacks to get the test to compile. Not sure if # these indicate something wrong wth my configuration. It seems to # get the Teuchos and Kokkos Array header files just fine, but not the # Kokkos Compat header files. -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/..) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/..) TRIBITS_ADD_EXECUTABLE_AND_TEST( linkTest diff --git a/packages/teuchos/numerics/src/CMakeLists.txt b/packages/teuchos/numerics/src/CMakeLists.txt index 08fb96323844..b8a722e0d14d 100644 --- a/packages/teuchos/numerics/src/CMakeLists.txt +++ b/packages/teuchos/numerics/src/CMakeLists.txt @@ -7,7 +7,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) diff --git a/packages/teuchos/parameterlist/src/CMakeLists.txt b/packages/teuchos/parameterlist/src/CMakeLists.txt index e5db66fa4013..c61642b40e2e 100644 --- a/packages/teuchos/parameterlist/src/CMakeLists.txt +++ b/packages/teuchos/parameterlist/src/CMakeLists.txt @@ -7,7 +7,7 @@ SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) diff --git a/packages/teuchos/parameterlist/test/Validators/CMakeLists.txt b/packages/teuchos/parameterlist/test/Validators/CMakeLists.txt index d1a8be30e8a5..8fd4f1d12e70 100644 --- a/packages/teuchos/parameterlist/test/Validators/CMakeLists.txt +++ b/packages/teuchos/parameterlist/test/Validators/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../ParameterList) +TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../ParameterList) SET(SerializationFiles blah.txt diff --git a/packages/teuchos/parser/src/CMakeLists.txt b/packages/teuchos/parser/src/CMakeLists.txt index ea9e4b38893b..9c82d55611aa 100644 --- a/packages/teuchos/parser/src/CMakeLists.txt +++ b/packages/teuchos/parser/src/CMakeLists.txt @@ -2,7 +2,7 @@ # B) Define the header and source files (and include directories) # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/packages/teuchos/remainder/src/CMakeLists.txt b/packages/teuchos/remainder/src/CMakeLists.txt index 36c17c52034a..19a92176e1d4 100644 --- a/packages/teuchos/remainder/src/CMakeLists.txt +++ b/packages/teuchos/remainder/src/CMakeLists.txt @@ -12,8 +12,8 @@ APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) From 2373bc74420bf71736cd502a759eceb816f339e2 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:49:10 -0700 Subject: [PATCH 47/78] Thyra: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- .../adapters/epetraext/example/model_evaluator/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/thyra/adapters/epetraext/example/model_evaluator/CMakeLists.txt b/packages/thyra/adapters/epetraext/example/model_evaluator/CMakeLists.txt index 2e40ce5e054f..a47fac9db2c3 100644 --- a/packages/thyra/adapters/epetraext/example/model_evaluator/CMakeLists.txt +++ b/packages/thyra/adapters/epetraext/example/model_evaluator/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES( +TRIBITS_INCLUDE_DIRECTORIES( ${PACKAGE_SOURCE_DIR}/../epetraext/example/model_evaluator/2dsim ${PACKAGE_SOURCE_DIR}/../epetraext/example/model_evaluator/4dopt ) From b37c50a0ae6c202c2b8a5077db86c3cf8a06fd01 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:49:39 -0700 Subject: [PATCH 48/78] Tpetra: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/tpetra/core/compat/CMakeLists.txt | 2 +- packages/tpetra/tsqr/src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tpetra/core/compat/CMakeLists.txt b/packages/tpetra/core/compat/CMakeLists.txt index 7173453beaec..1bfa586793dc 100644 --- a/packages/tpetra/core/compat/CMakeLists.txt +++ b/packages/tpetra/core/compat/CMakeLists.txt @@ -148,7 +148,7 @@ SET(Tpetra_DefaultNode "${Tpetra_DefaultNode}" CACHE STRING "" FORCE) SET(KokkosClassic_DefaultNode "${Tpetra_DefaultNode}" CACHE STRING "" FORCE) CONFIGURE_FILE(cmake/KokkosClassic_DefaultNode_config.h.in KokkosClassic_DefaultNode_config.h) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/KokkosClassic_DefaultNode_config.h) diff --git a/packages/tpetra/tsqr/src/CMakeLists.txt b/packages/tpetra/tsqr/src/CMakeLists.txt index fa463b8ce6a9..4c189243d6e4 100644 --- a/packages/tpetra/tsqr/src/CMakeLists.txt +++ b/packages/tpetra/tsqr/src/CMakeLists.txt @@ -6,7 +6,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # Add this subpackage's generated header file to the list of header # files to install. From 5195a5025d374659c12240bdb3fcae1ee55a8ef1 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:53:02 -0700 Subject: [PATCH 49/78] TrilinosCouplings: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- .../trilinoscouplings/examples/fenl/CMakeLists.txt | 4 ++-- packages/trilinoscouplings/src/CMakeLists.txt | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/trilinoscouplings/examples/fenl/CMakeLists.txt b/packages/trilinoscouplings/examples/fenl/CMakeLists.txt index fb0000fdcd57..302aaf41f099 100644 --- a/packages/trilinoscouplings/examples/fenl/CMakeLists.txt +++ b/packages/trilinoscouplings/examples/fenl/CMakeLists.txt @@ -1,7 +1,7 @@ IF (TrilinosCouplings_ENABLE_Tpetra AND Tpetra_Have_Kokkos_Refactor) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_LIBRARY( fenl diff --git a/packages/trilinoscouplings/src/CMakeLists.txt b/packages/trilinoscouplings/src/CMakeLists.txt index 00d397610c44..1dfca504d489 100644 --- a/packages/trilinoscouplings/src/CMakeLists.txt +++ b/packages/trilinoscouplings/src/CMakeLists.txt @@ -44,7 +44,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -54,7 +54,7 @@ SET(HEADERS ${HEADERS} # Core files # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS TrilinosCouplings_Version.h @@ -67,7 +67,7 @@ APPEND_SET(SOURCES IF(HAVE_TRILINOSCOUPLINGS_ML) #Have Nox and ML IF(HAVE_TRILINOSCOUPLINGS_NOX) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ml/NonlinML) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ml/NonlinML) APPEND_SET(HEADERS ml/NonlinML/nlnml_ConstrainedMultiLevelOperator.H ml/NonlinML/nlnml_finelevelnoxinterface.H @@ -92,7 +92,7 @@ IF(HAVE_TRILINOSCOUPLINGS_ML) #Have Ifpack and ML IF(HAVE_TRILINOSCOUPLINGS_IFPACK) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ifpack) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ifpack) APPEND_SET(HEADERS ifpack/Ifpack_ML.h ) @@ -106,7 +106,7 @@ ENDIF() IF(HAVE_TRILINOSCOUPLINGS_EPETRAEXT) #Hae Isorropia and Epetra ext IF(HAVE_TRILINOSCOUPLINGS_ISORROPIA) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetraext) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetraext) APPEND_SET(HEADERS epetraext/EpetraExt_Isorropia_CrsGraph.h ) @@ -118,7 +118,7 @@ IF(HAVE_TRILINOSCOUPLINGS_EPETRAEXT) #Have Amesos and Epetra ext IF(HAVE_TRILINOSCOUPLINGS_AMESOS) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetraext) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetraext) APPEND_SET(HEADERS epetraext/EpetraExt_AmesosBTF_CrsGraph.h epetraext/EpetraExt_AmesosBTF_CrsMatrix.h @@ -134,7 +134,7 @@ IF(HAVE_TRILINOSCOUPLINGS_EPETRAEXT) #Have all three Epetra ext, Amesos and Isorropia IF(HAVE_TRILINOSCOUPLINGS_AMESOS AND HAVE_TRILINOSCOUPLINGS_ISORROPIA) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetraext) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetraext) APPEND_SET(HEADERS epetraext/EpetraExt_AmesosBTFGlobal_LinearProblem.h ) From 7bac684ee85879e2416909853787342e82437071 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:53:22 -0700 Subject: [PATCH 50/78] TriUtils: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/triutils/src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/triutils/src/CMakeLists.txt b/packages/triutils/src/CMakeLists.txt index aa42bab376a8..4071588f85e6 100644 --- a/packages/triutils/src/CMakeLists.txt +++ b/packages/triutils/src/CMakeLists.txt @@ -13,13 +13,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Files that do not depend on Epetra SET(SOURCES ${SOURCES} From a641f77cb60b91a77e3fc73bd25741a078d5417e Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:53:48 -0700 Subject: [PATCH 51/78] Xpetra: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/xpetra/example/CMakeLists.txt | 4 ++-- packages/xpetra/example/Simple/CMakeLists.txt | 2 +- packages/xpetra/research/max/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/xpetra/example/CMakeLists.txt b/packages/xpetra/example/CMakeLists.txt index e2d28ff740ab..3fd21f060fd0 100644 --- a/packages/xpetra/example/CMakeLists.txt +++ b/packages/xpetra/example/CMakeLists.txt @@ -1,7 +1,7 @@ #INCLUDE(TribitsAddExecutableAndTest) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery) #TRIBITS_ADD_EXECUTABLE_AND_TEST( # Xpetra_MatrixDriver diff --git a/packages/xpetra/example/Simple/CMakeLists.txt b/packages/xpetra/example/Simple/CMakeLists.txt index b3d2f7efd4b4..219687011de9 100644 --- a/packages/xpetra/example/Simple/CMakeLists.txt +++ b/packages/xpetra/example/Simple/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (${PACKAGE_NAME}_ENABLE_Tpetra) IF ((Tpetra_INST_INT_INT) OR (Tpetra_INST_INT_LONG_LONG)) diff --git a/packages/xpetra/research/max/CMakeLists.txt b/packages/xpetra/research/max/CMakeLists.txt index 4d86b6f923dd..bce92ea20dfe 100644 --- a/packages/xpetra/research/max/CMakeLists.txt +++ b/packages/xpetra/research/max/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(SOURCES ${DIR}/*.cpp) From 5484de224d38e5493321d819c11ada89eedb6ca3 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:54:13 -0700 Subject: [PATCH 52/78] Zoltan: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- .../zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt | 2 +- packages/zoltan/src/CMakeLists.txt | 50 +++++++++---------- packages/zoltan/src/fdriver/CMakeLists.txt | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt b/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt index 20c39a5ccec2..37d8f0caa467 100644 --- a/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt +++ b/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt @@ -11,7 +11,7 @@ SET(SOURCES "") # siMPI/pyMPI/siMPI # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS ${HEADERS} mpi.h diff --git a/packages/zoltan/src/CMakeLists.txt b/packages/zoltan/src/CMakeLists.txt index de21fea48c91..23e74c2715f7 100644 --- a/packages/zoltan/src/CMakeLists.txt +++ b/packages/zoltan/src/CMakeLists.txt @@ -40,7 +40,7 @@ SET(NOINSTALLHEADERS "") SET(SOURCES "") SET(MODULES "") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -50,7 +50,7 @@ SET(HEADERS ${HEADERS} # src/include # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) APPEND_SET(HEADERS include/lbi_const.h @@ -74,7 +74,7 @@ APPEND_SET(HEADERS # src/all # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/all) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/all) APPEND_SET(NOINSTALLHEADERS all/all_allo_const.h @@ -88,7 +88,7 @@ APPEND_SET(SOURCES # src/coloring # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/coloring) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/coloring) APPEND_SET(NOINSTALLHEADERS coloring/coloring_const.h @@ -108,7 +108,7 @@ APPEND_SET(SOURCES # src/graph # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/graph) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/graph) APPEND_SET(NOINSTALLHEADERS graph/graph.h @@ -124,7 +124,7 @@ APPEND_SET(SOURCES # src/ha # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ha) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ha) APPEND_SET(NOINSTALLHEADERS ha/ha_const.h @@ -141,7 +141,7 @@ APPEND_SET(SOURCES # src/hier # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/hier) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/hier) APPEND_SET(NOINSTALLHEADERS hier/hier.h @@ -156,7 +156,7 @@ APPEND_SET(SOURCES # src/hsfc # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/hsfc) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/hsfc) APPEND_SET(NOINSTALLHEADERS hsfc/hsfc.h @@ -175,7 +175,7 @@ APPEND_SET(SOURCES # src/lb # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lb) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lb) APPEND_SET(NOINSTALLHEADERS lb/lb_const.h @@ -203,7 +203,7 @@ APPEND_SET(SOURCES # src/matrix # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/matrix) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/matrix) APPEND_SET(NOINSTALLHEADERS matrix/zoltan_matrix.h @@ -221,7 +221,7 @@ APPEND_SET(SOURCES # src/order # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/order) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/order) APPEND_SET(NOINSTALLHEADERS order/order_const.h @@ -244,7 +244,7 @@ ENDIF() # src/par # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/par) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/par) APPEND_SET(NOINSTALLHEADERS par/par_average_const.h @@ -268,7 +268,7 @@ APPEND_SET(SOURCES # src/params # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/params) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/params) APPEND_SET(NOINSTALLHEADERS params/key_params.h @@ -291,7 +291,7 @@ APPEND_SET(SOURCES # src/tpls # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/tpls) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/tpls) APPEND_SET(NOINSTALLHEADERS tpls/third_library_const.h @@ -338,7 +338,7 @@ ENDIF() # src/phg # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/phg) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/phg) APPEND_SET(NOINSTALLHEADERS phg/phg_comm.h @@ -383,7 +383,7 @@ APPEND_SET(SOURCES # src/rcb # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/rcb) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/rcb) APPEND_SET(NOINSTALLHEADERS rcb/create_proc_list_const.h @@ -414,7 +414,7 @@ APPEND_SET(SOURCES # src/reftree # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/reftree) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/reftree) APPEND_SET(NOINSTALLHEADERS reftree/reftree_const.h @@ -432,7 +432,7 @@ APPEND_SET(SOURCES # src/simple # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/simple) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/simple) APPEND_SET(SOURCES simple/block.c @@ -448,7 +448,7 @@ APPEND_SET(NOINSTALLHEADERS # src/timer # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/timer) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/timer) APPEND_SET(NOINSTALLHEADERS timer/timer_const.h @@ -462,10 +462,10 @@ APPEND_SET(SOURCES # src/Utilities # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/Communication) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/DDirectory) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/Timer) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/shared) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/Communication) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/DDirectory) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/Timer) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/shared) APPEND_SET(NOINSTALLHEADERS Utilities/Communication/comm.h @@ -510,7 +510,7 @@ APPEND_SET(SOURCES # src/zz # -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/zz) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/zz) APPEND_SET(NOINSTALLHEADERS zz/zz_const.h @@ -544,7 +544,7 @@ APPEND_SET(SOURCES # IF(${PROJECT_NAME}_ENABLE_Fortran AND BUILD_ZOLTAN_F90_INTERFACE) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fort) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fort) APPEND_SET(NOINSTALLHEADERS fort/cwrap_fmangle.h diff --git a/packages/zoltan/src/fdriver/CMakeLists.txt b/packages/zoltan/src/fdriver/CMakeLists.txt index 32913f39ce7e..1e6409e65222 100644 --- a/packages/zoltan/src/fdriver/CMakeLists.txt +++ b/packages/zoltan/src/fdriver/CMakeLists.txt @@ -21,7 +21,7 @@ IF(${PROJECT_NAME}_ENABLE_Fortran AND BUILD_ZOLTAN_F90_INTERFACE) APPEND_SET(ZFDRIVE_SOURCES farg_typical.f) ENDIF() - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_EXECUTABLE( zfdrive From 28092f474361050913f238da63a1ad0080fa2794 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 14:54:36 -0700 Subject: [PATCH 53/78] Zoltan2: Remove usage of deprecated include_directories() (TriBITSPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. --- packages/zoltan2/core/src/CMakeLists.txt | 34 +++++++++++----------- packages/zoltan2/sphynx/src/CMakeLists.txt | 4 +-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/zoltan2/core/src/CMakeLists.txt b/packages/zoltan2/core/src/CMakeLists.txt index 7f894a49f161..27e0c777a468 100644 --- a/packages/zoltan2/core/src/CMakeLists.txt +++ b/packages/zoltan2/core/src/CMakeLists.txt @@ -100,27 +100,27 @@ APPEND_SET(HEADERS # for Trilinos_version.h ASSERT_DEFINED(PROJECT_BINARY_DIR) -INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}) # for Zoltan2_config.h -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # for zoltan2 header files -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithms) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithms/partition) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithms/order) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithms/color) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithms/match) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithms/map) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithms/zoltan) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/environment) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/input) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/models) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/problems) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/TpetraCrsColorer) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/util) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/directory) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithms) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithms/partition) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithms/order) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithms/color) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithms/match) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithms/map) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/algorithms/zoltan) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/environment) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/input) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/models) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/problems) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/TpetraCrsColorer) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/util) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/directory) # # C) Define the targets for package's library(s) diff --git a/packages/zoltan2/sphynx/src/CMakeLists.txt b/packages/zoltan2/sphynx/src/CMakeLists.txt index aa8d0acfe874..d05c717f076c 100644 --- a/packages/zoltan2/sphynx/src/CMakeLists.txt +++ b/packages/zoltan2/sphynx/src/CMakeLists.txt @@ -27,10 +27,10 @@ APPEND_SET(HEADERS # for Trilinos_version.h ASSERT_DEFINED(PROJECT_BINARY_DIR) -INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}) # for Zoltan2_config.h -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # # C) Define the targets for package's library(s) From acca2f92fc18d7470770bd02a8dc2c6725e0850c Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 19 Dec 2022 17:55:06 -0700 Subject: [PATCH 54/78] KokkosKernels: Use KOKKOSKERNELS_INCLUDE_DIRECTORIES() (TriBITSPub/TriBITS#429) This replaces the usage of raw include_directories() with the wrapper KOKKOSKERNELS_INCLUDE_DIRECTORIES(). The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() in a TriBITS build instead. --- packages/kokkos-kernels/perf_test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kokkos-kernels/perf_test/CMakeLists.txt b/packages/kokkos-kernels/perf_test/CMakeLists.txt index 91dc72786755..98172f4ada7b 100644 --- a/packages/kokkos-kernels/perf_test/CMakeLists.txt +++ b/packages/kokkos-kernels/perf_test/CMakeLists.txt @@ -24,7 +24,7 @@ TARGET_INCLUDE_DIRECTORIES(kokkoskernelsperf_gtest PUBLIC $ Date: Tue, 20 Dec 2022 07:11:30 -0700 Subject: [PATCH 55/78] Set TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE=TRUE (TriBITSPub/TriBITS#429) This will silence the warnings about using deprecated TriBITS override `include_directories()`. There is some code like in imported googletest that uses raw `include_directories()` and we don't want to emit deprecation warnings for those. --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c98c496b0484..33c1950f3bef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,9 +69,12 @@ INCLUDE(${CMAKE_CURRENT_LIST_DIR}/ProjectName.cmake) # not in an include file :-( PROJECT(${PROJECT_NAME} NONE) -## set an env so we know we are in configure +# Set an env so we know we are in configure set(ENV{CMAKE_IS_IN_CONFIGURE_MODE} 1) +# Don't define TriBITS override of include_directories() +set(TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE TRUE) + # # B) Pull in the TriBITS system and execute # From 075e2a7b4b0d6ba7c5ba1ea7d0e1793caf55784e Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:33:38 -0700 Subject: [PATCH 56/78] Automatic snapshot commit from tribits at b0749b08 Origin repo remote tracking branch: 'github/master' Origin repo remote repo URL: 'github = git@github.com:TriBITSPub/TriBITS.git' Git describe: Vera4.0-RC1-start-1416-g5d375826 At commit: commit b0749b08964ba9133f200b331e5b8d104f0d3588 Author: Roscoe A. Bartlett Date: Tue Dec 20 07:06:40 2022 -0700 Summary: Add replace_set_and_inc_dirs_r.sh and CHANGLOG entry (#429) --- cmake/tribits/CHANGELOG.md | 26 ++++ .../core/package_arch/TribitsAddLibrary.cmake | 2 +- .../package_arch/TribitsGlobalMacros.cmake | 6 +- .../TribitsIncludeDirectories.cmake | 38 ++++-- .../TribitsSetAndIncDirs.cmake} | 22 +++- cmake/tribits/core/utils/CMakeOverrides.cmake | 117 ------------------ .../core/utils/TribitsDeprecatedHelpers.cmake | 44 ++++--- .../build_ref/TribitsBuildReferenceBody.rst | 20 +++ .../guides/TribitsCoreDetailedReference.rst | 14 +++ .../TribitsMacroFunctionDocTemplate.rst | 1 + .../guides/UtilsMacroFunctionDocTemplate.rst | 1 - .../examples/InsertedPkg/CMakeLists.txt | 2 +- .../shared_only/CMakeLists.txt | 2 +- .../static_only/CMakeLists.txt | 2 +- .../examples/TargetDefinesPkg/CMakeLists.txt | 2 +- .../TribitsExampleProject/CMakeLists.txt | 2 + .../packages/mixed_lang/src/CMakeLists.txt | 4 +- .../packages/simple_cxx/src/CMakeLists.txt | 4 +- .../packages/simple_cxx/test/CMakeLists.txt | 3 + .../test/SimpleCxx_HelloWorld_Tests.cpp | 7 +- .../test/inc/SimpleCxx_HelloWorld_Tests.hpp | 10 ++ .../with_subpackages/a/CMakeLists.txt | 4 +- .../with_subpackages/b/src/CMakeLists.txt | 6 +- .../b/tests/testlib/CMakeLists.txt | 2 +- .../with_subpackages/c/CMakeLists.txt | 2 +- .../packages/wrap_external/CMakeLists.txt | 2 +- .../TribitsExampleProject2/CMakeLists.txt | 1 + .../packages/package1/src/CMakeLists.txt | 2 +- .../packages/package2/src/CMakeLists.txt | 4 +- .../packages/package3/src/CMakeLists.txt | 4 +- .../packages/addon1/src/CMakeLists.txt | 2 +- 31 files changed, 174 insertions(+), 184 deletions(-) rename cmake/tribits/core/{utils/SetAndIncDirs.cmake => package_arch/TribitsSetAndIncDirs.cmake} (76%) delete mode 100644 cmake/tribits/core/utils/CMakeOverrides.cmake create mode 100644 cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/inc/SimpleCxx_HelloWorld_Tests.hpp diff --git a/cmake/tribits/CHANGELOG.md b/cmake/tribits/CHANGELOG.md index 5b1147d3391e..c0ad93274308 100644 --- a/cmake/tribits/CHANGELOG.md +++ b/cmake/tribits/CHANGELOG.md @@ -2,6 +2,32 @@ ChangeLog for TriBITS ---------------------------------------- +## 2022-12-20: + +* **Deprecated:** The macro `set_and_inc_dirs()` is deprecated and replaced by + `tribits_set_and_inc_dirs()`. Use the script + `TriBITS/refactoring/replace_set_and_inc_dirs_r.sh` to update + `CMakeLists.txt` files. + +## 2022-11-03: + +* **Deprecated:** The long-deprecated TriBITS function override + `include_directories()` now emits a deprecated warning. To replace all + usages of `include_directories()` that should be + `tribits_include_directories()`, use the script + `TriBITS/refactoring/replace_include_directories_r.sh` (see documentation in + that script). + +* **Deprecated:** Many previously deprecated TriBITS features now will trigger + a CMake DEPRECATION warning message by default (by calling + `message(DEPRECATION ...)`). The message printed to the CMake output will + typically describe how to remove the usage of the deprecated feature. To + remove deprecation warnings, change to use the non-deprecated features + mentioned in the deprecation warning message. To temporarily disable + deprecation warnings, configure with `-D + TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE=IGNORE` (see build reference entry + for `TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE` for more details). + ## 2022-10-20: * **Changed:** Disabling an external package/TPL will now disable any diff --git a/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake b/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake index 6f7890a33689..30036149dbdc 100644 --- a/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake +++ b/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake @@ -49,7 +49,7 @@ include(RemoveGlobalDuplicates) include(TribitsGeneralMacros) include(TribitsReportInvalidTribitsUsage) include(TribitsDeprecatedHelpers) -include(SetAndIncDirs) +include(TribitsSetAndIncDirs) # @FUNCTION: tribits_add_library() diff --git a/cmake/tribits/core/package_arch/TribitsGlobalMacros.cmake b/cmake/tribits/core/package_arch/TribitsGlobalMacros.cmake index 283d81af78d2..7f452f338b7a 100644 --- a/cmake/tribits/core/package_arch/TribitsGlobalMacros.cmake +++ b/cmake/tribits/core/package_arch/TribitsGlobalMacros.cmake @@ -959,8 +959,12 @@ macro(tribits_define_global_options_and_define_extra_repos) CACHE BOOL "Set to 'ON' to see the machine load for advanced tests." ) + if ("${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_DEFAULT}" STREQUAL "") + set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_DEFAULT "DEPRECATION") + endif() + tribits_add_enum_cache_var(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE - DEFAULT_VAL "DEPRECATION" + DEFAULT_VAL "${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_DEFAULT}" DOC_STRING "Mode for dealing with usage of TriBITS deprecated functionality" ALLOWED_STRINGS_LIST ${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_ALL_VALID_VALUES} IS_ADVANCED diff --git a/cmake/tribits/core/package_arch/TribitsIncludeDirectories.cmake b/cmake/tribits/core/package_arch/TribitsIncludeDirectories.cmake index f31da5dfb38b..e288094953e2 100644 --- a/cmake/tribits/core/package_arch/TribitsIncludeDirectories.cmake +++ b/cmake/tribits/core/package_arch/TribitsIncludeDirectories.cmake @@ -43,14 +43,14 @@ include(TribitsDeprecatedHelpers) # @MACRO: tribits_include_directories() # -# This function is to override the standard behavior of the built-in CMake -# ``include_directories()`` command. +# This function overrides the standard behavior of the built-in CMake +# ``include_directories()`` command for special behavior for installation +# testing. # # Usage:: # # tribits_include_directories( -# [REQUIRED_DURING_INSTALLATION_TESTING] ... -# ) +# [REQUIRED_DURING_INSTALLATION_TESTING] ... ) # # If specified, ``REQUIRED_DURING_INSTALLATION_TESTING`` can appear anywhere # in the argument list. @@ -62,10 +62,10 @@ include(TribitsDeprecatedHelpers) # Testing`_). Normally we want the include directories to be handled as cmake # usually does. However during TriBITS installation testing we do not want # most of the include directories to be used as the majority of the files -# should come from the installation we are building against. There is an -# exception to this and that is when there are test only headers that are -# needed. For that case ``REQUIRED_DURING_INSTALLATION_TESTING`` must be -# passed in to ensure the include paths are added for installation testing. +# should come from the installation we are building against. The exception is +# when there are test only headers that are needed. For that case +# ``REQUIRED_DURING_INSTALLATION_TESTING`` must be passed in to ensure the +# include paths are added for installation testing. # macro(tribits_include_directories) @@ -81,13 +81,25 @@ macro(tribits_include_directories) ${ARGN} ) - if(NOT ${PROJECT_NAME}_ENABLE_INSTALLATION_TESTING OR PARSE_REQUIRED_DURING_INSTALLATION_TESTING) - _include_directories(${PARSE_UNPARSED_ARGUMENTS}) + if(NOT ${PROJECT_NAME}_ENABLE_INSTALLATION_TESTING + OR PARSE_REQUIRED_DURING_INSTALLATION_TESTING + ) + if (TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE) + include_directories(${PARSE_UNPARSED_ARGUMENTS}) + else() + _include_directories(${PARSE_UNPARSED_ARGUMENTS}) + endif() endif() endmacro() +if (NOT TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE) + # Deprecated. Use tribits_include_directories() instead! +# +# To hide this macro from even being defined, set +# ``TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE=TRUE``. +# macro(include_directories) tribits_deprecated_command(include_directories @@ -106,7 +118,11 @@ macro(include_directories) ${ARGN} ) - if(NOT ${PROJECT_NAME}_ENABLE_INSTALLATION_TESTING OR PARSE_REQUIRED_DURING_INSTALLATION_TESTING) + if(NOT ${PROJECT_NAME}_ENABLE_INSTALLATION_TESTING + OR PARSE_REQUIRED_DURING_INSTALLATION_TESTING + ) _include_directories(${PARSE_UNPARSED_ARGUMENTS}) endif() endmacro() + +endif (NOT TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE) diff --git a/cmake/tribits/core/utils/SetAndIncDirs.cmake b/cmake/tribits/core/package_arch/TribitsSetAndIncDirs.cmake similarity index 76% rename from cmake/tribits/core/utils/SetAndIncDirs.cmake rename to cmake/tribits/core/package_arch/TribitsSetAndIncDirs.cmake index 80d4f688c40b..55991e4fdb63 100644 --- a/cmake/tribits/core/utils/SetAndIncDirs.cmake +++ b/cmake/tribits/core/package_arch/TribitsSetAndIncDirs.cmake @@ -38,19 +38,29 @@ # @HEADER -# @MACRO: set_and_inc_dirs() +# @MACRO: tribits_set_and_inc_dirs() # -# Set a variable to an include directory and call ``include_directories()`` -# (removes boiler-plate code). +# Set a variable to an include directory and call +# `tribits_include_directories()`_ (removes boiler-plate code). # # Usage: # -# set_and_inc_dirs( ) +# tribits_set_and_inc_dirs( ) # # On output, this sets ```` to ```` in the local scope -# and calls ``include_directories()``. +# and calls ``tribits_include_directories()``. +# +macro(tribits_set_and_inc_dirs dirVarName includeDir) + set(${dirVarName} ${includeDir}) + tribits_include_directories(${${dirVarName}}) +endmacro() + + +# Deprecated! Use tribits_set_and_inc_dirs() instead! # macro(set_and_inc_dirs DIR_VAR_NAME INCLUDE_DIR) + tribits_deprecated_command(set_and_inc_dirs + MESSAGE "Use tribits_set_and_inc_dirs() instead." ) set(${DIR_VAR_NAME} ${INCLUDE_DIR}) - include_directories(${${DIR_VAR_NAME}}) + tribits_include_directories(${${DIR_VAR_NAME}}) endmacro() diff --git a/cmake/tribits/core/utils/CMakeOverrides.cmake b/cmake/tribits/core/utils/CMakeOverrides.cmake deleted file mode 100644 index 1c95ecfdb703..000000000000 --- a/cmake/tribits/core/utils/CMakeOverrides.cmake +++ /dev/null @@ -1,117 +0,0 @@ -# @HEADER -# ************************************************************************ -# -# TriBITS: Tribal Build, Integrate, and Test System -# Copyright 2013 Sandia Corporation -# -# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -# the U.S. Government retains certain rights in this software. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the Corporation nor the names of the -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# ************************************************************************ -# @HEADER - -include(CMakeParseArguments) - -# -# FUNCTION: tribits_include_directories() -# - -# This function is to override the standard behavior of include_directories -# for a TriBITS package. - -# Usage:: -# -# tribits_include_directories( -# [REQUIRED_DURING_INSTALLATION_TESTING] ... -# ) -# -# If specified, ``REQUIRED_DURING_INSTALLATION_TESTING`` can appear anywhere -# in the argument list. -# -# This function allows overriding the default behavior for installation -# testing, to ensure that include directories will not be inadvertently added -# to the build lines for tests during installation testing. Normally we want -# the include directories to be handled as cmake usually does. However during -# TriBITS installation testing we do not want most of the include directories -# to be used as the majority of the files should come from the installation we -# are building against. There is an exception to this and that is when there -# are test only headers that are needed. For that case we allow people to set -# ``REQUIRED_DURING_INSTALLATION_TESTING`` to tell us that this include -# directory does need to be set for instaltion testing. -# -function(tribits_include_directories) - cmake_parse_arguments( - #prefix - PARSE - #Options - "REQUIRED_DURING_INSTALLATION_TESTING" - #one_value_keywords - "" - #multi_value_keywords - "" - ${ARGN} - ) - - tribits_check_for_unparsed_arguments() - - if(NOT ${PROJECT_NAME}_ENABLE_INSTALLATION_TESTING OR PARSE_REQUIRED_DURING_INSTALLATION_TESTING) - _include_directories(${PARSE_DEFAULT_ARGS}) - endif() -endfunction() - -#This function is to override the standard behavior of include_directories. -# We are overriding the default behavior for installation testing, this allows -#us to ensure that include directories will not be inadvertently added to the -#build lines for tests during installation testing. Normally we want the include -#directories to be handled as cmake usually does.However during installation -#testing we do not want most of the include directories to be used as the majority -#of the files should come from the installation we are building against. There is -#an exception to this and that is when there are test only headers that are needed. -#For that case we allow people to set "REQUIRED_DURING_INSTALLATION_TESTING" to -#tell us that this include directory does need to be set for instaltion testing. -function(include_directories) - cmake_parse_arguments( - #prefix - PARSE - #Options - "REQUIRED_DURING_INSTALLATION_TESTING" - #one_value_keywords - "" - #multi_value_keywords - "" - ${ARGN} - ) - - tribits_check_for_unparsed_arguments() - - if(NOT ${PROJECT_NAME}_ENABLE_INSTALLATION_TESTING OR PARSE_REQUIRED_DURING_INSTALLATION_TESTING) - _include_directories(${PARSE_DEFAULT_ARGS}) - endif() -endfunction() diff --git a/cmake/tribits/core/utils/TribitsDeprecatedHelpers.cmake b/cmake/tribits/core/utils/TribitsDeprecatedHelpers.cmake index 4dec816bf8e1..0ae57138e050 100644 --- a/cmake/tribits/core/utils/TribitsDeprecatedHelpers.cmake +++ b/cmake/tribits/core/utils/TribitsDeprecatedHelpers.cmake @@ -42,34 +42,33 @@ include(TribitsParseArgumentsHelpers) set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_CALL_MESSAGE - DEPRECATION AUTHOR_WARNING SEND_ERROR FATAL_ERROR - ) + DEPRECATION AUTHOR_WARNING SEND_ERROR FATAL_ERROR ) set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_DONT_CALL_MESSAGE - IGNORE - ) + IGNORE ) set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_ALL_VALID_VALUES ${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_CALL_MESSAGE} - ${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_CALL_MESSAGE} - ) + ${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_DONT_CALL_MESSAGE} ) # @FUNCTION: tribits_deprecated() # -# Notify the user that some TriBITS functionality is deprecated. Depending on -# the value of TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE, this can do one of -# several things: -# -# - ``DEPRECATION`` or empty string: issue a CMake ``DEPRECATION`` message and -# continue. -# - ``AUTHOR_WARNING``: issue a CMake ``AUTHOR_WARNING`` message and continue. -# - ``SEND_ERROR``: issue a CMake ``SEND_ERROR`` message and continue. -# - ``FATAL_ERROR``: issue a CMake ``FATAL_ERROR`` message and exit. -# - ``IGNORE``: issue no message and continue. +# Notify the user that some TriBITS functionality is deprecated. # # Usage:: # # tribits_deprecated() # +# Depending on the value of the cache variable +# `TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE`_, this can do one of several +# things: +# +# - ``DEPRECATION`` or empty string (or variable not defined): Issue a CMake +# ``DEPRECATION`` message and continue. +# - ``AUTHOR_WARNING``: Issue a CMake ``AUTHOR_WARNING`` message and continue. +# - ``SEND_ERROR``: Issue a CMake ``SEND_ERROR`` message and continue. +# - ``FATAL_ERROR``: Issue a CMake ``FATAL_ERROR`` message and exit. +# - ``IGNORE``: Issue no message and continue. +# function(tribits_deprecated) cmake_parse_arguments(PARSE_ARGV 0 FWD "" "" "") @@ -78,9 +77,16 @@ function(tribits_deprecated) endif() if ("${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}" IN_LIST TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_CALL_MESSAGE) - message_wrapper("${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}" ${FWD_UNPARSED_ARGUMENTS}) - elseif (NOT "${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}" IN_LIST TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_ALL_VALID_VALUES) - message_wrapper(FATAL_ERROR "Invalid value for TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE: '${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}'") + message_wrapper("${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}" + ${FWD_UNPARSED_ARGUMENTS} + "\n\nNOTE: To Make these warnings go away, set -D" + " TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE=IGNORE (see the build reference guide).") + elseif (NOT "${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}" IN_LIST + TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_ALL_VALID_VALUES + ) + message_wrapper(FATAL_ERROR "Invalid value for" + " TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE=" + "'${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}'") endif() endfunction() diff --git a/cmake/tribits/doc/build_ref/TribitsBuildReferenceBody.rst b/cmake/tribits/doc/build_ref/TribitsBuildReferenceBody.rst index f71863a55821..07f0570a2b6f 100644 --- a/cmake/tribits/doc/build_ref/TribitsBuildReferenceBody.rst +++ b/cmake/tribits/doc/build_ref/TribitsBuildReferenceBody.rst @@ -2089,6 +2089,26 @@ This will override the global behavior set by ````. +Adjusting CMake DEPRECATION warnings +------------------------------------ + +By default, deprecated TriBITS features being used in the project's CMake +files will result in CMake deprecation warning messages (issued by calling +``message(DEPRECATION ...)`` internally). The handling of these deprecation +warnings can be changed by setting the CMake cache variable +``TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE``. For example, to remove all +deprecation warnings, set:: + + -D TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE=IGNORE + +Other valid values include: + +* ``DEPRECATION``: Issue a CMake ``DEPRECATION`` message and continue (default). +* ``AUTHOR_WARNING``: Issue a CMake ``AUTHOR_WARNING`` message and continue. +* ``SEND_ERROR``: Issue a CMake ``SEND_ERROR`` message and continue. +* ``FATAL_ERROR``: Issue a CMake ``FATAL_ERROR`` message and exit. + + Disabling deprecated code ------------------------- diff --git a/cmake/tribits/doc/guides/TribitsCoreDetailedReference.rst b/cmake/tribits/doc/guides/TribitsCoreDetailedReference.rst index e5ef0fa6625c..2cc0fb95e97d 100644 --- a/cmake/tribits/doc/guides/TribitsCoreDetailedReference.rst +++ b/cmake/tribits/doc/guides/TribitsCoreDetailedReference.rst @@ -98,6 +98,7 @@ a given TriBITS project are: * `CMAKE_INSTALL_RPATH_USE_LINK_PATH`_ * `MPI_EXEC_MAX_NUMPROCS`_ * `PythonInterp_FIND_VERSION`_ +* `TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE`_ These options are described below. @@ -862,6 +863,19 @@ These options are described below. -D PythonInterp_FIND_VERSION="3.6.2" +.. _TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE: + +**TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE** + + Determines how the function `tribits_deprecated()`_ behaves. To change the + default behavor, such as call ``message(FATAL_ERROR ...)``, set:: + + set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_DEFAULT FATAL_ERROR) + + in the project's `/ProjectName.cmake`_ file, or + `/CMakeLists.txt`_ file, or on the individual package basis in + its `/CMakeLists.txt`_ file. + TriBITS Macros and Functions ---------------------------- diff --git a/cmake/tribits/doc/guides/TribitsMacroFunctionDocTemplate.rst b/cmake/tribits/doc/guides/TribitsMacroFunctionDocTemplate.rst index c045c1962e54..c0916454df5b 100644 --- a/cmake/tribits/doc/guides/TribitsMacroFunctionDocTemplate.rst +++ b/cmake/tribits/doc/guides/TribitsMacroFunctionDocTemplate.rst @@ -44,6 +44,7 @@ @MACRO: tribits_project_enable_all() + @MACRO: tribits_repository_define_packages() + @MACRO: tribits_repository_define_tpls() + +@MACRO: tribits_set_and_inc_dirs() + @FUNCTION: tribits_set_st_for_dev_mode() + @MACRO: tribits_subpackage() + @MACRO: tribits_subpackage_postprocess() + diff --git a/cmake/tribits/doc/guides/UtilsMacroFunctionDocTemplate.rst b/cmake/tribits/doc/guides/UtilsMacroFunctionDocTemplate.rst index d7d18c8d7e39..acc98214c162 100644 --- a/cmake/tribits/doc/guides/UtilsMacroFunctionDocTemplate.rst +++ b/cmake/tribits/doc/guides/UtilsMacroFunctionDocTemplate.rst @@ -31,7 +31,6 @@ @FUNCTION: print_var() + @FUNCTION: print_var_with_spaces() + @FUNCTION: remove_global_duplicates() + -@MACRO: set_and_inc_dirs() + @FUNCTION: set_cache_on_off_empty() + @MACRO: set_default() + @MACRO: set_default_and_from_env() + diff --git a/cmake/tribits/examples/InsertedPkg/CMakeLists.txt b/cmake/tribits/examples/InsertedPkg/CMakeLists.txt index 59554162100b..7df9c56e8157 100644 --- a/cmake/tribits/examples/InsertedPkg/CMakeLists.txt +++ b/cmake/tribits/examples/InsertedPkg/CMakeLists.txt @@ -1,6 +1,6 @@ tribits_package(InsertedPkg) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library( externalpkg diff --git a/cmake/tribits/examples/MixedSharedStaticLibs/shared_only/CMakeLists.txt b/cmake/tribits/examples/MixedSharedStaticLibs/shared_only/CMakeLists.txt index 5a4746eda691..7cec4e8cad26 100644 --- a/cmake/tribits/examples/MixedSharedStaticLibs/shared_only/CMakeLists.txt +++ b/cmake/tribits/examples/MixedSharedStaticLibs/shared_only/CMakeLists.txt @@ -1,6 +1,6 @@ tribits_subpackage(SharedOnly) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library( shared_only_lib diff --git a/cmake/tribits/examples/MixedSharedStaticLibs/static_only/CMakeLists.txt b/cmake/tribits/examples/MixedSharedStaticLibs/static_only/CMakeLists.txt index 62e8bddd8490..7df2594891a6 100644 --- a/cmake/tribits/examples/MixedSharedStaticLibs/static_only/CMakeLists.txt +++ b/cmake/tribits/examples/MixedSharedStaticLibs/static_only/CMakeLists.txt @@ -1,6 +1,6 @@ tribits_subpackage(StaticOnly) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library( static_only_lib diff --git a/cmake/tribits/examples/TargetDefinesPkg/CMakeLists.txt b/cmake/tribits/examples/TargetDefinesPkg/CMakeLists.txt index 4ca9cd0fa681..0952d5736ffd 100644 --- a/cmake/tribits/examples/TargetDefinesPkg/CMakeLists.txt +++ b/cmake/tribits/examples/TargetDefinesPkg/CMakeLists.txt @@ -1,6 +1,6 @@ tribits_package(TargetDefinesPkg) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library( targetdefinespkg diff --git a/cmake/tribits/examples/TribitsExampleProject/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/CMakeLists.txt index a44121b807fa..f413d381b010 100644 --- a/cmake/tribits/examples/TribitsExampleProject/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/CMakeLists.txt @@ -27,6 +27,8 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/ProjectName.cmake") # not in an include file :-( project(${PROJECT_NAME} NONE) +set(TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE TRUE) + # # B) Pull in the TriBITS system and execute # diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/mixed_lang/src/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/mixed_lang/src/CMakeLists.txt index a8d33b430650..ddbeb6658fe0 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/mixed_lang/src/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/mixed_lang/src/CMakeLists.txt @@ -4,12 +4,12 @@ tribits_configure_file(${PACKAGE_NAME}_config.h) set(HEADERS "") set(SOURCES "") -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) append_set(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) append_set(HEADERS MixedLang.hpp Ray_Tracer.hh diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/src/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/src/CMakeLists.txt index d00de0da8757..234a196d5144 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/src/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/src/CMakeLists.txt @@ -11,12 +11,12 @@ tribits_configure_file(${PACKAGE_NAME}_config.h) set(HEADERS "") set(SOURCES "") -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) append_set(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) append_set(HEADERS SimpleCxx_HelloWorld.hpp ) diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/CMakeLists.txt index 4b39105c91bc..f553d4ef2bc9 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/CMakeLists.txt @@ -1,3 +1,6 @@ +tribits_include_directories( REQUIRED_DURING_INSTALLATION_TESTING + ${CMAKE_CURRENT_SOURCE_DIR}/inc ) + tribits_add_executable_and_test( HelloWorldTests SOURCES diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/SimpleCxx_HelloWorld_Tests.cpp b/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/SimpleCxx_HelloWorld_Tests.cpp index 575555ffbe59..85430c8cffea 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/SimpleCxx_HelloWorld_Tests.cpp +++ b/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/SimpleCxx_HelloWorld_Tests.cpp @@ -1,9 +1,4 @@ - -#include -#include -#include -#include "SimpleCxx_HelloWorld.hpp" -#include "HeaderOnlyTpl_stuff.hpp" +#include "SimpleCxx_HelloWorld_Tests.hpp" #define TEST_FIND_SUBSTR_IN_STR(SUBSTR, STR) \ diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/inc/SimpleCxx_HelloWorld_Tests.hpp b/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/inc/SimpleCxx_HelloWorld_Tests.hpp new file mode 100644 index 000000000000..78b70ccc3d89 --- /dev/null +++ b/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/inc/SimpleCxx_HelloWorld_Tests.hpp @@ -0,0 +1,10 @@ +#ifndef SIMPLECXX_HELLOWORLD_TESTS_HPP +#define SIMPLECXX_HELLOWORLD_TESTS_HPP + +#include +#include +#include +#include "SimpleCxx_HelloWorld.hpp" +#include "HeaderOnlyTpl_stuff.hpp" + +#endif // SIMPLECXX_HELLOWORLD_TESTS_HPP diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/a/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/a/CMakeLists.txt index e7cdf9cf6f63..9de350b0a25a 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/a/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/a/CMakeLists.txt @@ -16,9 +16,9 @@ tribits_pkg_export_cache_var(${PACKAGE_NAME}_SPECIAL_VALUE) tribits_configure_file(${PACKAGE_NAME}_config.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library(pws_a SOURCES A.cpp HEADERS A.hpp ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/src/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/src/CMakeLists.txt index cde554625db3..0f64659a5c98 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/src/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/src/CMakeLists.txt @@ -1,10 +1,10 @@ tribits_configure_file(${PACKAGE_NAME}_config.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) include(${CMAKE_CURRENT_LIST_DIR}/ShowLibErrors.cmake) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library(pws_b SOURCES B.cpp HEADERS B.hpp ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/tests/testlib/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/tests/testlib/CMakeLists.txt index 407fc6a27fe7..215659e60f2b 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/tests/testlib/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/tests/testlib/CMakeLists.txt @@ -1,6 +1,6 @@ # Define the include dirs for the TESTONLY lib. -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) # # Create a test-only b_mixed_lang lib which uses the optional test dependent diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/c/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/c/CMakeLists.txt index 475912fac4ab..696a5815c850 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/c/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/c/CMakeLists.txt @@ -7,7 +7,7 @@ tribits_add_executable( c_util include(${CMAKE_CURRENT_LIST_DIR}/ShowLibErrors.cmake) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library(pws_c SOURCES C.cpp HEADERS wsp_c/C.hpp diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/wrap_external/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/wrap_external/CMakeLists.txt index 3adfc2cdb90b..0efcd994f721 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/wrap_external/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/wrap_external/CMakeLists.txt @@ -145,7 +145,7 @@ add_dependencies(build_external_func pws_a) append_set(${PACKAGE_NAME}_LIB_TARGETS external_func) global_set(${PACKAGE_NAME}_LIBRARIES external_func pws_a) global_set(${PACKAGE_NAME}_HAS_NATIVE_LIBRARIES ON) -include_directories(${EXTERNAL_FUNC_SOURCE_DIR}) +tribits_include_directories(${EXTERNAL_FUNC_SOURCE_DIR}) # NOTE: Above, you have to add the upstream dependent libraries to the current # package's list of libraries because you can't link to an importing lib with # link_target_libraries() :-( diff --git a/cmake/tribits/examples/TribitsExampleProject2/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject2/CMakeLists.txt index 661cb556e0a0..8e63bc40e843 100644 --- a/cmake/tribits/examples/TribitsExampleProject2/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject2/CMakeLists.txt @@ -7,6 +7,7 @@ cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR) include("${CMAKE_CURRENT_SOURCE_DIR}/ProjectName.cmake") project(${PROJECT_NAME} LANGUAGES NONE) +set(TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE TRUE) set(${PROJECT_NAME}_TRIBITS_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." CACHE STRING "TriBITS base directory (default assumes in TriBITS source tree)") diff --git a/cmake/tribits/examples/TribitsExampleProject2/packages/package1/src/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject2/packages/package1/src/CMakeLists.txt index a0d23199e246..b74162bb25ed 100644 --- a/cmake/tribits/examples/TribitsExampleProject2/packages/package1/src/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject2/packages/package1/src/CMakeLists.txt @@ -1,7 +1,7 @@ set(HEADERS "") set(SOURCES "") -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) append_set(HEADERS Package1.hpp diff --git a/cmake/tribits/examples/TribitsExampleProject2/packages/package2/src/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject2/packages/package2/src/CMakeLists.txt index 1de2194cb03a..5f95a0ef0b9a 100644 --- a/cmake/tribits/examples/TribitsExampleProject2/packages/package2/src/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject2/packages/package2/src/CMakeLists.txt @@ -2,9 +2,9 @@ set(HEADERS "") set(SOURCES "") tribits_configure_file(${PACKAGE_NAME}_config.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) append_set(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h diff --git a/cmake/tribits/examples/TribitsExampleProject2/packages/package3/src/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject2/packages/package3/src/CMakeLists.txt index ffe0ecc60d12..8b36f56b97af 100644 --- a/cmake/tribits/examples/TribitsExampleProject2/packages/package3/src/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject2/packages/package3/src/CMakeLists.txt @@ -2,9 +2,9 @@ set(HEADERS "") set(SOURCES "") tribits_configure_file(${PACKAGE_NAME}_config.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) append_set(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h diff --git a/cmake/tribits/examples/TribitsExampleProjectAddons/packages/addon1/src/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProjectAddons/packages/addon1/src/CMakeLists.txt index d4fffaa075b4..c890968cdb23 100644 --- a/cmake/tribits/examples/TribitsExampleProjectAddons/packages/addon1/src/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProjectAddons/packages/addon1/src/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library(addon1 SOURCES Addon1.cpp HEADERS Addon1.hpp From 99dbebce608767c335cd05ed439d007b2dd05967 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:12:26 -0700 Subject: [PATCH 57/78] Ifpack2: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- packages/ifpack2/adapters/CMakeLists.txt | 4 ++-- packages/ifpack2/src/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ifpack2/adapters/CMakeLists.txt b/packages/ifpack2/adapters/CMakeLists.txt index 8429b54fed38..1b85a39b3aaf 100644 --- a/packages/ifpack2/adapters/CMakeLists.txt +++ b/packages/ifpack2/adapters/CMakeLists.txt @@ -8,14 +8,14 @@ SET(HEADERS "") SET(SOURCES "") IF(${PACKAGE_NAME}_ENABLE_ThyraTpetraAdapters) - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/thyra) + TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/thyra) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) ENDIF(${PACKAGE_NAME}_ENABLE_ThyraTpetraAdapters) # Must glob the binary dir last to get all of the auto-generated headers -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) # diff --git a/packages/ifpack2/src/CMakeLists.txt b/packages/ifpack2/src/CMakeLists.txt index 5051c20a2361..5e39aa9e18a6 100644 --- a/packages/ifpack2/src/CMakeLists.txt +++ b/packages/ifpack2/src/CMakeLists.txt @@ -188,7 +188,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) @@ -207,7 +207,7 @@ IF (${PACKAGE_NAME}_ENABLE_Experimental AND ${PACKAGE_NAME}_ENABLE_Lemon AND ${P ENDIF() # Must glob the binary dir last to get all of the auto-generated headers -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_SET(HEADERS ${DIR}/${PACKAGE_NAME}_config.h ) APPEND_SET(HEADERS ${DIR}/${PACKAGE_NAME}_ETIHelperMacros.h ) From 495eff2a13f3230293e0ef93f3cddb1e75c7976f Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:12:41 -0700 Subject: [PATCH 58/78] MiniTensor: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- packages/minitensor/src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/minitensor/src/CMakeLists.txt b/packages/minitensor/src/CMakeLists.txt index 95bbe00345ea..25aa03c8e889 100644 --- a/packages/minitensor/src/CMakeLists.txt +++ b/packages/minitensor/src/CMakeLists.txt @@ -8,7 +8,7 @@ SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.cc) From cdf0a03b0392ce843d0e8c59dab2a5d7e5b16bf0 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:13:05 -0700 Subject: [PATCH 59/78] ML: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- packages/ml/matlab/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ml/matlab/CMakeLists.txt b/packages/ml/matlab/CMakeLists.txt index 5d03ed431323..805c922b985b 100644 --- a/packages/ml/matlab/CMakeLists.txt +++ b/packages/ml/matlab/CMakeLists.txt @@ -13,7 +13,7 @@ if(TPL_ENABLE_MATLAB) TRIBITS_INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIRS}) # Must glob the binary dir last to get all of the auto-generated headers - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) + TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) # Debugging information IF (${PROJECT_NAME}_VERBOSE_CONFIGURE) From e4c1a4618786caff6cb4216ae5ef624ce9c8a164 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:13:20 -0700 Subject: [PATCH 60/78] MueLu: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- packages/muelu/adapters/CMakeLists.txt | 14 +++++++------- packages/muelu/matlab/bin/CMakeLists.txt | 2 +- packages/muelu/matlab/src/CMakeLists.txt | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/muelu/adapters/CMakeLists.txt b/packages/muelu/adapters/CMakeLists.txt index 1af97a7babac..07d06a1196c0 100644 --- a/packages/muelu/adapters/CMakeLists.txt +++ b/packages/muelu/adapters/CMakeLists.txt @@ -35,7 +35,7 @@ ENDIF() IF (${PACKAGE_NAME}_ENABLE_Epetra) TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra) - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/aztecoo) + TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/aztecoo) APPEND_SET(HEADERS epetra/MueLu_EpetraOperator.hpp @@ -56,7 +56,7 @@ ENDIF() # IF (${PACKAGE_NAME}_ENABLE_Tpetra) - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/tpetra) + TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/tpetra) APPEND_SET(HEADERS tpetra/MueLu_CreateTpetraPreconditioner.hpp @@ -88,7 +88,7 @@ ENDIF() # Stratimikos # IF (${PACKAGE_NAME}_ENABLE_Stratimikos) - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/stratimikos) + TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/stratimikos) APPEND_SET(SOURCES ${DIR}/Stratimikos_MueLuHelpers.cpp @@ -116,7 +116,7 @@ IF (${PACKAGE_NAME}_ENABLE_Stratimikos) # Tpetra specific extensions IF (${PACKAGE_NAME}_ENABLE_Stratimikos AND ${PACKAGE_NAME}_ENABLE_ThyraTpetraAdapters) - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/stratimikos) + TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/stratimikos) IF (${PACKAGE_NAME}_ENABLE_Teko AND ${PACKAGE_NAME}_ENABLE_Experimental) APPEND_SET(HEADERS ${DIR}/Thyra_MueLuTpetraQ2Q1PreconditionerFactory_decl.hpp @@ -129,7 +129,7 @@ ENDIF() IF (${PACKAGE_NAME}_ENABLE_AmgX) - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/amgx) + TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/amgx) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) @@ -206,13 +206,13 @@ ENDIF() ############################################ # Must glob the binary dir last to get all of the auto-generated headers -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) IF ("${SOURCES}" STREQUAL "") # always include at least one file in the adapters library. - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) + TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(SOURCES ${DIR}/muelu-trivial-adapter.cpp) ENDIF() TRIBITS_ADD_LIBRARY( diff --git a/packages/muelu/matlab/bin/CMakeLists.txt b/packages/muelu/matlab/bin/CMakeLists.txt index 66a449b6cf91..57c534d6c569 100644 --- a/packages/muelu/matlab/bin/CMakeLists.txt +++ b/packages/muelu/matlab/bin/CMakeLists.txt @@ -12,7 +12,7 @@ if(TPL_ENABLE_MATLAB) TRIBITS_INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIRS}) # Must glob the binary dir last to get all of the auto-generated headers - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) + TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) # Force the code into R2017b compatibility mode SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMX_COMPAT_64 -fPIC -DMATLAB_MEXCMD_RELEASE=R2017b") diff --git a/packages/muelu/matlab/src/CMakeLists.txt b/packages/muelu/matlab/src/CMakeLists.txt index 1f07082015a7..967f19485e8c 100644 --- a/packages/muelu/matlab/src/CMakeLists.txt +++ b/packages/muelu/matlab/src/CMakeLists.txt @@ -12,7 +12,7 @@ if(TPL_ENABLE_MATLAB) TRIBITS_INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIRS}) # Must glob the binary dir last to get all of the auto-generated headers - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) + TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) # Force the code into R2017b compatibility mode SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMX_COMPAT_64 -DMATLAB_MEXCMD_RELEASE=R2017b") From d0d5126652b0f7a7df4ce9ec1fbb52d14cfa0e2b Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:13:49 -0700 Subject: [PATCH 61/78] Percept: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- packages/percept/src/adapt/CMakeLists.txt | 12 ++++---- .../percept/src/adapt/main/CMakeLists.txt | 6 ++-- packages/percept/src/percept/CMakeLists.txt | 30 +++++++++---------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/percept/src/adapt/CMakeLists.txt b/packages/percept/src/adapt/CMakeLists.txt index 7591610b650c..7458d8ad62db 100644 --- a/packages/percept/src/adapt/CMakeLists.txt +++ b/packages/percept/src/adapt/CMakeLists.txt @@ -8,34 +8,34 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) -#SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/main) +#TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/main) #APPEND_GLOB(HEADERS ${DIR}/*.hpp) #APPEND_GLOB(SOURCES ${DIR}/*.cpp) #IF( TPL_ENABLE_OpenNURBS) IF( STK_ADAPT_HAS_GEOMETRY ) - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/geometry) + TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/geometry) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) ENDIF() -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/sierra_element) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/sierra_element) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) # Must glob the binary dir last to get all of the auto-generated headers -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_SET(HEADERS ${DIR}/${PACKAGE_NAME}_config.h ) #APPEND_GLOB(HEADERS ${DIR}/*.hpp) #APPEND_GLOB(SOURCES ${DIR}/*.cpp) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) TRIBITS_ADD_LIBRARY( adapt diff --git a/packages/percept/src/adapt/main/CMakeLists.txt b/packages/percept/src/adapt/main/CMakeLists.txt index 0a7213bd2044..d04770bcdefd 100644 --- a/packages/percept/src/adapt/main/CMakeLists.txt +++ b/packages/percept/src/adapt/main/CMakeLists.txt @@ -4,16 +4,16 @@ INCLUDE(TribitsLibraryMacros) #SET(HEADERS "") #SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/../percept/) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/../percept/) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) INCLUDE(TribitsAddExecutableAndTest) diff --git a/packages/percept/src/percept/CMakeLists.txt b/packages/percept/src/percept/CMakeLists.txt index 3c27455a8420..db7ee710ef0e 100644 --- a/packages/percept/src/percept/CMakeLists.txt +++ b/packages/percept/src/percept/CMakeLists.txt @@ -18,42 +18,42 @@ TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_search) SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/fixtures) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/fixtures) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/function) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/function) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/function/internal) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/function/internal) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/math) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/math) APPEND_GLOB(HEADERS ${DIR}/*.hpp) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/mesh/gen) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/mesh/gen) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) IF( STK_PERCEPT_HAS_GEOMETRY ) - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/mesh/geometry/kernel) + TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/mesh/geometry/kernel) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/mesh/mod/smoother) + TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/mesh/mod/smoother) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) ELSE() - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/mesh/mod/smoother) + TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/mesh/mod/smoother) APPEND_SET(HEADERS ${DIR}/JacobianUtil.hpp @@ -70,28 +70,28 @@ ELSE() ENDIF() -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/norm) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/norm) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/structured) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/structured) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/util) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/util) APPEND_GLOB(HEADERS ${DIR}/*.hpp) -#SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/verifier/mesh) +#TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/verifier/mesh) #APPEND_GLOB(HEADERS ${DIR}/*.hpp) #APPEND_GLOB(SOURCES ${DIR}/*.cpp) # Must glob the binary dir last to get all of the auto-generated headers -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_SET(HEADERS ${DIR}/${PACKAGE_NAME}_config.h ) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) TRIBITS_ADD_LIBRARY( percept From cdd89bb1f541dd4ca3b1884efc3c2835dd77d459 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:14:04 -0700 Subject: [PATCH 62/78] Pike: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- packages/pike/blackbox/src/CMakeLists.txt | 4 ++-- packages/pike/blackbox/test/models/CMakeLists.txt | 2 +- packages/pike/implicit/src/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/pike/blackbox/src/CMakeLists.txt b/packages/pike/blackbox/src/CMakeLists.txt index a7b11e4a6e9c..60361a06acb3 100644 --- a/packages/pike/blackbox/src/CMakeLists.txt +++ b/packages/pike/blackbox/src/CMakeLists.txt @@ -16,7 +16,7 @@ TRIBITS_CONFIGURE_FILE(Pike_BlackBox_config.hpp) SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) #IF (NOT ${PACKAGE_NAME}_ENABLE_EXPERIMENTAL) @@ -26,7 +26,7 @@ APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # Must glob the binary dir last to get all of the auto-generated headers -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) # diff --git a/packages/pike/blackbox/test/models/CMakeLists.txt b/packages/pike/blackbox/test/models/CMakeLists.txt index 90606ef39773..fa43542a472d 100644 --- a/packages/pike/blackbox/test/models/CMakeLists.txt +++ b/packages/pike/blackbox/test/models/CMakeLists.txt @@ -1,6 +1,6 @@ TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS "") SET(NOINSTALLHEADERS "") SET(SOURCES "") diff --git a/packages/pike/implicit/src/CMakeLists.txt b/packages/pike/implicit/src/CMakeLists.txt index aa67369acd0f..7b43f9f5db3a 100644 --- a/packages/pike/implicit/src/CMakeLists.txt +++ b/packages/pike/implicit/src/CMakeLists.txt @@ -11,13 +11,13 @@ INCLUDE(TrilinosCreateClientTemplateHeaders) SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # Must glob the binary dir last to get all of the auto-generated headers -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) # From 5b48da25894d0c00934b74c19a1e243c62a78846 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:14:22 -0700 Subject: [PATCH 63/78] ROL: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- .../rol/adapters/arrayfire/src/CMakeLists.txt | 2 +- .../rol/adapters/belos/src/CMakeLists.txt | 4 ++-- .../rol/adapters/eigen/src/CMakeLists.txt | 2 +- .../rol/adapters/epetra/src/CMakeLists.txt | 4 ++-- .../adapters/minitensor/src/CMakeLists.txt | 4 ++-- .../rol/adapters/sacado/src/CMakeLists.txt | 2 +- .../rol/adapters/teuchos/src/CMakeLists.txt | 8 +++---- .../rol/adapters/thyra/src/CMakeLists.txt | 4 ++-- .../rol/adapters/tpetra/src/CMakeLists.txt | 10 ++++----- .../rol/adapters/trikota/src/CMakeLists.txt | 4 ++-- packages/rol/src/CMakeLists.txt | 22 +++++++++---------- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/packages/rol/adapters/arrayfire/src/CMakeLists.txt b/packages/rol/adapters/arrayfire/src/CMakeLists.txt index 00eebc051433..4b1ff866bdb3 100644 --- a/packages/rol/adapters/arrayfire/src/CMakeLists.txt +++ b/packages/rol/adapters/arrayfire/src/CMakeLists.txt @@ -30,7 +30,7 @@ TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # IF (ROL_ENABLE_ArrayFireCPU) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) ENDIF() diff --git a/packages/rol/adapters/belos/src/CMakeLists.txt b/packages/rol/adapters/belos/src/CMakeLists.txt index 9b2512a5c44d..3fc82a96db2e 100644 --- a/packages/rol/adapters/belos/src/CMakeLists.txt +++ b/packages/rol/adapters/belos/src/CMakeLists.txt @@ -31,12 +31,12 @@ TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_Belos) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) diff --git a/packages/rol/adapters/eigen/src/CMakeLists.txt b/packages/rol/adapters/eigen/src/CMakeLists.txt index f2ad43b166cb..d596381c7cd3 100644 --- a/packages/rol/adapters/eigen/src/CMakeLists.txt +++ b/packages/rol/adapters/eigen/src/CMakeLists.txt @@ -31,7 +31,7 @@ TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_Eigen) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) diff --git a/packages/rol/adapters/epetra/src/CMakeLists.txt b/packages/rol/adapters/epetra/src/CMakeLists.txt index cd60f4fcc1a1..10d893fe17cf 100644 --- a/packages/rol/adapters/epetra/src/CMakeLists.txt +++ b/packages/rol/adapters/epetra/src/CMakeLists.txt @@ -31,11 +31,11 @@ TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_Epetra) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) diff --git a/packages/rol/adapters/minitensor/src/CMakeLists.txt b/packages/rol/adapters/minitensor/src/CMakeLists.txt index 03884f5e79b9..e22048ae7752 100644 --- a/packages/rol/adapters/minitensor/src/CMakeLists.txt +++ b/packages/rol/adapters/minitensor/src/CMakeLists.txt @@ -53,7 +53,7 @@ IF (ROL_ENABLE_Boost AND ROL_ENABLE_MiniTensor) # function/ROL_MiniTensor_InequalityConstraint.hpp # function/ROL_MiniTensor_InequalityConstraint_Def.hpp # ) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) @@ -70,7 +70,7 @@ IF (ROL_ENABLE_Boost AND ROL_ENABLE_MiniTensor) # sol/ROL_MiniTensor_MiniSolver_Def.hpp # ) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) diff --git a/packages/rol/adapters/sacado/src/CMakeLists.txt b/packages/rol/adapters/sacado/src/CMakeLists.txt index 842ad5038974..4167de176f83 100644 --- a/packages/rol/adapters/sacado/src/CMakeLists.txt +++ b/packages/rol/adapters/sacado/src/CMakeLists.txt @@ -31,7 +31,7 @@ TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_Sacado) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) diff --git a/packages/rol/adapters/teuchos/src/CMakeLists.txt b/packages/rol/adapters/teuchos/src/CMakeLists.txt index e7d8061db2ec..16f63e6d2ffd 100644 --- a/packages/rol/adapters/teuchos/src/CMakeLists.txt +++ b/packages/rol/adapters/teuchos/src/CMakeLists.txt @@ -26,21 +26,21 @@ TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_Teuchos) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) IF (ROL_ENABLE_pebbl) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/pebbl ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/pebbl ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) diff --git a/packages/rol/adapters/thyra/src/CMakeLists.txt b/packages/rol/adapters/thyra/src/CMakeLists.txt index f5959a80b579..3b69d8ac8d36 100644 --- a/packages/rol/adapters/thyra/src/CMakeLists.txt +++ b/packages/rol/adapters/thyra/src/CMakeLists.txt @@ -31,12 +31,12 @@ TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_Thyra) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) diff --git a/packages/rol/adapters/tpetra/src/CMakeLists.txt b/packages/rol/adapters/tpetra/src/CMakeLists.txt index 83b0ec3d4387..9d098ea1ddbd 100644 --- a/packages/rol/adapters/tpetra/src/CMakeLists.txt +++ b/packages/rol/adapters/tpetra/src/CMakeLists.txt @@ -33,17 +33,17 @@ TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_Tpetra) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/function ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) IF (ROL_ENABLE_Teuchos) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) @@ -51,13 +51,13 @@ IF (ROL_ENABLE_Tpetra) # add in the MPI code IF( TPL_ENABLE_MPI ) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/mpi ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/mpi ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) ENDIF() IF (ROL_ENABLE_pebbl) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/pebbl ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/pebbl ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) ENDIF() diff --git a/packages/rol/adapters/trikota/src/CMakeLists.txt b/packages/rol/adapters/trikota/src/CMakeLists.txt index f088c3892f59..aba705773d39 100644 --- a/packages/rol/adapters/trikota/src/CMakeLists.txt +++ b/packages/rol/adapters/trikota/src/CMakeLists.txt @@ -31,11 +31,11 @@ TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (ROL_ENABLE_TriKota) - SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol ) + TRIBITS_SET_AND_INC_DIRS( DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol ) TRIBITS_INCLUDE_DIRECTORIES( ${DIR} ) APPEND_GLOB(HEADERS ${DIR}/*.hpp) -# SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol) +# TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol) # TRIBITS_INCLUDE_DIRECTORIES(${DIR} # ${DIR}/sparse_grids # ) diff --git a/packages/rol/src/CMakeLists.txt b/packages/rol/src/CMakeLists.txt index 6723cd46bf17..cbe6458cd09b 100644 --- a/packages/rol/src/CMakeLists.txt +++ b/packages/rol/src/CMakeLists.txt @@ -81,7 +81,7 @@ APPEND_GLOB( HEADERS ${BLAS_DIR}/*.hpp ) # vector headers # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/vector) TRIBITS_INCLUDE_DIRECTORIES(${DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) @@ -89,7 +89,7 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp) # function headers # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/function) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/function) TRIBITS_INCLUDE_DIRECTORIES(${DIR} ${DIR}/dynamic ${DIR}/boundconstraint @@ -117,7 +117,7 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp # # step headers # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/step) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/step) TRIBITS_INCLUDE_DIRECTORIES(${DIR} ${DIR}/linesearch ${DIR}/trustregion @@ -147,7 +147,7 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp # algorithm headers # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/algorithm) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/algorithm) TRIBITS_INCLUDE_DIRECTORIES(${DIR} ${DIR}/TypeB ${DIR}/TypeE @@ -183,7 +183,7 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp # parameterlist headers # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/parameterlist) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/parameterlist) TRIBITS_INCLUDE_DIRECTORIES(${DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) @@ -191,14 +191,14 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp) # status test headers # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/status) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/status) TRIBITS_INCLUDE_DIRECTORIES(${DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) # # sol headers # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/sol) TRIBITS_INCLUDE_DIRECTORIES(${DIR}/function ${DIR}/function/distribution ${DIR}/function/expectationquad @@ -249,7 +249,7 @@ APPEND_GLOB(HEADERS ${DIR}/function/*.hpp # elementwise function headers # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/elementwise) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/elementwise) TRIBITS_INCLUDE_DIRECTORIES(${DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) @@ -257,7 +257,7 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp) # utils headers # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/utils) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/utils) TRIBITS_INCLUDE_DIRECTORIES(${DIR} ${DIR}/function_bindings) APPEND_GLOB(HEADERS ${DIR}/*.hpp @@ -267,7 +267,7 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp # zoo headers # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/zoo) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/zoo) TRIBITS_INCLUDE_DIRECTORIES(${DIR} ${DIR}/testproblems) APPEND_GLOB(HEADERS ${DIR}/*.hpp @@ -276,7 +276,7 @@ APPEND_GLOB(HEADERS ${DIR}/*.hpp # oed headers # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/oed) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/oed) TRIBITS_INCLUDE_DIRECTORIES(${DIR} ${DIR}/constraint ${DIR}/factors From 71b920f2b1915ca053fea4bbe6deb1f43c56d7a9 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:14:37 -0700 Subject: [PATCH 64/78] RTOp: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- packages/rtop/src/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/rtop/src/CMakeLists.txt b/packages/rtop/src/CMakeLists.txt index 674b845c8007..1a75b77150a8 100644 --- a/packages/rtop/src/CMakeLists.txt +++ b/packages/rtop/src/CMakeLists.txt @@ -19,7 +19,7 @@ SET(SOURCES "") # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) @@ -28,7 +28,7 @@ TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # src/interfaces # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/interfaces) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/interfaces) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) @@ -37,7 +37,7 @@ TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # src/support # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/support) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/support) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) APPEND_GLOB(HEADERS ${DIR}/*.h) @@ -48,7 +48,7 @@ TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # src/ops_lib # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/ops_lib) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/ops_lib) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) @@ -58,7 +58,7 @@ TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/lapack) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/lapack) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) @@ -68,7 +68,7 @@ TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # # Must glob the binary src dir last to get all of the generated headers -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_SET(HEADERS ${DIR}/${PACKAGE_NAME}_Config.h ) From d6e6c5d1fefec7a21e1f960f49031f277f234119 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:14:48 -0700 Subject: [PATCH 65/78] Rythmos: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- packages/rythmos/adapters/gaasp/src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rythmos/adapters/gaasp/src/CMakeLists.txt b/packages/rythmos/adapters/gaasp/src/CMakeLists.txt index f27702adad6d..5baf8668f0ab 100644 --- a/packages/rythmos/adapters/gaasp/src/CMakeLists.txt +++ b/packages/rythmos/adapters/gaasp/src/CMakeLists.txt @@ -13,10 +13,10 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_SET(HEADERS ${DIR}/${PACKAGE_NAME}_config.h ) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) From 434800a823e9012d8ffb289678b432b8b3a789f8 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:14:57 -0700 Subject: [PATCH 66/78] SEACAS: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- packages/seacas/libraries/exoIIv2for32/CMakeLists.txt | 2 +- packages/seacas/libraries/exodus/CMakeLists.txt | 2 +- packages/seacas/libraries/exodus_for/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/adios/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/catalyst/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/cgns/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/exodus/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/faodel/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/gen_struc/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/generated/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/init/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/main/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/text_mesh/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/transform/CMakeLists.txt | 2 +- packages/seacas/libraries/ioss/src/visualization/CMakeLists.txt | 2 +- packages/seacas/libraries/plt/CMakeLists.txt | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt b/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt index 5b680a8a5c27..0a93d767439f 100644 --- a/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt +++ b/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt @@ -9,7 +9,7 @@ TRIBITS_INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/test" ) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_ADD_LIBRARY( exoIIv2for32 diff --git a/packages/seacas/libraries/exodus/CMakeLists.txt b/packages/seacas/libraries/exodus/CMakeLists.txt index 41f6f30b25b1..1109158751ee 100644 --- a/packages/seacas/libraries/exodus/CMakeLists.txt +++ b/packages/seacas/libraries/exodus/CMakeLists.txt @@ -19,7 +19,7 @@ if (NOT ${EXODUS_THREADSAFE}) list(REMOVE_ITEM SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/ex_threadsafe.c) endif() -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS include/exodusII.h diff --git a/packages/seacas/libraries/exodus_for/CMakeLists.txt b/packages/seacas/libraries/exodus_for/CMakeLists.txt index c486de45012b..2ff709977506 100644 --- a/packages/seacas/libraries/exodus_for/CMakeLists.txt +++ b/packages/seacas/libraries/exodus_for/CMakeLists.txt @@ -12,7 +12,7 @@ TRIBITS_INCLUDE_DIRECTORIES( ) SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(SOURCES ${DIR}/src/*.c ${DIR}/src/*.F) LIST(REMOVE_ITEM SOURCES "${DIR}/src/exo_jack-windows.c") diff --git a/packages/seacas/libraries/ioss/src/CMakeLists.txt b/packages/seacas/libraries/ioss/src/CMakeLists.txt index d74000f78d13..c6cd4fc32833 100644 --- a/packages/seacas/libraries/ioss/src/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/CMakeLists.txt @@ -48,7 +48,7 @@ IF (NOT TPL_ENABLE_ParMETIS) ADD_DEFINITIONS(-DNO_PARMETIS_SUPPORT) ENDIF() -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/Ioss_*.h) APPEND_GLOB(HEADERS ${DIR}/*hopscotch*.h) APPEND_GLOB(HEADERS ${DIR}/robin*.h) diff --git a/packages/seacas/libraries/ioss/src/adios/CMakeLists.txt b/packages/seacas/libraries/ioss/src/adios/CMakeLists.txt index cfb59559c276..b57478459103 100644 --- a/packages/seacas/libraries/ioss/src/adios/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/adios/CMakeLists.txt @@ -1,7 +1,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h*) APPEND_GLOB(SOURCES ${DIR}/*.C) diff --git a/packages/seacas/libraries/ioss/src/catalyst/CMakeLists.txt b/packages/seacas/libraries/ioss/src/catalyst/CMakeLists.txt index 49fb5a0bd932..7ee0946b9039 100644 --- a/packages/seacas/libraries/ioss/src/catalyst/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/catalyst/CMakeLists.txt @@ -1,7 +1,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h*) APPEND_GLOB(SOURCES ${DIR}/*.C) diff --git a/packages/seacas/libraries/ioss/src/cgns/CMakeLists.txt b/packages/seacas/libraries/ioss/src/cgns/CMakeLists.txt index dd5625aa2817..0e7c7c4a23c6 100644 --- a/packages/seacas/libraries/ioss/src/cgns/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/cgns/CMakeLists.txt @@ -14,7 +14,7 @@ ELSE() ENDIF() ENDIF() -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) diff --git a/packages/seacas/libraries/ioss/src/exodus/CMakeLists.txt b/packages/seacas/libraries/ioss/src/exodus/CMakeLists.txt index 57ed38878839..3c7aa953ca87 100644 --- a/packages/seacas/libraries/ioss/src/exodus/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/exodus/CMakeLists.txt @@ -2,7 +2,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) diff --git a/packages/seacas/libraries/ioss/src/faodel/CMakeLists.txt b/packages/seacas/libraries/ioss/src/faodel/CMakeLists.txt index a1efc7ba75a2..6d7203df36cd 100644 --- a/packages/seacas/libraries/ioss/src/faodel/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/faodel/CMakeLists.txt @@ -1,7 +1,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) diff --git a/packages/seacas/libraries/ioss/src/gen_struc/CMakeLists.txt b/packages/seacas/libraries/ioss/src/gen_struc/CMakeLists.txt index eb791e956021..ee920059c989 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/gen_struc/CMakeLists.txt @@ -1,7 +1,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) diff --git a/packages/seacas/libraries/ioss/src/generated/CMakeLists.txt b/packages/seacas/libraries/ioss/src/generated/CMakeLists.txt index 88d73a65ca98..2f3d3283e76a 100644 --- a/packages/seacas/libraries/ioss/src/generated/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/generated/CMakeLists.txt @@ -2,7 +2,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) diff --git a/packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt b/packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt index 092cda7bb5df..04c879739885 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt @@ -2,7 +2,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) diff --git a/packages/seacas/libraries/ioss/src/init/CMakeLists.txt b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt index acb0c0d9262a..50073939170c 100644 --- a/packages/seacas/libraries/ioss/src/init/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt @@ -2,7 +2,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) diff --git a/packages/seacas/libraries/ioss/src/main/CMakeLists.txt b/packages/seacas/libraries/ioss/src/main/CMakeLists.txt index 742ebe0ebda9..9bea1013c5a0 100644 --- a/packages/seacas/libraries/ioss/src/main/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/main/CMakeLists.txt @@ -1,7 +1,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) diff --git a/packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt b/packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt index 6e6d311babc5..f57d7a440d54 100644 --- a/packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt @@ -2,7 +2,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) diff --git a/packages/seacas/libraries/ioss/src/text_mesh/CMakeLists.txt b/packages/seacas/libraries/ioss/src/text_mesh/CMakeLists.txt index cd18aa547de7..3f7715018fad 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/text_mesh/CMakeLists.txt @@ -2,7 +2,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) diff --git a/packages/seacas/libraries/ioss/src/transform/CMakeLists.txt b/packages/seacas/libraries/ioss/src/transform/CMakeLists.txt index 292f9698531b..340ca1dd0654 100644 --- a/packages/seacas/libraries/ioss/src/transform/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/transform/CMakeLists.txt @@ -2,7 +2,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) diff --git a/packages/seacas/libraries/ioss/src/visualization/CMakeLists.txt b/packages/seacas/libraries/ioss/src/visualization/CMakeLists.txt index a3db7f2ddc05..d5186c3063d6 100644 --- a/packages/seacas/libraries/ioss/src/visualization/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/visualization/CMakeLists.txt @@ -2,7 +2,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/cgns/*.h) APPEND_GLOB(SOURCES ${DIR}/cgns/*.C) APPEND_GLOB(HEADERS ${DIR}/exodus/*.h) diff --git a/packages/seacas/libraries/plt/CMakeLists.txt b/packages/seacas/libraries/plt/CMakeLists.txt index b2a67a10b9e5..3ef04a6090ad 100644 --- a/packages/seacas/libraries/plt/CMakeLists.txt +++ b/packages/seacas/libraries/plt/CMakeLists.txt @@ -9,7 +9,7 @@ SET(PLT_VERSION "${PLT_VERSION_MAJOR}.${PLT_VERSION_MINOR}") SET(PLT_VERSION_FULL "${PLT_VERSION}.${PLT_VERSION_PATCH}") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(SOURCES ${DIR}/*.f ${DIR}/*.F ${DIR}/*.c) From b859bfe95b30f0cd8870fdf60548554fb5731406 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:15:12 -0700 Subject: [PATCH 67/78] Stratimikos: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- packages/stratimikos/adapters/amesos2/src/CMakeLists.txt | 2 +- packages/stratimikos/adapters/belos/src/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/stratimikos/adapters/amesos2/src/CMakeLists.txt b/packages/stratimikos/adapters/amesos2/src/CMakeLists.txt index 0aec51dcd3d2..a8161296174f 100644 --- a/packages/stratimikos/adapters/amesos2/src/CMakeLists.txt +++ b/packages/stratimikos/adapters/amesos2/src/CMakeLists.txt @@ -3,7 +3,7 @@ INCLUDE(TrilinosCreateClientTemplateHeaders) SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) diff --git a/packages/stratimikos/adapters/belos/src/CMakeLists.txt b/packages/stratimikos/adapters/belos/src/CMakeLists.txt index d409d884f7d8..eddb15893bc7 100644 --- a/packages/stratimikos/adapters/belos/src/CMakeLists.txt +++ b/packages/stratimikos/adapters/belos/src/CMakeLists.txt @@ -4,13 +4,13 @@ INCLUDE(TrilinosCreateClientTemplateHeaders) SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(srcDir ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(srcDir ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${srcDir}/*.hpp) APPEND_GLOB(SOURCES ${srcDir}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${srcDir}) IF(${PACKAGE_NAME}_ENABLE_ThyraTpetraAdapters) -SET_AND_INC_DIRS(tpetraSrcDir ${CMAKE_CURRENT_SOURCE_DIR}/tpetra) +TRIBITS_SET_AND_INC_DIRS(tpetraSrcDir ${CMAKE_CURRENT_SOURCE_DIR}/tpetra) ENDIF() APPEND_GLOB(HEADERS ${tpetraSrcDir}/*.hpp) From 6130ea6e999c0400c25e8844027ccdf5d50fa547 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:15:37 -0700 Subject: [PATCH 68/78] Tempus: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- packages/tempus/src/CMakeLists.txt | 4 ++-- packages/tempus/src/deprecated/CMakeLists.txt | 2 +- packages/tempus/test/TestModels/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/tempus/src/CMakeLists.txt b/packages/tempus/src/CMakeLists.txt index 8179b94dd19b..53bc917abad0 100644 --- a/packages/tempus/src/CMakeLists.txt +++ b/packages/tempus/src/CMakeLists.txt @@ -6,14 +6,14 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.hpp) SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) # Must glob the binary dir last to get all of the # auto-generated ETI headers TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) TRIBITS_ADD_LIBRARY( diff --git a/packages/tempus/src/deprecated/CMakeLists.txt b/packages/tempus/src/deprecated/CMakeLists.txt index 8a08229a4b6f..b7c35a3efda8 100644 --- a/packages/tempus/src/deprecated/CMakeLists.txt +++ b/packages/tempus/src/deprecated/CMakeLists.txt @@ -1,7 +1,7 @@ set(HEADERS "") set(SOURCES "") -set_and_inc_dirs(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +tribits_set_and_inc_dirs(DIR ${CMAKE_CURRENT_SOURCE_DIR}) append_glob(HEADERS ${DIR}/*.hpp) append_glob(SOURCES ${DIR}/*.cpp) diff --git a/packages/tempus/test/TestModels/CMakeLists.txt b/packages/tempus/test/TestModels/CMakeLists.txt index 0a82ec345018..0a716c2625d2 100644 --- a/packages/tempus/test/TestModels/CMakeLists.txt +++ b/packages/tempus/test/TestModels/CMakeLists.txt @@ -6,14 +6,14 @@ SET(SOURCES "") TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) # Must glob the binary dir last to get all of the # auto-generated ETI headers TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) TRIBITS_ADD_LIBRARY( From 2c9c907a29639f494b2405ee7d7793a7207e9c4c Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:15:48 -0700 Subject: [PATCH 69/78] Teuchos: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- packages/teuchos/comm/src/CMakeLists.txt | 2 +- packages/teuchos/core/src/CMakeLists.txt | 2 +- packages/teuchos/numerics/src/CMakeLists.txt | 2 +- packages/teuchos/parameterlist/src/CMakeLists.txt | 2 +- packages/teuchos/parser/src/CMakeLists.txt | 2 +- packages/teuchos/remainder/src/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/teuchos/comm/src/CMakeLists.txt b/packages/teuchos/comm/src/CMakeLists.txt index b4f800dbfbcf..6cab915529d1 100644 --- a/packages/teuchos/comm/src/CMakeLists.txt +++ b/packages/teuchos/comm/src/CMakeLists.txt @@ -9,7 +9,7 @@ SET(SOURCES "") TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) diff --git a/packages/teuchos/core/src/CMakeLists.txt b/packages/teuchos/core/src/CMakeLists.txt index 5b560b0e9fb7..8b547b4d4a18 100644 --- a/packages/teuchos/core/src/CMakeLists.txt +++ b/packages/teuchos/core/src/CMakeLists.txt @@ -62,7 +62,7 @@ APPEND_SET(HEADERS TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(HEADERS ${DIR}/*.c) APPEND_GLOB(HEADERS ${DIR}/*.hpp) diff --git a/packages/teuchos/numerics/src/CMakeLists.txt b/packages/teuchos/numerics/src/CMakeLists.txt index b8a722e0d14d..6d28cc546fa3 100644 --- a/packages/teuchos/numerics/src/CMakeLists.txt +++ b/packages/teuchos/numerics/src/CMakeLists.txt @@ -9,7 +9,7 @@ SET(SOURCES "") TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) diff --git a/packages/teuchos/parameterlist/src/CMakeLists.txt b/packages/teuchos/parameterlist/src/CMakeLists.txt index c61642b40e2e..74e2651a65d7 100644 --- a/packages/teuchos/parameterlist/src/CMakeLists.txt +++ b/packages/teuchos/parameterlist/src/CMakeLists.txt @@ -9,7 +9,7 @@ SET(SOURCES "") TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) diff --git a/packages/teuchos/parser/src/CMakeLists.txt b/packages/teuchos/parser/src/CMakeLists.txt index 9c82d55611aa..78594cdf9126 100644 --- a/packages/teuchos/parser/src/CMakeLists.txt +++ b/packages/teuchos/parser/src/CMakeLists.txt @@ -4,7 +4,7 @@ TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS "${DIR}/Teuchos_FiniteAutomaton.hpp" diff --git a/packages/teuchos/remainder/src/CMakeLists.txt b/packages/teuchos/remainder/src/CMakeLists.txt index 19a92176e1d4..6cead79d7d56 100644 --- a/packages/teuchos/remainder/src/CMakeLists.txt +++ b/packages/teuchos/remainder/src/CMakeLists.txt @@ -15,7 +15,7 @@ APPEND_SET(HEADERS TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) From a7b089c43fb91b1750fcb1886458cbc8f9ca62d9 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:15:58 -0700 Subject: [PATCH 70/78] Thyra: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- .../thyra/adapters/epetra/src/CMakeLists.txt | 2 +- .../adapters/epetraext/src/CMakeLists.txt | 4 +-- .../thyra/adapters/tpetra/src/CMakeLists.txt | 2 +- packages/thyra/core/src/CMakeLists.txt | 28 +++++++++---------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/thyra/adapters/epetra/src/CMakeLists.txt b/packages/thyra/adapters/epetra/src/CMakeLists.txt index 944e66e09539..ebddffe930b1 100644 --- a/packages/thyra/adapters/epetra/src/CMakeLists.txt +++ b/packages/thyra/adapters/epetra/src/CMakeLists.txt @@ -4,7 +4,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) diff --git a/packages/thyra/adapters/epetraext/src/CMakeLists.txt b/packages/thyra/adapters/epetraext/src/CMakeLists.txt index 58176abadbd2..ac98457e5782 100644 --- a/packages/thyra/adapters/epetraext/src/CMakeLists.txt +++ b/packages/thyra/adapters/epetraext/src/CMakeLists.txt @@ -3,11 +3,11 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/model_evaluator) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/model_evaluator) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/transformer) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/transformer) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) diff --git a/packages/thyra/adapters/tpetra/src/CMakeLists.txt b/packages/thyra/adapters/tpetra/src/CMakeLists.txt index 8d5d0693b8bd..41e7f85eac23 100644 --- a/packages/thyra/adapters/tpetra/src/CMakeLists.txt +++ b/packages/thyra/adapters/tpetra/src/CMakeLists.txt @@ -4,7 +4,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) diff --git a/packages/thyra/core/src/CMakeLists.txt b/packages/thyra/core/src/CMakeLists.txt index 874b435d2148..f9bb39b5f714 100644 --- a/packages/thyra/core/src/CMakeLists.txt +++ b/packages/thyra/core/src/CMakeLists.txt @@ -14,71 +14,71 @@ TRIBITS_CONFIGURE_FILE(${PARENT_PACKAGE_NAME}_Config.h) SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/operator_vector/fundamental) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/operator_vector/fundamental) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(HEADERS ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/operator_vector/extended) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/operator_vector/extended) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/support/operator_vector/client_support) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/support/operator_vector/client_support) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/support/operator_vector/adapter_support) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/support/operator_vector/adapter_support) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/operator_solve/fundamental) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/operator_solve/fundamental) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/operator_solve/extended) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/operator_solve/extended) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/support/operator_solve/client_support) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/support/operator_solve/client_support) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/nonlinear/model_evaluator/fundamental) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/nonlinear/model_evaluator/fundamental) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/support/nonlinear/model_evaluator/client_support) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/support/nonlinear/model_evaluator/client_support) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/nonlinear/solvers/fundamental) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/nonlinear/solvers/fundamental) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/support/nonlinear/solvers/client_support) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/support/nonlinear/solvers/client_support) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # Must glob the binary dir last to get all of the auto-generated headers -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_SET(HEADERS ${DIR}/${PARENT_PACKAGE_NAME}_Config.h ) -SET_AND_INC_DIRS(DIR ${PACKAGE_SOURCE_DIR}/example/operator_vector) +TRIBITS_SET_AND_INC_DIRS(DIR ${PACKAGE_SOURCE_DIR}/example/operator_vector) APPEND_SET(HEADERS ${DIR}/sillyModifiedGramSchmidt.hpp) # From a239283d96afabf863abc5b3a0787a19e4484a36 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:16:12 -0700 Subject: [PATCH 71/78] Tpetra: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- packages/tpetra/core/compat/CMakeLists.txt | 4 ++-- packages/tpetra/core/ext/CMakeLists.txt | 4 ++-- packages/tpetra/core/inout/CMakeLists.txt | 4 ++-- packages/tpetra/core/src/CMakeLists.txt | 6 +++--- packages/tpetra/core/test/PerformanceCGSolve/CMakeLists.txt | 2 +- packages/tpetra/tsqr/src/CMakeLists.txt | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/tpetra/core/compat/CMakeLists.txt b/packages/tpetra/core/compat/CMakeLists.txt index 1bfa586793dc..7c95994c8ece 100644 --- a/packages/tpetra/core/compat/CMakeLists.txt +++ b/packages/tpetra/core/compat/CMakeLists.txt @@ -11,13 +11,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) # Must glob the binary dir last to get all of the auto-generated headers -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_SET(HEADERS ${DIR}/${PACKAGE_NAME}_config.h ) diff --git a/packages/tpetra/core/ext/CMakeLists.txt b/packages/tpetra/core/ext/CMakeLists.txt index 7bf20f6af7ce..f8b3c797870b 100644 --- a/packages/tpetra/core/ext/CMakeLists.txt +++ b/packages/tpetra/core/ext/CMakeLists.txt @@ -27,13 +27,13 @@ SET(SOURCES "") # # general headers, sources -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(HEADERS ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # Must glob the binary dir last to get all of the auto-generated headers -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) # diff --git a/packages/tpetra/core/inout/CMakeLists.txt b/packages/tpetra/core/inout/CMakeLists.txt index aee3ce8595e0..12acea8dd791 100644 --- a/packages/tpetra/core/inout/CMakeLists.txt +++ b/packages/tpetra/core/inout/CMakeLists.txt @@ -27,13 +27,13 @@ SET(SOURCES "") # # general headers, sources -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.cpp ${DIR}/*.c) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # Must glob the binary dir last to get all of the auto-generated headers -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) # diff --git a/packages/tpetra/core/src/CMakeLists.txt b/packages/tpetra/core/src/CMakeLists.txt index 02b4d05e1d57..7d9abac8c604 100644 --- a/packages/tpetra/core/src/CMakeLists.txt +++ b/packages/tpetra/core/src/CMakeLists.txt @@ -640,20 +640,20 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # Pull in the Kokkos refactor code. -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/kokkos_refactor) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/kokkos_refactor) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # Must glob the binary dir last to get all of the auto-generated headers -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_SET(HEADERS ${DIR}/${PACKAGE_NAME}_config.h ) APPEND_SET(HEADERS ${DIR}/${PACKAGE_NAME}_ETIHelperMacros.h) diff --git a/packages/tpetra/core/test/PerformanceCGSolve/CMakeLists.txt b/packages/tpetra/core/test/PerformanceCGSolve/CMakeLists.txt index 77e9459091ac..27b6f90df68b 100644 --- a/packages/tpetra/core/test/PerformanceCGSolve/CMakeLists.txt +++ b/packages/tpetra/core/test/PerformanceCGSolve/CMakeLists.txt @@ -1,4 +1,4 @@ -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) # The performance test currently depends on KokkosCore for its timers. # Otherwise, it does not use anything else in KokkosCore directly. diff --git a/packages/tpetra/tsqr/src/CMakeLists.txt b/packages/tpetra/tsqr/src/CMakeLists.txt index 4c189243d6e4..c920e7f4a5a4 100644 --- a/packages/tpetra/tsqr/src/CMakeLists.txt +++ b/packages/tpetra/tsqr/src/CMakeLists.txt @@ -5,7 +5,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # Add this subpackage's generated header file to the list of header From e0ea232e3e4f18ec2d3d4c77b7231a0825dda704 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:16:21 -0700 Subject: [PATCH 72/78] Xpetra: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- packages/xpetra/src/CMakeLists.txt | 44 +++++++++++++++--------------- packages/xpetra/sup/CMakeLists.txt | 8 +++--- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/xpetra/src/CMakeLists.txt b/packages/xpetra/src/CMakeLists.txt index 0e17858b94ac..8abc495c3bdf 100644 --- a/packages/xpetra/src/CMakeLists.txt +++ b/packages/xpetra/src/CMakeLists.txt @@ -118,7 +118,7 @@ TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}/Vector TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}/Import NOSIERRABJAM) -#SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +#TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) # mfh 18 Dec 2014: The "real" Kokkos(Classic) is now the TpetraClassic # subpackage of Tpetra. Thus, we have to test whether Tpetra is @@ -129,29 +129,29 @@ TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}/Import # #IF (NOT ${PROJECT_NAME}_ENABLE_Kokkos) IF (NOT ${PROJECT_NAME}_ENABLE_Tpetra) - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/FakeKokkos) + TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/FakeKokkos) APPEND_GLOB(HEADERS FakeKokkos/*.hpp) ENDIF() -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/CrsGraph) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/CrsMatrix) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/BlockedCrsMatrix) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/DistObject) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Export) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Headers) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Import) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Map) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/BlockedMap) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/MultiVector) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/BlockedMultiVector) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/BlockedVector) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Operator) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Platform) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/RowGraph) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/RowMatrix) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utils) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utils/ForwardDeclaration) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Vector) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/CrsGraph) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/CrsMatrix) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/BlockedCrsMatrix) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/DistObject) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Export) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Headers) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Import) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Map) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/BlockedMap) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/MultiVector) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/BlockedMultiVector) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/BlockedVector) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Operator) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Platform) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/RowGraph) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/RowMatrix) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utils) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utils/ForwardDeclaration) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Vector) APPEND_GLOB(SOURCES BlockedCrsMatrix/*.cpp) @@ -180,7 +180,7 @@ APPEND_GLOB(HEADERS Vector/*.hpp) #TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # Must glob the binary dir last to get all of the auto-generated headers -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) # diff --git a/packages/xpetra/sup/CMakeLists.txt b/packages/xpetra/sup/CMakeLists.txt index 5837881c774b..5a035deaa473 100644 --- a/packages/xpetra/sup/CMakeLists.txt +++ b/packages/xpetra/sup/CMakeLists.txt @@ -93,14 +93,14 @@ TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${CMAKE_CURRENT_SOURCE_DIR}/StridedMap N # # -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Matrix) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/StridedMap) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utils) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Matrix) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/StridedMap) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utils) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # Must glob the binary dir last to get all of the auto-generated headers -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) # From eca14d30db5353980e917a12a4cade38727af5ed Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 10:16:36 -0700 Subject: [PATCH 73/78] Zoltan2: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This change wsa made with the TriBITS script: TriBITS/refactoring/replace_set_and_inc_dirs_r.sh --- packages/zoltan2/core/src/CMakeLists.txt | 2 +- packages/zoltan2/sphynx/src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/zoltan2/core/src/CMakeLists.txt b/packages/zoltan2/core/src/CMakeLists.txt index 27e0c777a468..a0cd04d0c384 100644 --- a/packages/zoltan2/core/src/CMakeLists.txt +++ b/packages/zoltan2/core/src/CMakeLists.txt @@ -49,7 +49,7 @@ SET(SOURCES "") ##KDD APPEND_GLOB(HEADERS ${PARAM_HEADER}) -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/algorithms/*.hpp) APPEND_GLOB(SOURCES ${DIR}/algorithms/*.cpp) diff --git a/packages/zoltan2/sphynx/src/CMakeLists.txt b/packages/zoltan2/sphynx/src/CMakeLists.txt index d05c717f076c..224339826611 100644 --- a/packages/zoltan2/sphynx/src/CMakeLists.txt +++ b/packages/zoltan2/sphynx/src/CMakeLists.txt @@ -15,7 +15,7 @@ SET(HEADERS "") SET(SOURCES "") -SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) From 03df3a0672e9aaa7802c9b37b3fb114c68e5b313 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 20 Dec 2022 11:35:29 -0700 Subject: [PATCH 74/78] Automatic snapshot commit from tribits at c2f52215 Origin repo remote tracking branch: 'github/master' Origin repo remote repo URL: 'github = git@github.com:TriBITSPub/TriBITS.git' Git describe: Vera4.0-RC1-start-1418-g3879de00 At commit: commit c2f52215a2bf6d1004c5422164f0019952fcc1f2 Author: Roscoe A. Bartlett Date: Tue Dec 20 11:15:04 2022 -0700 Summary: Add RUN_SERIAL to tribits_add_executable_and_test() (#554) --- .../core/package_arch/TribitsAddExecutableAndTest.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/tribits/core/package_arch/TribitsAddExecutableAndTest.cmake b/cmake/tribits/core/package_arch/TribitsAddExecutableAndTest.cmake index 264c96d534df..73148b8a8a76 100644 --- a/cmake/tribits/core/package_arch/TribitsAddExecutableAndTest.cmake +++ b/cmake/tribits/core/package_arch/TribitsAddExecutableAndTest.cmake @@ -106,6 +106,7 @@ endmacro() # [COMM [serial] [mpi]] # [ARGS " ..." " ..." ...] # [NUM_MPI_PROCS ] +# [RUN_SERIAL] # [LINKER_LANGUAGE (C|CXX|Fortran)] # [STANDARD_PASS_OUTPUT # | PASS_REGULAR_EXPRESSION ";;..."] @@ -167,7 +168,7 @@ function(tribits_add_executable_and_test EXE_NAME) #prefix PARSE #options - "STANDARD_PASS_OUTPUT;WILL_FAIL;ADD_DIR_TO_NAME;INSTALLABLE;NOEXEPREFIX;NOEXESUFFIX" + "RUN_SERIAL;STANDARD_PASS_OUTPUT;WILL_FAIL;ADD_DIR_TO_NAME;INSTALLABLE;NOEXEPREFIX;NOEXESUFFIX" #one_value_keywords "DISABLED" #mulit_value_keywords @@ -249,6 +250,7 @@ function(tribits_add_executable_and_test EXE_NAME) tribits_fwd_parse_arg(CALL_ARGS FAIL_REGULAR_EXPRESSION) tribits_fwd_parse_arg(CALL_ARGS ENVIRONMENT) tribits_fwd_parse_arg(CALL_ARGS DISABLED) + tribits_fwd_parse_opt(CALL_ARGS RUN_SERIAL) tribits_fwd_parse_opt(CALL_ARGS STANDARD_PASS_OUTPUT) tribits_fwd_parse_opt(CALL_ARGS WILL_FAIL) tribits_fwd_parse_arg(CALL_ARGS TIMEOUT) From 4ac12c25a6726c1029d0054f38bc2c258f8aba94 Mon Sep 17 00:00:00 2001 From: Christian Glusa Date: Thu, 22 Dec 2022 09:48:06 -0700 Subject: [PATCH 75/78] Belos: Silence warnings --- .../kokkos/example/BlockCGKokkosExFile.cpp | 1 - .../kokkos/example/BlockGmresKokkosExFile.cpp | 1 - packages/belos/src/BelosMinresSolMgr.hpp | 3 +- .../tpetra/src/BelosTpetraTestFramework.hpp | 2 - .../tpetra/src/solvers/Belos_Tpetra_Cg.hpp | 46 +++++++++--------- .../src/solvers/Belos_Tpetra_CgPipeline.hpp | 36 +++++++------- .../solvers/Belos_Tpetra_CgSingleReduce.hpp | 48 +++++++++---------- 7 files changed, 66 insertions(+), 71 deletions(-) diff --git a/packages/belos/kokkos/example/BlockCGKokkosExFile.cpp b/packages/belos/kokkos/example/BlockCGKokkosExFile.cpp index 69792850b82e..9e48e2a7bb67 100644 --- a/packages/belos/kokkos/example/BlockCGKokkosExFile.cpp +++ b/packages/belos/kokkos/example/BlockCGKokkosExFile.cpp @@ -76,7 +76,6 @@ bool success = true; typedef Teuchos::ScalarTraits SCT; typedef SCT::magnitudeType MT; typedef Belos::KokkosMultiVec MV; - typedef Belos::KokkosCrsOperator OP; typedef Belos::MultiVec KMV; typedef Belos::Operator KOP; typedef Belos::MultiVecTraits MVT; diff --git a/packages/belos/kokkos/example/BlockGmresKokkosExFile.cpp b/packages/belos/kokkos/example/BlockGmresKokkosExFile.cpp index ec56e4f42891..d6e8da8f3caa 100644 --- a/packages/belos/kokkos/example/BlockGmresKokkosExFile.cpp +++ b/packages/belos/kokkos/example/BlockGmresKokkosExFile.cpp @@ -76,7 +76,6 @@ bool success = true; typedef Teuchos::ScalarTraits SCT; typedef SCT::magnitudeType MT; typedef Belos::KokkosMultiVec MV; - typedef Belos::KokkosCrsOperator OP; typedef Belos::MultiVec KMV; typedef Belos::Operator KOP; typedef Belos::MultiVecTraits MVT; diff --git a/packages/belos/src/BelosMinresSolMgr.hpp b/packages/belos/src/BelosMinresSolMgr.hpp index 7bc01bc63077..be756a93e7a5 100644 --- a/packages/belos/src/BelosMinresSolMgr.hpp +++ b/packages/belos/src/BelosMinresSolMgr.hpp @@ -117,7 +117,7 @@ namespace Belos { typedef OperatorTraits OPT; typedef Teuchos::ScalarTraits SCT; typedef typename Teuchos::ScalarTraits::magnitudeType MagnitudeType; - typedef Teuchos::ScalarTraits< MagnitudeType > MT; + typedef Teuchos::ScalarTraits< MagnitudeType > MST; public: @@ -408,7 +408,6 @@ namespace Belos { using Teuchos::rcpFromRef; using Teuchos::EnhancedNumberValidator; typedef MagnitudeType MT; - typedef Teuchos::ScalarTraits MST; // List of parameters accepted by MINRES, and their default values. RCP pl = parameterList ("MINRES"); diff --git a/packages/belos/tpetra/src/BelosTpetraTestFramework.hpp b/packages/belos/tpetra/src/BelosTpetraTestFramework.hpp index e979908f5708..0308395c5adf 100644 --- a/packages/belos/tpetra/src/BelosTpetraTestFramework.hpp +++ b/packages/belos/tpetra/src/BelosTpetraTestFramework.hpp @@ -679,7 +679,6 @@ namespace Belos { typedef local_ordinal_type LO; typedef global_ordinal_type GO; typedef node_type NT; - typedef ::Tpetra::Map map_type; // For a square matrix, we only need a Map for the range of the matrix. RCP pRangeMap = @@ -730,7 +729,6 @@ namespace Belos { typedef typename SparseMatrixType::local_ordinal_type LO; typedef typename SparseMatrixType::global_ordinal_type GO; typedef typename SparseMatrixType::node_type NT; - typedef ::Tpetra::Map map_type; // For a square matrix, we only need a Map for the range of the matrix. RCP pRangeMap = diff --git a/packages/belos/tpetra/src/solvers/Belos_Tpetra_Cg.hpp b/packages/belos/tpetra/src/solvers/Belos_Tpetra_Cg.hpp index 960b7b97aaa5..e2d3d299e764 100644 --- a/packages/belos/tpetra/src/solvers/Belos_Tpetra_Cg.hpp +++ b/packages/belos/tpetra/src/solvers/Belos_Tpetra_Cg.hpp @@ -74,19 +74,19 @@ class Cg: public Krylov { const SolverInput& input) { using std::endl; - using device_type = typename MV::device_type; + using dev_type = typename MV::device_type; using val_type = typename MV::dot_type; - using STS = Kokkos::ArithTraits; - using mag_type = typename STS::mag_type; - using STM = Kokkos::ArithTraits; + using ATS = Kokkos::ArithTraits; + using magnitude_type = typename ATS::mag_type; + using ATM = Kokkos::ArithTraits; - const auto ONE = STS::one (); + const auto ONE = ATS::one (); SolverOutput output {}; // scalars - mag_type PAP; - mag_type alpha; + magnitude_type PAP; + magnitude_type alpha; vec_type P (B.getMap ()); vec_type AP (B.getMap ()); @@ -95,17 +95,17 @@ class Cg: public Krylov { vec_type MR = * (R_MR.getVectorNonConst (1)); // compute initial residual - Kokkos::View r_beta ("results[numVecs]", 2); - mag_type beta_old = STM::zero (); - mag_type r_norm = STM::zero (); - mag_type r_norm_orig = STM::zero (); + Kokkos::View r_beta ("results[numVecs]", 2); + magnitude_type beta_old = ATM::zero (); + magnitude_type r_norm = ATM::zero (); + magnitude_type r_norm_orig = ATM::zero (); A.apply (X, R); R.update (ONE, B, -ONE); if (input.precoSide == "none") { // no preconditioner Tpetra::deep_copy (P, R); - beta_old = STS::real (R.dot (R)); + beta_old = ATS::real (R.dot (R)); r_norm = beta_old; } else { @@ -117,14 +117,14 @@ class Cg: public Krylov { //TODO: idot is used for now. auto req = Tpetra::idot (r_beta, R_MR, R); req->wait (); - r_norm = STS::real (r_beta(0)); - beta_old = STS::real (r_beta(1)); + r_norm = ATS::real (r_beta(0)); + beta_old = ATS::real (r_beta(1)); } r_norm = std::sqrt (r_norm); r_norm_orig = r_norm; // quick-return - mag_type metric = + magnitude_type metric = this->getConvergenceMetric (r_norm, r_norm_orig, input); if (metric <= input.tol) { if (outPtr != nullptr) { @@ -132,14 +132,14 @@ class Cg: public Krylov { << " meets tolerance " << input.tol << endl; } output.absResid = r_norm; - output.relResid = STM::one (); + output.relResid = ATM::one (); output.numIters = 0; output.converged = true; return output; } // main loop - mag_type beta_new = STM::zero (); + magnitude_type beta_new = ATM::zero (); for (int iter = 0; iter < input.maxNumIters; ++iter) { if (outPtr != nullptr) { *outPtr << "Iteration " << (iter+1) << " of " << input.maxNumIters << ":" << endl; @@ -148,13 +148,13 @@ class Cg: public Krylov { } A.apply (P, AP); // AP = A*P - PAP = STS::real (P.dot (AP)); + PAP = ATS::real (P.dot (AP)); if (outPtr != nullptr) { *outPtr << "PAP: " << PAP << endl; } TEUCHOS_TEST_FOR_EXCEPTION - (STS::real (PAP) <= STM::zero (), std::runtime_error, + (ATS::real (PAP) <= ATM::zero (), std::runtime_error, "At iteration " << (iter+1) << " out of " << input.maxNumIters << ", P.dot(AP) = " << PAP << " <= 0. This usually means that " "the matrix A is not symmetric (Hermitian) positive definite."); @@ -168,7 +168,7 @@ class Cg: public Krylov { R.update (static_cast (-alpha), AP, ONE); // R = R - alpha*AP if (input.precoSide == "none") { // no preconditioner - beta_new = STS::real (R.dot (R)); + beta_new = ATS::real (R.dot (R)); r_norm = beta_new; } else { @@ -176,8 +176,8 @@ class Cg: public Krylov { //TODO: idot is used to compute [MR, R]'*[R] for now. auto req = Tpetra::idot (r_beta, R_MR, R); req->wait (); - r_norm = STS::real (r_beta(0)); - beta_new = STS::real (r_beta(1)); + r_norm = ATS::real (r_beta(0)); + beta_new = ATS::real (r_beta(1)); } r_norm = std::sqrt (r_norm); metric = this->getConvergenceMetric (r_norm, r_norm_orig, input); @@ -195,7 +195,7 @@ class Cg: public Krylov { return output; } else if (iter + 1 < input.maxNumIters) { // not last iteration - const mag_type beta = beta_new / beta_old; + const magnitude_type beta = beta_new / beta_old; if (input.precoSide == "none") { P.update (ONE, R, static_cast (beta)); // P += beta*R } diff --git a/packages/belos/tpetra/src/solvers/Belos_Tpetra_CgPipeline.hpp b/packages/belos/tpetra/src/solvers/Belos_Tpetra_CgPipeline.hpp index 822bc3fd111b..a8046d525a58 100644 --- a/packages/belos/tpetra/src/solvers/Belos_Tpetra_CgPipeline.hpp +++ b/packages/belos/tpetra/src/solvers/Belos_Tpetra_CgPipeline.hpp @@ -74,13 +74,13 @@ class CgPipeline : public Krylov { const SolverInput& input) override { using std::endl; - using device_type = typename MV::device_type; + using dev_type = typename MV::device_type; using val_type = typename MV::dot_type; - using STS = Kokkos::ArithTraits; - using mag_type = typename STS::mag_type; - using STM = Kokkos::ArithTraits; + using ATS = Kokkos::ArithTraits; + using magnitude_type = typename ATS::mag_type; + using ATM = Kokkos::ArithTraits; - const auto ONE = STS::one (); + const auto ONE = ATS::one (); SolverOutput output {}; @@ -96,7 +96,7 @@ class CgPipeline : public Krylov { vec_type R2 = * (R_R.getVectorNonConst (1)); // results of [R R]'*[R AR] - Kokkos::View RR_RAR ("results[numVecs]", 2); + Kokkos::View RR_RAR ("results[numVecs]", 2); auto RR_RAR_host = Kokkos::create_mirror_view (RR_RAR); vec_type P (R, Teuchos::Copy); vec_type AP (P.getMap ()); @@ -108,12 +108,12 @@ class CgPipeline : public Krylov { // local vars val_type RAR, PAP; - mag_type alpha = STM::zero (); - mag_type beta = STM::zero (); - mag_type r_norm = STM::zero (); - mag_type r_norm_orig = STM::zero (); - mag_type beta_new = STM::zero (); - mag_type beta_old = STM::zero (); + magnitude_type alpha = ATM::zero (); + magnitude_type beta = ATM::zero (); + magnitude_type r_norm = ATM::zero (); + magnitude_type r_norm_orig = ATM::zero (); + magnitude_type beta_new = ATM::zero (); + magnitude_type beta_old = ATM::zero (); // Initial step if (input.precoSide == "none") { @@ -162,13 +162,13 @@ class CgPipeline : public Krylov { req->wait (); Kokkos::deep_copy (RR_RAR_host, RR_RAR); RAR = RR_RAR_host(1); - beta_new = STS::real (RR_RAR_host(0)); + beta_new = ATS::real (RR_RAR_host(0)); r_norm = std::sqrt( beta_new ); if (iter == 0) { r_norm_orig = r_norm; } - const mag_type metric = + const magnitude_type metric = this->getConvergenceMetric (r_norm, r_norm_orig, input); if (outPtr != nullptr) { *outPtr << ", RAR: " << RAR << ", r_norm: " << r_norm << ", metric: " << metric; @@ -187,8 +187,8 @@ class CgPipeline : public Krylov { } if (iter == 0) { - alpha = beta_new / STS::real (RAR); - beta = STM::zero (); + alpha = beta_new / ATS::real (RAR); + beta = ATM::zero (); } else { // beta @@ -199,14 +199,14 @@ class CgPipeline : public Krylov { // PAP PAP = RAR - beta_new * (beta / alpha); TEUCHOS_TEST_FOR_EXCEPTION - (STS::real (RAR) <= STM::zero (), std::runtime_error, + (ATS::real (RAR) <= ATM::zero (), std::runtime_error, "At iteration " << (iter+1) << " out of " << input.maxNumIters << ", R.dot(AR) = " << RAR << " <= 0. This usually means that the matrix A is not symmetric " "(Hermitian) positive definite."); // alpha - alpha = beta_new / STS::real (PAP); + alpha = beta_new / ATS::real (PAP); } if (outPtr != nullptr) { *outPtr << ", alpha: " << alpha << endl; diff --git a/packages/belos/tpetra/src/solvers/Belos_Tpetra_CgSingleReduce.hpp b/packages/belos/tpetra/src/solvers/Belos_Tpetra_CgSingleReduce.hpp index a93f28f059fe..bc74f08092bc 100644 --- a/packages/belos/tpetra/src/solvers/Belos_Tpetra_CgSingleReduce.hpp +++ b/packages/belos/tpetra/src/solvers/Belos_Tpetra_CgSingleReduce.hpp @@ -74,33 +74,33 @@ class CgSingleReduce: public Krylov { const SolverInput& input) override { using std::endl; - using device_type = typename MV::device_type; - using STS = Teuchos::ScalarTraits; - using mag_type = typename STS::magnitudeType; - using STM = Teuchos::ScalarTraits; + using dev_type = typename MV::device_type; + using ATS = Kokkos::ArithTraits; + using magnitude_type = typename ATS::mag_type; + using ATM = Kokkos::ArithTraits; using dot_type = typename MV::dot_type; - const SC ONE = STS::one (); + const SC ONE = ATS::one (); SolverOutput output {}; // compute initial residual vec_type MR (B.getMap ()); - mag_type beta_old = STM::zero (); + magnitude_type beta_old = ATM::zero (); if (input.precoSide == "none") { - beta_old = STS::real (B.dot (B)); + beta_old = ATS::real (B.dot (B)); } else { M.apply (B, MR); - beta_old = STS::real (B.dot (MR)); + beta_old = ATS::real (B.dot (MR)); } - mag_type r_norm = std::sqrt (beta_old); - mag_type r_norm_orig = r_norm; + magnitude_type r_norm = std::sqrt (beta_old); + magnitude_type r_norm_orig = r_norm; // quick return - mag_type metric = this->getConvergenceMetric (r_norm, r_norm_orig, input); + magnitude_type metric = this->getConvergenceMetric (r_norm, r_norm_orig, input); if (metric <= input.tol) { output.absResid = r_norm; - output.relResid = STM::one (); + output.relResid = ATM::one (); output.numIters = 0; output.converged = true; // R doesn't exist yet, so we don't have to copy R back to B @@ -115,18 +115,18 @@ class CgSingleReduce: public Krylov { vec_type AR = * (R_AR.getVectorNonConst (1)); Tpetra::deep_copy (R, B); // results of [R AR]'*R - mag_type RAR; - Kokkos::View RR_RAR ("results[numVecs]", 2); + magnitude_type RAR; + Kokkos::View RR_RAR ("results[numVecs]", 2); auto RR_RAR_host = Kokkos::create_mirror_view (RR_RAR); vec_type P (R, Teuchos::Copy); vec_type AP (P.getMap ()); // Initial step // AR = A*R - mag_type PAP; + magnitude_type PAP; if (input.precoSide == "none") { A.apply (R, AR); - PAP = STS::real (R.dot (AR)); + PAP = ATS::real (R.dot (AR)); } else { M.apply (R, MR); @@ -140,14 +140,14 @@ class CgSingleReduce: public Krylov { req->wait (); Kokkos::deep_copy (RR_RAR_host, RR_RAR); - beta_old = STS::real (RR_RAR_host(0)); - PAP = STS::real (RR_RAR_host(1)); + beta_old = ATS::real (RR_RAR_host(0)); + PAP = ATS::real (RR_RAR_host(1)); r_norm = std::sqrt (beta_old); } - mag_type alpha = beta_old / PAP; - mag_type beta = STM::zero (); - mag_type beta_new = STM::zero (); + magnitude_type alpha = beta_old / PAP; + magnitude_type beta = ATM::zero (); + magnitude_type beta_new = ATM::zero (); // main loop for (int iter = 0; iter < input.maxNumIters; ++iter) { if (outPtr != nullptr) { @@ -191,8 +191,8 @@ class CgSingleReduce: public Krylov { } // * all-reduce * Kokkos::deep_copy (RR_RAR_host, RR_RAR); - beta_new = STS::real (RR_RAR_host(0)); - RAR = STS::real (RR_RAR_host(1)); + beta_new = ATS::real (RR_RAR_host(0)); + RAR = ATS::real (RR_RAR_host(1)); // convergence check r_norm = std::sqrt( beta_new ); @@ -221,7 +221,7 @@ class CgSingleReduce: public Krylov { // PAP PAP = RAR - beta_new * (beta /alpha); TEUCHOS_TEST_FOR_EXCEPTION - (RAR <= STM::zero (), std::runtime_error, "At iteration " << (iter+1) + (RAR <= ATM::zero (), std::runtime_error, "At iteration " << (iter+1) << " out of " << input.maxNumIters << ", R.dot(AR) = " << RAR << " <= 0. This usually means that the matrix A is not symmetric " "(Hermitian) positive definite."); From 31f03ca38abd217117a1a613e732a46b24cdf886 Mon Sep 17 00:00:00 2001 From: Christian Glusa Date: Thu, 22 Dec 2022 10:11:01 -0700 Subject: [PATCH 76/78] Stratimikos: Silence warnings --- .../LOWSFactory/Thyra_Belos_StatusTest_UnitTests.cpp | 1 - .../doc/parameterList/createValidParameterList.cpp | 12 ++++++------ packages/stratimikos/test/galeri_xpetra_driver.cpp | 1 - 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/stratimikos/adapters/belos/test/LOWSFactory/Thyra_Belos_StatusTest_UnitTests.cpp b/packages/stratimikos/adapters/belos/test/LOWSFactory/Thyra_Belos_StatusTest_UnitTests.cpp index 189e4e041d58..5fde3f118145 100644 --- a/packages/stratimikos/adapters/belos/test/LOWSFactory/Thyra_Belos_StatusTest_UnitTests.cpp +++ b/packages/stratimikos/adapters/belos/test/LOWSFactory/Thyra_Belos_StatusTest_UnitTests.cpp @@ -164,7 +164,6 @@ void runGeneralSolveCriteriaBelosStatusTestCase( using Teuchos::toString; typedef ScalarTraits ST; - typedef typename ST::magnitudeType ScalarMag; // A) Set up the linear system diff --git a/packages/stratimikos/doc/parameterList/createValidParameterList.cpp b/packages/stratimikos/doc/parameterList/createValidParameterList.cpp index 7b34c937e297..41c0624147ad 100644 --- a/packages/stratimikos/doc/parameterList/createValidParameterList.cpp +++ b/packages/stratimikos/doc/parameterList/createValidParameterList.cpp @@ -98,12 +98,12 @@ int main(int argc, char* argv[]) if(parse_return != CommandLineProcessor::PARSE_SUCCESSFUL) return parse_return; - // - // Print the XSL header line if requested - // - if (xsl_header_flag ) - out << "\n"; + // + // Print the XSL header line if requested + // + if (xsl_header_flag ) + out << "\n"; // // Obtain the validated ParameterList and write it to the fancy diff --git a/packages/stratimikos/test/galeri_xpetra_driver.cpp b/packages/stratimikos/test/galeri_xpetra_driver.cpp index 4299bbcae979..4a3bc3c53bd9 100644 --- a/packages/stratimikos/test/galeri_xpetra_driver.cpp +++ b/packages/stratimikos/test/galeri_xpetra_driver.cpp @@ -87,7 +87,6 @@ The source code is not MueLu specific and can be used with any Stratimikos strat template int main_(int argc, char *argv[], Teuchos::CommandLineProcessor& clp) { - typedef Teuchos::ScalarTraits STS; typedef Tpetra::Map<> map_type; typedef map_type::local_ordinal_type LocalOrdinal; typedef map_type::global_ordinal_type GlobalOrdinal; From 55fc70f5c8bd164a43a46557de9d3712589c8c69 Mon Sep 17 00:00:00 2001 From: Christian Glusa Date: Thu, 22 Dec 2022 10:13:13 -0700 Subject: [PATCH 77/78] Nox: Silence some warnings --- .../LOCA_BorderedSolver_LAPACKDirectSolve.C | 18 +++++++++--------- packages/nox/src-loca/src/LOCA_DerivUtils.C | 4 ++-- .../LOCA_MultiContinuation_ArcLengthGroup.C | 4 ++-- .../src/LOCA_MultiContinuation_NaturalGroup.C | 4 ++-- ...urningPoint_MinimallyAugmented_Constraint.C | 4 ++-- .../NOX_Multiphysics_Solver_FixedPointBased.C | 14 +++++++------- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/nox/src-loca/src-lapack/LOCA_BorderedSolver_LAPACKDirectSolve.C b/packages/nox/src-loca/src-lapack/LOCA_BorderedSolver_LAPACKDirectSolve.C index ef3fb28fac44..243626aa03b6 100644 --- a/packages/nox/src-loca/src-lapack/LOCA_BorderedSolver_LAPACKDirectSolve.C +++ b/packages/nox/src-loca/src-lapack/LOCA_BorderedSolver_LAPACKDirectSolve.C @@ -533,18 +533,18 @@ LOCA::BorderedSolver::LAPACKDirectSolve::solve( NOX::Abstract::MultiVector& X, NOX::Abstract::MultiVector::DenseMatrix& Y) const { - bool isZeroF = (F == NULL); - bool isZeroG = (G == NULL); + bool isZeroF2 = (F == NULL); + bool isZeroG2 = (G == NULL); // If F & G are zero, the solution is zero - if (isZeroF && isZeroG) { + if (isZeroF2 && isZeroG2) { X.init(0.0); Y.putScalar(0.0); return NOX::Abstract::Group::Ok; } int numColsRHS; - if (!isZeroF) + if (!isZeroF2) numColsRHS = F->numVectors(); else numColsRHS = G->numCols(); @@ -556,7 +556,7 @@ LOCA::BorderedSolver::LAPACKDirectSolve::solve( // Concatenate F & G into a single matrix NOX::LAPACK::Matrix RHS(N,numColsRHS); - if (isZeroF) { + if (isZeroF2) { for (int j=0; j(F); TEUCHOS_ASSERT(cF != NULL); F_real = cF->getRealMultiVec(); @@ -618,7 +618,7 @@ LOCA::BorderedSolver::LAPACKDirectSolve::solve( // Concatenate F & G into a single matrix NOX::LAPACK::Matrix< std::complex > RHS(N,numColsRHS); - if (isZeroF) { + if (isZeroF2) { for (int j=0; j((*v1)(i), (*v2)(i)); } } - if (isZeroG) { + if (isZeroG2) { for (int j=0; j& global_data, - double perturb) : + double _perturb) : globalData(global_data), - perturb(perturb) + perturb(_perturb) { // assert (perturb>0.0); } diff --git a/packages/nox/src-loca/src/LOCA_MultiContinuation_ArcLengthGroup.C b/packages/nox/src-loca/src/LOCA_MultiContinuation_ArcLengthGroup.C index e144bb697bad..38f0a4d3d568 100644 --- a/packages/nox/src-loca/src/LOCA_MultiContinuation_ArcLengthGroup.C +++ b/packages/nox/src-loca/src/LOCA_MultiContinuation_ArcLengthGroup.C @@ -60,12 +60,12 @@ LOCA::MultiContinuation::ArcLengthGroup::ArcLengthGroup( const Teuchos::RCP& global_data, const Teuchos::RCP& topParams, - const Teuchos::RCP& continuationParams, + const Teuchos::RCP& _continuationParams, const Teuchos::RCP& grp, const Teuchos::RCP& pred, const std::vector& paramIDs) : LOCA::MultiContinuation::ExtendedGroup(global_data, topParams, - continuationParams, + _continuationParams, grp, pred, paramIDs), theta(paramIDs.size(), 1.0), doArcLengthScaling(true), diff --git a/packages/nox/src-loca/src/LOCA_MultiContinuation_NaturalGroup.C b/packages/nox/src-loca/src/LOCA_MultiContinuation_NaturalGroup.C index 503fb69bd72d..5c44c88ceecf 100644 --- a/packages/nox/src-loca/src/LOCA_MultiContinuation_NaturalGroup.C +++ b/packages/nox/src-loca/src/LOCA_MultiContinuation_NaturalGroup.C @@ -56,12 +56,12 @@ LOCA::MultiContinuation::NaturalGroup::NaturalGroup( const Teuchos::RCP& global_data, const Teuchos::RCP& topParams, - const Teuchos::RCP& continuationParams, + const Teuchos::RCP& _continuationParams, const Teuchos::RCP& grp, const Teuchos::RCP& pred, const std::vector& paramIDs) : LOCA::MultiContinuation::ExtendedGroup(global_data, topParams, - continuationParams, + _continuationParams, grp, pred, paramIDs) { bool skip_dfdp = continuationParams->get("Skip Parameter Derivative", true); diff --git a/packages/nox/src-loca/src/LOCA_TurningPoint_MinimallyAugmented_Constraint.C b/packages/nox/src-loca/src/LOCA_TurningPoint_MinimallyAugmented_Constraint.C index 52204891e0a0..c18e872eac59 100644 --- a/packages/nox/src-loca/src/LOCA_TurningPoint_MinimallyAugmented_Constraint.C +++ b/packages/nox/src-loca/src/LOCA_TurningPoint_MinimallyAugmented_Constraint.C @@ -676,10 +676,10 @@ getInitialVectors(NOX::Abstract::Vector& aVec, std::string("Group must implement LOCA::Abstract::TransposeSolveGroup") + std::string(" to compute initial left null vector")); - Teuchos::RCP lsParams = + Teuchos::RCP lsParams2 = parsedParams->getSublist("Linear Solver"); status = - ts_grp->applyJacobianTransposeInverse(*lsParams, (*fdfdp)[1], aVec); + ts_grp->applyJacobianTransposeInverse(*lsParams2, (*fdfdp)[1], aVec); finalStatus = globalData->locaErrorCheck->combineAndCheckReturnTypes( status, diff --git a/packages/nox/src/NOX_Multiphysics_Solver_FixedPointBased.C b/packages/nox/src/NOX_Multiphysics_Solver_FixedPointBased.C index 8ae0e6c40a27..8ed7b0f0e97c 100644 --- a/packages/nox/src/NOX_Multiphysics_Solver_FixedPointBased.C +++ b/packages/nox/src/NOX_Multiphysics_Solver_FixedPointBased.C @@ -223,14 +223,14 @@ NOX::Multiphysics::Solver::FixedPointBased::step() NOX::Abstract::Group& soln = *solnPtr; NOX::StatusTest::Generic& test = *testPtr; - NOX::StatusTest::StatusType status = NOX::StatusTest::Unconverged; + NOX::StatusTest::StatusType status2 = NOX::StatusTest::Unconverged; std::vector >::iterator iter = (*solversVecPtr).begin(); std::vector >::iterator iter_end = (*solversVecPtr).end(); for( int i = 0; iter_end != iter; ++iter, ++i ) { - status = NOX::StatusTest::Unconverged; + status2 = NOX::StatusTest::Unconverged; // Conditionally bring all data needed from other problems to the current one if( SEIDEL == solveType ) @@ -244,7 +244,7 @@ NOX::Multiphysics::Solver::FixedPointBased::step() (*iter)->reset( sameGrp->getX() ); - status = (*iter)->solve(); + status2 = (*iter)->solve(); // Check return status } @@ -254,9 +254,9 @@ NOX::Multiphysics::Solver::FixedPointBased::step() if (rtype != NOX::Abstract::Group::Ok) { utilsPtr->out() << "NOX::Multiphysics::Solver::FixedPointBased::step - unable to compute F" << std::endl; - status = NOX::StatusTest::Failed; + status2 = NOX::StatusTest::Failed; observer->runPostIterate(*this); - return status; + return status2; } // Update iteration count. @@ -276,12 +276,12 @@ NOX::Multiphysics::Solver::FixedPointBased::step() } // Evaluate the current status. - status = test.checkStatus(*this, checkType); + status2 = test.checkStatus(*this, checkType); observer->runPostIterate(*this); // Return status. - return status; + return status2; } NOX::StatusTest::StatusType From ae19a59061e4d9111c7cc9ae96bcefa315199326 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Fri, 23 Dec 2022 21:54:39 -0500 Subject: [PATCH 78/78] Revert "TriBITS Snapshot 2022-12-12 working toward TriBITSPub/TriBITS#63" --- CMakeLists.txt | 6 +- cmake/tribits/CHANGELOG.md | 77 +- .../ci_support/TribitsDumpDepsXmlScript.cmake | 4 +- .../TribitsWriteXmlDependenciesFiles.cmake | 283 +-- cmake/tribits/common_tpls/FindTPLHDF5.cmake | 2 +- .../FindTPLLAPACKDependencies.cmake | 2 - cmake/tribits/common_tpls/FindTPLNetcdf.cmake | 4 +- .../TribitsPackageConfigTemplate.cmake.in | 23 +- .../TribitsProjectConfigTemplate.cmake.in | 14 + .../package_arch/TribitsAddAdvancedTest.cmake | 11 +- .../package_arch/TribitsAddExecutable.cmake | 7 +- .../TribitsAddExecutableAndTest.cmake | 21 +- .../core/package_arch/TribitsAddLibrary.cmake | 11 +- .../core/package_arch/TribitsAddTest.cmake | 9 +- .../package_arch/TribitsAddTestHelpers.cmake | 4 +- .../TribitsAdjustPackageEnables.cmake | 2247 +++++++++++------ ...ribitsExternalPackageWriteConfigFile.cmake | 46 +- .../package_arch/TribitsGeneralMacros.cmake | 200 +- .../TribitsGetEnabledSublists.cmake | 163 -- .../TribitsGetPackageEnableStatus.cmake | 134 - .../package_arch/TribitsGlobalMacros.cmake | 91 +- .../TribitsIncludeDirectories.cmake | 50 +- .../package_arch/TribitsListHelpers.cmake | 11 +- .../TribitsPackageDependencies.cmake | 17 +- .../package_arch/TribitsPackageMacros.cmake | 5 +- .../TribitsPkgExportCacheVars.cmake | 2 +- .../TribitsPrintDependencyInfo.cmake | 102 +- .../TribitsPrintEnabledPackagesLists.cmake | 33 +- .../TribitsProcessEnabledTpl.cmake | 8 +- .../TribitsProcessPackagesAndDirsLists.cmake | 63 +- .../TribitsProcessTplsLists.cmake | 10 +- .../package_arch/TribitsProjectImpl.cmake | 2 +- ...adAllProjectDepsFilesCreateDepsGraph.cmake | 9 + .../TribitsReadDepsFilesCreateDepsGraph.cmake | 545 ++-- .../TribitsReportInvalidTribitsUsage.cmake | 25 +- .../package_arch/TribitsSetAndIncDirs.cmake | 66 - .../TribitsSetUpEnabledOnlyDependencies.cmake | 237 -- ...itsSystemDataStructuresMacrosFunctions.rst | 109 +- .../package_arch/TribitsTestCategories.cmake | 3 +- .../TribitsTplDeclareLibraries.cmake | 7 +- .../TribitsWriteClientExportFiles.cmake | 143 +- .../tribits/core/utils/AppendStringVar.cmake | 3 - cmake/tribits/core/utils/CMakeOverrides.cmake | 117 + .../core/utils/ParseVariableArguments.cmake | 10 +- ...eReverseList.cmake => SetAndIncDirs.cmake} | 18 +- .../core/utils/TribitsAddEnumCacheVar.cmake | 89 - .../core/utils/TribitsDeprecatedHelpers.cmake | 121 - .../TribitsCTestDriverCoreHelpers.cmake | 4 +- .../build_ref/TribitsBuildReferenceBody.rst | 324 +-- .../EnableAllPackages.txt | 9 +- .../EnableThyraEpetra_EnableTests.txt | 7 +- .../EnableThyra_EnableTests.txt | 7 +- ...EnableThyra_EnableTests_EnableBoost_ST.txt | 45 +- ...nableTests_EnableBoost_ST_RequiredOnly.txt | 42 +- .../ExpectedDependencies.txt | 105 +- .../guides/TribitsCoreDetailedReference.rst | 45 +- .../tribits/doc/guides/TribitsGuidesBody.rst | 97 +- .../TribitsMacroFunctionDocTemplate.rst | 1 - .../TribitsSystemMacroFunctionDocTemplate.rst | 10 +- .../guides/UtilsMacroFunctionDocTemplate.rst | 5 +- .../guides/users_guide/TribitsUsersGuide.rst | 2 - .../examples/InsertedPkg/CMakeLists.txt | 2 +- .../shared_only/CMakeLists.txt | 2 +- .../static_only/CMakeLists.txt | 2 +- .../examples/MockTrilinos/TPLsList.cmake | 1 - .../TPLs/FindTPLLAPACKDependencies.cmake | 2 - .../TPLs/FindTPLParMETISDependencies.cmake | 2 - .../TPLs/FindTPLSuperLUDependencies.cmake | 2 - .../TPLs/FindTPLSuperLUDistDependencies.cmake | 2 - .../packages/zoltan/cmake/Dependencies.cmake | 8 +- .../ReducedMockTrilinos/TPLsList.cmake | 8 +- .../DependsOnLAPACK/PackagesList.cmake | 3 - .../extraRepos/DependsOnLAPACK/TPLsList.cmake | 1 - .../DependsOnLAPACK/cmake/Dependencies.cmake | 3 - .../examples/TargetDefinesPkg/CMakeLists.txt | 2 +- .../TribitsExampleApp/AppHelperFuncs.cmake | 3 +- .../TribitsExampleProject/CMakeLists.txt | 2 - .../packages/mixed_lang/src/CMakeLists.txt | 4 +- .../packages/simple_cxx/src/CMakeLists.txt | 4 +- .../packages/simple_cxx/test/CMakeLists.txt | 3 - .../test/SimpleCxx_HelloWorld_Tests.cpp | 7 +- .../test/inc/SimpleCxx_HelloWorld_Tests.hpp | 10 - .../with_subpackages/a/CMakeLists.txt | 4 +- .../with_subpackages/b/src/CMakeLists.txt | 6 +- .../b/tests/testlib/CMakeLists.txt | 2 +- .../with_subpackages/c/CMakeLists.txt | 2 +- .../packages/wrap_external/CMakeLists.txt | 2 +- .../TribitsExampleProject2/CMakeLists.txt | 1 - .../packages/package1/src/CMakeLists.txt | 2 +- .../packages/package2/src/CMakeLists.txt | 4 +- .../packages/package3/src/CMakeLists.txt | 4 +- .../packages/addon1/src/CMakeLists.txt | 2 +- .../TribitsOldSimpleExampleApp/CMakeLists.txt | 5 +- .../TribitsSimpleExampleApp/CMakeLists.txt | 2 +- commonTools/gtest/CMakeLists.txt | 2 +- packages/adelus/example/CMakeLists.txt | 2 +- packages/adelus/src/CMakeLists.txt | 4 +- packages/amesos/src/CMakeLists.txt | 4 +- packages/amesos2/src/CMakeLists.txt | 22 +- .../amesos2/src/KLU2/Source/CMakeLists.txt | 16 +- .../anasazi/epetra/src-rbgen/CMakeLists.txt | 4 +- packages/anasazi/epetra/src/CMakeLists.txt | 4 +- .../epetra/util/ModeLaplace/CMakeLists.txt | 4 +- packages/anasazi/src-rbgen/CMakeLists.txt | 2 +- packages/anasazi/src/CMakeLists.txt | 8 +- packages/anasazi/test/CMakeLists.txt | 2 +- .../anasazi/test/OrthoManager/CMakeLists.txt | 2 +- packages/anasazi/thyra/src/CMakeLists.txt | 4 +- packages/anasazi/tpetra/src/CMakeLists.txt | 4 +- packages/aztecoo/src/CMakeLists.txt | 4 +- .../belos/doc/parameterList/CMakeLists.txt | 2 +- packages/belos/epetra/src/CMakeLists.txt | 4 +- packages/belos/kokkos/example/CMakeLists.txt | 2 +- packages/belos/kokkos/src/CMakeLists.txt | 4 +- packages/belos/kokkos/test/CMakeLists.txt | 2 +- packages/belos/src/CMakeLists.txt | 4 +- packages/belos/test/GCRODR/CMakeLists.txt | 4 +- packages/belos/tpetra/src/CMakeLists.txt | 4 +- packages/belos/xpetra/src/CMakeLists.txt | 4 +- .../SuiteSparse/src/CMakeLists.txt | 16 +- .../examples/CMakeLists.tribits.cmake | 2 +- .../compadre/src/CMakeLists.tribits.cmake | 4 +- .../domi/doc/parameterList/CMakeLists.txt | 2 +- packages/domi/src/CMakeLists.txt | 4 +- packages/domi/test/MDArray/CMakeLists.txt | 2 +- packages/domi/test/MDComm/CMakeLists.txt | 2 +- packages/domi/test/MDMap/CMakeLists.txt | 2 +- packages/domi/test/MDVector/CMakeLists.txt | 2 +- packages/epetra/CMakeLists.txt | 2 +- packages/epetra/src/CMakeLists.txt | 6 +- packages/epetraext/src/CMakeLists.txt | 26 +- packages/epetraext/test/CMakeLists.txt | 2 +- packages/fei/base/CMakeLists.txt | 6 +- packages/fei/support-Trilinos/CMakeLists.txt | 6 +- packages/fei/unit_tests/CMakeLists.txt | 8 +- packages/galeri/src-epetra/CMakeLists.txt | 12 +- packages/galeri/src-xpetra/CMakeLists.txt | 10 +- packages/ifpack/src/CMakeLists.txt | 12 +- packages/ifpack/test/AztecOO/CMakeLists.txt | 4 +- .../ifpack/test/AztecOO_LL/CMakeLists.txt | 4 +- packages/ifpack2/adapters/CMakeLists.txt | 4 +- packages/ifpack2/example/CMakeLists.txt | 2 +- packages/ifpack2/src/CMakeLists.txt | 6 +- .../belos/AdditiveSchwarzRILUK/CMakeLists.txt | 2 +- packages/ifpack2/test/belos/CMakeLists.txt | 2 +- packages/ifpack2/test/vanka/CMakeLists.txt | 4 +- packages/intrepid/src/CMakeLists.txt | 16 +- packages/intrepid2/perf-test/CMakeLists.txt | 2 +- .../perf-test/ComputeBasis/CMakeLists.txt | 2 +- .../ComputeBasis/Cuda/CMakeLists.txt | 4 +- .../ComputeBasis/OpenMP/CMakeLists.txt | 4 +- .../ComputeBasis/Serial/CMakeLists.txt | 4 +- .../perf-test/DynRankView/CMakeLists.txt | 2 +- .../perf-test/DynRankView/Cuda/CMakeLists.txt | 4 +- .../DynRankView/OpenMP/CMakeLists.txt | 4 +- .../DynRankView/Serial/CMakeLists.txt | 4 +- packages/intrepid2/src/CMakeLists.txt | 6 +- .../intrepid2/unit-test/Cell/CMakeLists.txt | 2 +- .../Basis/DeRHAM_HEX_FEM/CMakeLists.txt | 2 +- .../Basis/DeRHAM_QUAD_FEM/CMakeLists.txt | 2 +- .../Basis/DeRHAM_TET_FEM/CMakeLists.txt | 2 +- .../Basis/DeRHAM_TRI_FEM/CMakeLists.txt | 2 +- .../Basis/HCURL_HEX_I1_FEM/CMakeLists.txt | 2 +- .../Basis/HCURL_HEX_In_FEM/CMakeLists.txt | 2 +- .../Basis/HCURL_QUAD_I1_FEM/CMakeLists.txt | 2 +- .../Basis/HCURL_QUAD_In_FEM/CMakeLists.txt | 2 +- .../Basis/HCURL_TET_I1_FEM/CMakeLists.txt | 2 +- .../Basis/HCURL_TET_In_FEM/CMakeLists.txt | 2 +- .../Basis/HCURL_TRI_I1_FEM/CMakeLists.txt | 2 +- .../Basis/HCURL_TRI_In_FEM/CMakeLists.txt | 2 +- .../Basis/HCURL_WEDGE_I1_FEM/CMakeLists.txt | 2 +- .../Basis/HDIV_HEX_I1_FEM/CMakeLists.txt | 2 +- .../Basis/HDIV_HEX_In_FEM/CMakeLists.txt | 2 +- .../Basis/HDIV_QUAD_I1_FEM/CMakeLists.txt | 2 +- .../Basis/HDIV_QUAD_In_FEM/CMakeLists.txt | 2 +- .../Basis/HDIV_TET_I1_FEM/CMakeLists.txt | 2 +- .../Basis/HDIV_TET_In_FEM/CMakeLists.txt | 2 +- .../Basis/HDIV_TRI_I1_FEM/CMakeLists.txt | 2 +- .../Basis/HDIV_TRI_In_FEM/CMakeLists.txt | 2 +- .../Basis/HDIV_WEDGE_I1_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_HEX_C1_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_HEX_C2_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_HEX_Cn_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_LINE_C1_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_LINE_Cn_FEM/CMakeLists.txt | 2 +- .../HGRAD_LINE_Cn_FEM_JACOBI/CMakeLists.txt | 2 +- .../Basis/HGRAD_PYR_C1_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_QUAD_C1_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_QUAD_C2_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_QUAD_Cn_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_TET_C1_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_TET_C2_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_TET_COMP12_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_TET_Cn_FEM/CMakeLists.txt | 2 +- .../HGRAD_TET_Cn_FEM_ORTH/CMakeLists.txt | 2 +- .../Basis/HGRAD_TRI_C1_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_TRI_C2_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_TRI_Cn_FEM/CMakeLists.txt | 2 +- .../HGRAD_TRI_Cn_FEM_ORTH/CMakeLists.txt | 2 +- .../Basis/HGRAD_WEDGE_C1_FEM/CMakeLists.txt | 2 +- .../Basis/HGRAD_WEDGE_C2_FEM/CMakeLists.txt | 2 +- .../Basis/HVOL_C0_FEM/CMakeLists.txt | 2 +- .../Basis/HVOL_HEX_Cn_FEM/CMakeLists.txt | 2 +- .../Basis/HVOL_LINE_Cn_FEM/CMakeLists.txt | 2 +- .../Basis/HVOL_QUAD_Cn_FEM/CMakeLists.txt | 2 +- .../Basis/HVOL_TET_Cn_FEM/CMakeLists.txt | 2 +- .../Basis/HVOL_TRI_Cn_FEM/CMakeLists.txt | 2 +- .../FunctionSpaceTools/CMakeLists.txt | 2 +- .../Discretization/Integration/CMakeLists.txt | 2 +- .../MonolithicExecutable/CMakeLists.txt | 2 +- .../unit-test/Orientation/CMakeLists.txt | 2 +- .../unit-test/Projection/CMakeLists.txt | 2 +- .../Shared/ArrayTools/CMakeLists.txt | 2 +- .../Shared/PointTools/CMakeLists.txt | 2 +- .../unit-test/Shared/Polylib/CMakeLists.txt | 2 +- .../Shared/RealSpaceTools/CMakeLists.txt | 2 +- .../StructuredIntegration/CMakeLists.txt | 2 +- packages/isorropia/src/CMakeLists.txt | 10 +- .../kokkos-kernels/perf_test/CMakeLists.txt | 2 +- packages/komplex/src/CMakeLists.txt | 4 +- .../delete_small_elements/CMakeLists.txt | 6 +- .../krino/adaptivity_interface/CMakeLists.txt | 6 +- packages/krino/krino/krino_lib/CMakeLists.txt | 6 +- .../krino/krino/master_element/CMakeLists.txt | 6 +- packages/krino/krino/parser/CMakeLists.txt | 6 +- .../krino/rebalance_utils/CMakeLists.txt | 6 +- packages/krino/krino/region/CMakeLists.txt | 6 +- .../krino/krino/unit_tests/CMakeLists.txt | 6 +- packages/minitensor/src/CMakeLists.txt | 4 +- packages/minitensor/test/CMakeLists.txt | 2 +- packages/ml/matlab/CMakeLists.txt | 8 +- packages/ml/src/CMakeLists.txt | 28 +- packages/moertel/CMakeLists.txt | 2 +- packages/moertel/example/Hex3D/CMakeLists.txt | 2 +- .../moertel/example/TwoSquares/CMakeLists.txt | 2 +- packages/moertel/morkon/src/CMakeLists.txt | 56 +- .../moertel/morkon/unit_tests/CMakeLists.txt | 54 +- packages/moertel/src/mortar/CMakeLists.txt | 4 +- packages/muelu/adapters/CMakeLists.txt | 20 +- .../muelu/doc/Tutorial/src/CMakeLists.txt | 2 +- .../muelu/doc/Tutorial/tex/CMakeLists.txt | 2 +- .../example/ParameterList/CMakeLists.txt | 2 +- .../example/advanced/blockcrs/CMakeLists.txt | 4 +- .../example/advanced/clone/CMakeLists.txt | 2 +- .../example/advanced/levelwrap/CMakeLists.txt | 4 +- .../example/advanced/memory/CMakeLists.txt | 2 +- .../advanced/multiplesolve/CMakeLists.txt | 4 +- .../advanced/separatesetups/CMakeLists.txt | 4 +- packages/muelu/example/basic/CMakeLists.txt | 6 +- packages/muelu/matlab/bin/CMakeLists.txt | 8 +- packages/muelu/matlab/src/CMakeLists.txt | 8 +- .../muelu/research/caglusa/CMakeLists.txt | 4 +- .../luc/region_algorithms/CMakeLists.txt | 4 +- .../research/max/AdditiveMG/CMakeLists.txt | 2 +- .../max/XpetraSplitting/CMakeLists.txt | 2 +- packages/muelu/research/q2q1/CMakeLists.txt | 2 +- .../research/regionMG/example/CMakeLists.txt | 6 +- .../research/regionMG/src/CMakeLists.txt | 2 +- .../regionMG/test/structured/CMakeLists.txt | 6 +- .../research/semicoarsening/CMakeLists.txt | 4 +- .../research/tawiesn/aria/CMakeLists.txt | 2 +- .../research/tawiesn/crada/CMakeLists.txt | 4 +- packages/muelu/src/CMakeLists.txt | 92 +- packages/muelu/src/Interface/CMakeLists.txt | 56 +- packages/muelu/test/CMakeLists.txt | 2 +- .../muelu/test/blockedtransfer/CMakeLists.txt | 14 +- .../muelu/test/convergence/CMakeLists.txt | 12 +- packages/muelu/test/factories/CMakeLists.txt | 14 +- packages/muelu/test/helmholtz/CMakeLists.txt | 14 +- packages/muelu/test/interface/CMakeLists.txt | 12 +- packages/muelu/test/longlong/CMakeLists.txt | 14 +- packages/muelu/test/maxwell/CMakeLists.txt | 14 +- packages/muelu/test/meshtying/CMakeLists.txt | 4 +- packages/muelu/test/mhdvanka/CMakeLists.txt | 14 +- .../muelu/test/navierstokes/CMakeLists.txt | 6 +- packages/muelu/test/paramlist/CMakeLists.txt | 12 +- .../test/perf_tests_kokkos/CMakeLists.txt | 6 +- .../muelu/test/permutation/CMakeLists.txt | 4 +- packages/muelu/test/profiling/CMakeLists.txt | 14 +- packages/muelu/test/scaling/CMakeLists.txt | 14 +- packages/muelu/test/simple1D/CMakeLists.txt | 14 +- packages/muelu/test/structured/CMakeLists.txt | 14 +- .../muelu/test/toggletransfer/CMakeLists.txt | 14 +- packages/muelu/test/unit_tests/CMakeLists.txt | 26 +- .../test/unit_tests_kokkos/CMakeLists.txt | 24 +- .../muelu/test/vardofpernode/CMakeLists.txt | 14 +- packages/muelu/test/viz/CMakeLists.txt | 14 +- .../LOCA_Brusselator_xyzt/CMakeLists.txt | 2 +- .../LOCA_ContinuationManager/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../epetra/LOCA_Tcubed/CMakeLists.txt | 2 +- .../epetra/NOX_1DFEMNonlinear/CMakeLists.txt | 2 +- .../lapack/LOCA_1DFDPitchfork/CMakeLists.txt | 2 +- .../lapack/LOCA_Brusselator/CMakeLists.txt | 2 +- .../examples/lapack/LOCA_Chan/CMakeLists.txt | 2 +- .../lapack/NOX_SimpleExamples/CMakeLists.txt | 2 +- .../petsc/1DFiniteDifference/CMakeLists.txt | 2 +- .../nox/examples/petsc/DS6.5.1/CMakeLists.txt | 2 +- packages/nox/src-epetra/CMakeLists.txt | 2 +- packages/nox/src-lapack/CMakeLists.txt | 2 +- .../nox/src-loca/src-epetra/CMakeLists.txt | 4 +- .../nox/src-loca/src-lapack/CMakeLists.txt | 2 +- packages/nox/src-loca/src-mf/CMakeLists.txt | 2 +- .../nox/src-loca/src-thyra/CMakeLists.txt | 2 +- .../nox/src-loca/src-tpetra/CMakeLists.txt | 4 +- packages/nox/src-loca/src/CMakeLists.txt | 2 +- packages/nox/src-petsc/CMakeLists.txt | 2 +- packages/nox/src/CMakeLists.txt | 8 +- packages/nox/test/basic/CMakeLists.txt | 2 +- packages/nox/test/epetra/1Dfem/CMakeLists.txt | 2 +- .../test/epetra/Brusselator/CMakeLists.txt | 2 +- .../nox/test/epetra/DS6.5.1/CMakeLists.txt | 2 +- .../FiniteDifferenceColoring/CMakeLists.txt | 2 +- .../epetra/LOCA_TestProblems/CMakeLists.txt | 2 +- packages/nox/test/epetra/Thyra/CMakeLists.txt | 4 +- .../lapack/LOCA_TestProblems/CMakeLists.txt | 2 +- packages/nox/test/tpetra/CMakeLists.txt | 2 +- packages/nox/test/utils/CMakeLists.txt | 2 +- packages/pamgen/src/CMakeLists.txt | 10 +- packages/pamgen/test/rtc_test/CMakeLists.txt | 2 +- .../panzer/adapters-ioss/src/CMakeLists.txt | 12 +- .../test/ioss_connmngr/CMakeLists.txt | 2 +- .../CurlLaplacianExample/CMakeLists.txt | 2 +- .../MixedCurlLaplacianExample/CMakeLists.txt | 2 +- .../MixedPoissonExample/CMakeLists.txt | 2 +- .../example/ModelEvaluator/CMakeLists.txt | 8 +- .../example/PoissonExample/CMakeLists.txt | 2 +- .../PoissonInterfaceExample/CMakeLists.txt | 2 +- .../PoissonInterfaceTpetra/CMakeLists.txt | 2 +- .../example/assembly_engine/CMakeLists.txt | 8 +- .../example/main_driver/CMakeLists.txt | 8 +- .../example/square_mesh/CMakeLists.txt | 2 +- .../panzer/adapters-stk/src/CMakeLists.txt | 12 +- .../test/assembly_engine/CMakeLists.txt | 8 +- .../test/bcstrategy/CMakeLists.txt | 6 +- .../test/evaluator_tests/CMakeLists.txt | 4 +- .../test/face_to_elem/CMakeLists.txt | 2 +- .../test/face_to_element/CMakeLists.txt | 2 +- .../test/field_manager_builder/CMakeLists.txt | 8 +- .../gather_scatter_evaluators/CMakeLists.txt | 8 +- .../initial_condition_builder/CMakeLists.txt | 8 +- .../test/ip_coordinates/CMakeLists.txt | 10 +- .../test/local_mesh/CMakeLists.txt | 2 +- .../test/model_evaluator/CMakeLists.txt | 8 +- .../test/node_normals/CMakeLists.txt | 2 +- .../panzer_workset_builder/CMakeLists.txt | 4 +- .../test/periodic_bcs/CMakeLists.txt | 2 +- .../test/projection/CMakeLists.txt | 4 +- .../test/response_library/CMakeLists.txt | 10 +- .../test/sideset_overlap/CMakeLists.txt | 2 +- .../adapters-stk/test/solver/CMakeLists.txt | 8 +- .../test/stk_connmngr/CMakeLists.txt | 2 +- .../test/stk_interface_test/CMakeLists.txt | 2 +- .../test/transform_bc_names/CMakeLists.txt | 2 +- .../tutorial/siamCse17/CMakeLists.txt | 2 +- .../tutorial/step01/CMakeLists.txt | 2 +- .../tutorial/step02/CMakeLists.txt | 2 +- packages/panzer/core/src/CMakeLists.txt | 4 +- packages/panzer/disc-fe/src/CMakeLists.txt | 14 +- .../disc-fe/test/closure_model/CMakeLists.txt | 2 +- .../closure_model_composite/CMakeLists.txt | 2 +- .../disc-fe/test/core_tests/CMakeLists.txt | 2 +- .../test/epetra_gatherscatter/CMakeLists.txt | 2 +- .../disc-fe/test/equation_set/CMakeLists.txt | 2 +- .../test/evaluator_tests/CMakeLists.txt | 2 +- .../disc-fe/test/la_factory/CMakeLists.txt | 4 +- .../disc-fe/test/local_mesh/CMakeLists.txt | 2 +- .../disc-fe/test/physics_block/CMakeLists.txt | 6 +- .../disc-fe/test/workset_tests/CMakeLists.txt | 2 +- .../example/CartesianScaling/CMakeLists.txt | 4 +- packages/panzer/dof-mgr/src/CMakeLists.txt | 6 +- .../test/cartesian_topology/CMakeLists.txt | 2 +- .../dof-mgr/test/dofmngr_test/CMakeLists.txt | 2 +- .../dof-mgr/test/fe_assembly/CMakeLists.txt | 2 +- .../dof-mgr/test/field_pattern/CMakeLists.txt | 2 +- packages/panzer/expr-eval/src/CMakeLists.txt | 2 +- .../mini-em/example/BlockPrec/CMakeLists.txt | 2 +- packages/panzer/mini-em/src/CMakeLists.txt | 14 +- packages/percept/CMakeLists.txt | 6 +- packages/percept/src/adapt/CMakeLists.txt | 12 +- .../percept/src/adapt/main/CMakeLists.txt | 8 +- .../src/adapt/sierra_element/CMakeLists.txt | 2 +- packages/percept/src/percept/CMakeLists.txt | 32 +- .../src/percept/eigen_verify/CMakeLists.txt | 2 +- .../src/percept/fixtures/CMakeLists.txt | 2 +- .../src/percept/function/CMakeLists.txt | 2 +- .../percept/function/internal/CMakeLists.txt | 2 +- .../percept/src/percept/math/CMakeLists.txt | 2 +- .../src/percept/mesh/gen/CMakeLists.txt | 2 +- .../percept/mesh/mod/smoother/CMakeLists.txt | 2 +- .../src/percept/mesh_transfer/CMakeLists.txt | 2 +- .../percept/src/percept/norm/CMakeLists.txt | 2 +- .../src/percept/stk_rebalance/CMakeLists.txt | 8 +- .../stk_rebalance_utils/CMakeLists.txt | 6 +- .../percept/src/percept/util/CMakeLists.txt | 2 +- .../percept/src/percept/xfer/CMakeLists.txt | 2 +- .../FiniteElementAssembly/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- packages/phalanx/src/CMakeLists.txt | 4 +- packages/phalanx/test/Kokkos/CMakeLists.txt | 4 +- .../Performance/FieldAccessors/CMakeLists.txt | 4 +- .../phalanx/test/Utilities/CMakeLists.txt | 2 +- .../phalanx/test/ViewOfViews/CMakeLists.txt | 4 +- packages/pike/blackbox/src/CMakeLists.txt | 4 +- .../pike/blackbox/test/core/CMakeLists.txt | 4 +- .../pike/blackbox/test/models/CMakeLists.txt | 4 +- packages/pike/implicit/src/CMakeLists.txt | 4 +- packages/piro/src/CMakeLists.txt | 8 +- packages/piro/test/CMakeLists.txt | 2 +- packages/pliris/src/CMakeLists.txt | 4 +- .../rol/adapters/arrayfire/CMakeLists.txt | 2 +- .../rol/adapters/arrayfire/src/CMakeLists.txt | 8 +- packages/rol/adapters/belos/CMakeLists.txt | 4 +- .../rol/adapters/belos/src/CMakeLists.txt | 12 +- .../adapters/belos/test/vector/CMakeLists.txt | 2 +- packages/rol/adapters/eigen/CMakeLists.txt | 2 +- .../rol/adapters/eigen/src/CMakeLists.txt | 8 +- packages/rol/adapters/epetra/CMakeLists.txt | 4 +- .../rol/adapters/epetra/src/CMakeLists.txt | 12 +- .../rol/adapters/minitensor/CMakeLists.txt | 6 +- .../adapters/minitensor/src/CMakeLists.txt | 18 +- packages/rol/adapters/mpi/CMakeLists.txt | 4 +- packages/rol/adapters/mpi/src/CMakeLists.txt | 8 +- packages/rol/adapters/pebbl/CMakeLists.txt | 6 +- .../rol/adapters/pebbl/src/CMakeLists.txt | 10 +- packages/rol/adapters/sacado/CMakeLists.txt | 2 +- .../rol/adapters/sacado/src/CMakeLists.txt | 8 +- .../rol/adapters/sacado/test/CMakeLists.txt | 2 +- packages/rol/adapters/teuchos/CMakeLists.txt | 6 +- .../rol/adapters/teuchos/src/CMakeLists.txt | 20 +- packages/rol/adapters/thyra/CMakeLists.txt | 4 +- .../rol/adapters/thyra/src/CMakeLists.txt | 12 +- packages/rol/adapters/tpetra/CMakeLists.txt | 10 +- .../rol/adapters/tpetra/src/CMakeLists.txt | 24 +- .../adapters/tpetra/test/sol/CMakeLists.txt | 2 +- .../tpetra/test/vector/CMakeLists.txt | 4 +- packages/rol/adapters/trikota/CMakeLists.txt | 4 +- .../rol/adapters/trikota/src/CMakeLists.txt | 12 +- .../adapters/trikota/test/sol/CMakeLists.txt | 2 +- packages/rol/cmake/BuildOptions.cmake | 248 +- .../PDE-OPT/0ld/adv-diff-react/CMakeLists.txt | 2 +- .../PDE-OPT/0ld/elasticity/CMakeLists.txt | 2 +- .../CMakeLists.txt | 6 +- .../PDE-OPT/0ld/poisson/CMakeLists.txt | 2 +- .../0ld/stefan-boltzmann/CMakeLists.txt | 6 +- .../PDE-OPT/0ld/stoch-adv-diff/CMakeLists.txt | 6 +- .../multipleFrequency/CMakeLists.txt | 6 +- .../helmholtz/singleFrequency/CMakeLists.txt | 6 +- .../example/poisson/singleObs/CMakeLists.txt | 6 +- .../PDE-OPT/adv-diff-react/CMakeLists.txt | 6 +- .../example/PDE-OPT/allen-cahn/CMakeLists.txt | 6 +- .../binary/adv-diff-SUR/CMakeLists.txt | 16 +- .../binary/adv-diff-TEST/CMakeLists.txt | 18 +- .../PDE-OPT/binary/adv-diff/CMakeLists.txt | 16 +- .../PDE-OPT/binary/elasticity/CMakeLists.txt | 14 +- .../binary/stefan-boltzmann/CMakeLists.txt | 18 +- .../PDE-OPT/dynamic/adv_diff/CMakeLists.txt | 2 +- .../dynamic/navier-stokes/CMakeLists.txt | 12 +- .../PDE-OPT/dynamic/semilinear/CMakeLists.txt | 8 +- .../dynamic/thermal-fluids/CMakeLists.txt | 6 +- .../flow-opt/3dim/models/darcy/CMakeLists.txt | 6 +- .../models/brinkman/CMakeLists.txt | 6 +- .../axisymmetric/models/darcy/CMakeLists.txt | 6 +- .../models/filteredDarcy/CMakeLists.txt | 6 +- .../PDE-OPT/fractional/poisson/CMakeLists.txt | 2 +- .../PDE-OPT/ginzburg-landau/CMakeLists.txt | 4 +- .../example/PDE-OPT/helmholtz/CMakeLists.txt | 4 +- .../PDE-OPT/navier-stokes/CMakeLists.txt | 6 +- .../PDE-OPT/nonlinear-elliptic/CMakeLists.txt | 6 +- .../example/PDE-OPT/obstacle/CMakeLists.txt | 2 +- .../PDE-OPT/poisson-boltzmann/CMakeLists.txt | 6 +- .../example/PDE-OPT/poisson/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../IMAvolumes_KouriRidzal2017/CMakeLists.txt | 10 +- .../MPA_KouriSurowiec2019/CMakeLists.txt | 6 +- .../CMakeLists.txt | 6 +- .../TRSPG_Kouri2021/dualksvm/CMakeLists.txt | 6 +- .../TRSPG_Kouri2021/dualsvm/CMakeLists.txt | 6 +- .../TRSPG_Kouri2021/elasticity/CMakeLists.txt | 6 +- .../TRSPG_Kouri2021/lasso/CMakeLists.txt | 6 +- .../navier-stokes/CMakeLists.txt | 6 +- .../TRSPG_Kouri2021/simpreg/CMakeLists.txt | 6 +- .../PDE-OPT/stefan-boltzmann/CMakeLists.txt | 6 +- .../rol/example/PDE-OPT/stokes/CMakeLists.txt | 4 +- .../PDE-OPT/thermal-fluids/CMakeLists.txt | 6 +- .../topo-opt/elasticity/CMakeLists.txt | 6 +- .../PDE-OPT/topo-opt/multimat/CMakeLists.txt | 6 +- .../topo-opt/navier-stokes/CMakeLists.txt | 6 +- .../PDE-OPT/topo-opt/poisson/CMakeLists.txt | 2 +- .../rol/example/PinT/nonlinear/CMakeLists.txt | 4 +- .../PinT/parabolic-control/CMakeLists.txt | 4 +- .../rol/example/PinT/tanks/CMakeLists.txt | 4 +- packages/rol/example/arrayfire/CMakeLists.txt | 2 +- .../example/burgers-control/CMakeLists.txt | 2 +- packages/rol/example/json/CMakeLists.txt | 2 +- .../rol/example/l1-penalty/CMakeLists.txt | 4 +- .../example/poisson-control/CMakeLists.txt | 4 +- packages/rol/example/sacado/CMakeLists.txt | 4 +- packages/rol/example/tempus/CMakeLists.txt | 2 +- .../rol/example/tensor-opt/CMakeLists.txt | 2 +- packages/rol/src/CMakeLists.txt | 60 +- packages/rol/src/compatibility/CMakeLists.txt | 4 +- packages/rol/test/elementwise/CMakeLists.txt | 2 +- .../test/step/interiorpoint/CMakeLists.txt | 4 +- packages/rtop/src/CMakeLists.txt | 12 +- .../rythmos/adapters/gaasp/src/CMakeLists.txt | 6 +- .../adapters/gaasp/tpl_src/CMakeLists.txt | 4 +- packages/rythmos/test/Charon/CMakeLists.txt | 2 +- .../rythmos/test/ThetaStepper/CMakeLists.txt | 2 +- packages/sacado/src/CMakeLists.txt | 12 +- .../sacado/test/GTestSuite/CMakeLists.txt | 4 +- .../test/performance/advection/CMakeLists.txt | 4 +- .../advection_const_basis/CMakeLists.txt | 4 +- .../performance/fenl_assembly/CMakeLists.txt | 4 +- .../fenl_assembly_view/CMakeLists.txt | 4 +- .../test/performance/mat_vec/CMakeLists.txt | 4 +- packages/sacado/test/utils/CMakeLists.txt | 4 +- .../applications/algebra/CMakeLists.txt | 2 +- .../applications/aprepro/CMakeLists.txt | 2 +- .../seacas/applications/blot/CMakeLists.txt | 2 +- .../applications/conjoin/CMakeLists.txt | 2 +- .../seacas/applications/cpup/CMakeLists.txt | 2 +- .../seacas/applications/ejoin/CMakeLists.txt | 2 +- .../seacas/applications/epu/CMakeLists.txt | 2 +- .../applications/ex1ex2v2/CMakeLists.txt | 2 +- .../applications/ex2ex1v2/CMakeLists.txt | 2 +- .../applications/exo2mat/CMakeLists.txt | 2 +- .../applications/exo_format/CMakeLists.txt | 2 +- .../applications/exodiff/CMakeLists.txt | 2 +- .../applications/exomatlab/CMakeLists.txt | 2 +- .../applications/exotec2/CMakeLists.txt | 2 +- .../seacas/applications/exotxt/CMakeLists.txt | 2 +- .../applications/explore/CMakeLists.txt | 2 +- .../seacas/applications/fastq/CMakeLists.txt | 2 +- .../seacas/applications/gen3d/CMakeLists.txt | 2 +- .../applications/genshell/CMakeLists.txt | 2 +- .../seacas/applications/gjoin/CMakeLists.txt | 2 +- .../seacas/applications/grepos/CMakeLists.txt | 2 +- .../applications/mapvar-kd/CMakeLists.txt | 2 +- .../seacas/applications/mapvar/CMakeLists.txt | 2 +- .../applications/mat2exo/CMakeLists.txt | 2 +- .../applications/nas2exo/CMakeLists.txt | 2 +- .../applications/nem_slice/CMakeLists.txt | 4 +- .../applications/nem_spread/CMakeLists.txt | 2 +- .../applications/numbers/CMakeLists.txt | 2 +- .../seacas/applications/slice/CMakeLists.txt | 2 +- .../seacas/applications/txtexo/CMakeLists.txt | 2 +- .../seacas/applications/zellij/CMakeLists.txt | 4 +- .../libraries/aprepro_lib/CMakeLists.txt | 2 +- .../seacas/libraries/chaco/CMakeLists.txt | 2 +- .../libraries/exoIIv2for32/CMakeLists.txt | 4 +- .../seacas/libraries/exodus/CMakeLists.txt | 4 +- .../libraries/exodus_for/CMakeLists.txt | 4 +- .../seacas/libraries/ioss/src/CMakeLists.txt | 6 +- .../libraries/ioss/src/adios/CMakeLists.txt | 4 +- .../ioss/src/adios/utest/CMakeLists.txt | 2 +- .../ioss/src/catalyst/CMakeLists.txt | 4 +- .../libraries/ioss/src/cgns/CMakeLists.txt | 4 +- .../libraries/ioss/src/exodus/CMakeLists.txt | 4 +- .../libraries/ioss/src/faodel/CMakeLists.txt | 4 +- .../ioss/src/gen_struc/CMakeLists.txt | 4 +- .../ioss/src/generated/CMakeLists.txt | 4 +- .../ioss/src/heartbeat/CMakeLists.txt | 4 +- .../libraries/ioss/src/init/CMakeLists.txt | 4 +- .../libraries/ioss/src/main/CMakeLists.txt | 4 +- .../libraries/ioss/src/pamgen/CMakeLists.txt | 4 +- .../ioss/src/text_mesh/CMakeLists.txt | 4 +- .../ioss/src/transform/CMakeLists.txt | 4 +- .../ioss/src/unit_tests/CMakeLists.txt | 2 +- .../libraries/ioss/src/utest/CMakeLists.txt | 2 +- .../ioss/src/visualization/CMakeLists.txt | 4 +- .../src/visualization/catalyst/CMakeLists.txt | 6 +- .../catalyst/parser/CMakeLists.txt | 4 +- .../seacas/libraries/mapvarlib/CMakeLists.txt | 2 +- .../seacas/libraries/nemesis/CMakeLists.txt | 2 +- packages/seacas/libraries/plt/CMakeLists.txt | 2 +- .../seacas/libraries/supes/CMakeLists.txt | 2 +- .../seacas/libraries/suplib/CMakeLists.txt | 2 +- .../seacas/libraries/suplib_c/CMakeLists.txt | 2 +- .../libraries/suplib_cpp/CMakeLists.txt | 2 +- packages/seacas/libraries/svdi/CMakeLists.txt | 2 +- packages/seacas/scripts/CMakeLists.txt | 2 +- packages/shards/src/CMakeLists.txt | 4 +- .../shylu/shylu_dd/common/src/CMakeLists.txt | 8 +- .../shylu/shylu_dd/core/src/CMakeLists.txt | 12 +- .../shylu/shylu_dd/core/test/CMakeLists.txt | 2 +- .../shylu/shylu_dd/frosch/src/CMakeLists.txt | 32 +- .../shylu_node/basker/src/CMakeLists.txt | 4 +- .../shylu_node/fastilu/src/CMakeLists.txt | 4 +- .../shylu/shylu_node/hts/src/CMakeLists.txt | 4 +- .../shylu_node/tacho/example/CMakeLists.txt | 4 +- .../shylu/shylu_node/tacho/src/CMakeLists.txt | 6 +- .../shylu_node/tacho/unit-test/CMakeLists.txt | 8 +- packages/stk/CMakeLists.txt | 2 +- .../stk_balance/stk_balance/CMakeLists.txt | 2 +- packages/stk/stk_coupling/CMakeLists.txt | 2 +- .../stk_coupling/stk_coupling/CMakeLists.txt | 2 +- .../stk_doc_tests/stk_balance/CMakeLists.txt | 4 +- .../stk/stk_doc_tests/stk_io/CMakeLists.txt | 16 +- .../stk/stk_doc_tests/stk_mesh/CMakeLists.txt | 6 +- .../stk/stk_doc_tests/stk_simd/CMakeLists.txt | 4 +- .../stk_doc_tests/stk_topology/CMakeLists.txt | 2 +- .../stk_doc_tests/stk_transfer/CMakeLists.txt | 6 +- .../stk/stk_doc_tests/stk_util/CMakeLists.txt | 2 +- .../stk_emend/independent_set/CMakeLists.txt | 2 +- .../independent_set/unit_tests/CMakeLists.txt | 8 +- .../stk_expreval/stk_expreval/CMakeLists.txt | 6 +- .../stk_expreval/unit_tests/CMakeLists.txt | 8 +- .../stk_balance/CMakeLists.txt | 6 +- .../stk_mesh/CMakeLists.txt | 12 +- .../stk_search/CMakeLists.txt | 2 +- .../stk_transfer/CMakeLists.txt | 12 +- packages/stk/stk_io/stk_io/CMakeLists.txt | 18 +- .../stk/stk_io/stk_io/util/CMakeLists.txt | 8 +- packages/stk/stk_math/stk_math/CMakeLists.txt | 2 +- .../stk/stk_mesh/stk_mesh/base/CMakeLists.txt | 2 +- .../stk_ngp_test/stk_ngp_test/CMakeLists.txt | 8 +- .../stk_mesh/CMakeLists.txt | 14 +- .../stk/stk_search/stk_search/CMakeLists.txt | 2 +- .../stk_search_util/CMakeLists.txt | 2 +- .../stk_search_util/unit_tests/CMakeLists.txt | 8 +- packages/stk/stk_simd/stk_math/CMakeLists.txt | 6 +- packages/stk/stk_simd/stk_simd/CMakeLists.txt | 6 +- .../stk_simd/kokkos_simd/CMakeLists.txt | 6 +- .../stk/stk_simd/stk_simd_view/CMakeLists.txt | 6 +- .../stk/stk_tools/stk_tools/CMakeLists.txt | 2 +- .../stk_topology/stk_topology/CMakeLists.txt | 2 +- packages/stk/stk_transfer/CMakeLists.txt | 2 +- .../stk_unit_test_utils/CMakeLists.txt | 10 +- .../stk_mesh_fixtures/CMakeLists.txt | 4 +- .../stk_unit_tests/stk_balance/CMakeLists.txt | 4 +- .../stk_coupling/CMakeLists.txt | 2 +- .../stk/stk_unit_tests/stk_io/CMakeLists.txt | 6 +- .../stk_unit_tests/stk_math/CMakeLists.txt | 8 +- .../stk_unit_tests/stk_mesh/CMakeLists.txt | 2 +- .../stk_ngp_test/CMakeLists.txt | 4 +- .../stk_unit_tests/stk_search/CMakeLists.txt | 2 +- .../stk_unit_tests/stk_simd/CMakeLists.txt | 8 +- .../stk_simd_old/CMakeLists.txt | 8 +- .../stk_unit_tests/stk_tools/CMakeLists.txt | 4 +- .../stk_topology/CMakeLists.txt | 6 +- .../stk_transfer/CMakeLists.txt | 8 +- .../stk_unit_tests/stk_util/CMakeLists.txt | 2 +- packages/stk/stk_util/stk_util/CMakeLists.txt | 2 +- .../stk_util/command_line/CMakeLists.txt | 2 +- .../stk/stk_util/stk_util/diag/CMakeLists.txt | 2 +- .../stk_util/environment/CMakeLists.txt | 2 +- .../stk/stk_util/stk_util/ngp/CMakeLists.txt | 2 +- .../stk_util/stk_util/parallel/CMakeLists.txt | 2 +- .../stk_util/stk_util/registry/CMakeLists.txt | 2 +- .../stk/stk_util/stk_util/util/CMakeLists.txt | 2 +- packages/stokhos/src/CMakeLists.txt | 70 +- .../test/Performance/CuspAMG/CMakeLists.txt | 4 +- .../test/Performance/CuspSpMM/CMakeLists.txt | 4 +- .../Performance/FadMPAssembly/CMakeLists.txt | 4 +- .../KokkosArraySPMVKernels/CMakeLists.txt | 4 +- .../Performance/KokkosSpMM/CMakeLists.txt | 4 +- .../Performance/MPAssembly/CMakeLists.txt | 4 +- .../MPVectorKernels/CMakeLists.txt | 4 +- .../PCEMeanMultiply/CMakeLists.txt | 4 +- .../adapters/amesos/src/CMakeLists.txt | 2 +- .../adapters/amesos2/src/CMakeLists.txt | 4 +- .../adapters/aztecoo/src/CMakeLists.txt | 2 +- .../adapters/belos/src/CMakeLists.txt | 6 +- .../adapters/ifpack/src/CMakeLists.txt | 2 +- .../adapters/ml/src/CMakeLists.txt | 2 +- .../doc/parameterList/CMakeLists.txt | 2 +- packages/stratimikos/src/CMakeLists.txt | 4 +- .../examples/AddMultiplyPrecs/CMakeLists.txt | 2 +- .../examples/BasicExamples/CMakeLists.txt | 2 +- .../BuildPreconditioner/CMakeLists.txt | 2 +- .../BuildPreconditioner/step1/CMakeLists.txt | 2 +- .../examples/ML-Teko-Coupling/CMakeLists.txt | 2 +- .../teko/examples/StridedSolve/CMakeLists.txt | 2 +- packages/teko/src/CMakeLists.txt | 12 +- .../examples/00_Basic_Problem/CMakeLists.txt | 2 +- .../examples/01_Utilize_Thyra/CMakeLists.txt | 2 +- .../02_Use_ModelEvaluator/CMakeLists.txt | 2 +- packages/tempus/src/CMakeLists.txt | 4 +- packages/tempus/src/deprecated/CMakeLists.txt | 4 +- packages/tempus/test/BDF2/CMakeLists.txt | 2 +- .../tempus/test/BackwardEuler/CMakeLists.txt | 2 +- packages/tempus/test/DIRK/CMakeLists.txt | 2 +- .../tempus/test/ExplicitRK/CMakeLists.txt | 2 +- .../tempus/test/ForwardEuler/CMakeLists.txt | 2 +- packages/tempus/test/HHTAlpha/CMakeLists.txt | 2 +- packages/tempus/test/IMEX_RK/CMakeLists.txt | 2 +- .../test/IMEX_RK_Partitioned/CMakeLists.txt | 2 +- packages/tempus/test/Leapfrog/CMakeLists.txt | 2 +- packages/tempus/test/Newmark/CMakeLists.txt | 2 +- .../tempus/test/OperatorSplit/CMakeLists.txt | 2 +- .../tempus/test/PhysicsState/CMakeLists.txt | 2 +- .../tempus/test/Subcycling/CMakeLists.txt | 2 +- .../tempus/test/TestModels/CMakeLists.txt | 6 +- packages/tempus/test/TestUtils/CMakeLists.txt | 2 +- .../tempus/test/Trapezoidal/CMakeLists.txt | 2 +- packages/tempus/unit_test/CMakeLists.txt | 2 +- packages/teuchos/comm/src/CMakeLists.txt | 4 +- packages/teuchos/core/src/CMakeLists.txt | 10 +- .../core/test/CWrapperSupport/CMakeLists.txt | 2 +- .../teuchos/kokkoscomm/src/CMakeLists.txt | 4 +- .../teuchos/kokkoscompat/src/CMakeLists.txt | 4 +- .../teuchos/kokkoscompat/test/CMakeLists.txt | 6 +- packages/teuchos/numerics/src/CMakeLists.txt | 4 +- .../teuchos/parameterlist/src/CMakeLists.txt | 4 +- .../test/Validators/CMakeLists.txt | 2 +- packages/teuchos/parser/src/CMakeLists.txt | 4 +- packages/teuchos/remainder/src/CMakeLists.txt | 6 +- .../thyra/adapters/epetra/src/CMakeLists.txt | 2 +- .../example/model_evaluator/CMakeLists.txt | 2 +- .../adapters/epetraext/src/CMakeLists.txt | 4 +- .../thyra/adapters/tpetra/src/CMakeLists.txt | 2 +- packages/thyra/core/src/CMakeLists.txt | 28 +- packages/tpetra/core/compat/CMakeLists.txt | 6 +- packages/tpetra/core/ext/CMakeLists.txt | 4 +- packages/tpetra/core/inout/CMakeLists.txt | 4 +- packages/tpetra/core/src/CMakeLists.txt | 6 +- .../test/PerformanceCGSolve/CMakeLists.txt | 2 +- packages/tpetra/tsqr/src/CMakeLists.txt | 4 +- .../examples/fenl/CMakeLists.txt | 4 +- packages/trilinoscouplings/src/CMakeLists.txt | 14 +- packages/triutils/src/CMakeLists.txt | 4 +- packages/xpetra/example/CMakeLists.txt | 4 +- packages/xpetra/example/Simple/CMakeLists.txt | 2 +- packages/xpetra/research/max/CMakeLists.txt | 2 +- packages/xpetra/src/CMakeLists.txt | 44 +- packages/xpetra/sup/CMakeLists.txt | 8 +- .../zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt | 2 +- packages/zoltan/src/CMakeLists.txt | 50 +- packages/zoltan/src/fdriver/CMakeLists.txt | 2 +- packages/zoltan2/core/src/CMakeLists.txt | 36 +- packages/zoltan2/sphynx/src/CMakeLists.txt | 6 +- 733 files changed, 4780 insertions(+), 4904 deletions(-) delete mode 100644 cmake/tribits/common_tpls/FindTPLLAPACKDependencies.cmake delete mode 100644 cmake/tribits/core/package_arch/TribitsGetEnabledSublists.cmake delete mode 100644 cmake/tribits/core/package_arch/TribitsGetPackageEnableStatus.cmake delete mode 100644 cmake/tribits/core/package_arch/TribitsSetAndIncDirs.cmake delete mode 100644 cmake/tribits/core/package_arch/TribitsSetUpEnabledOnlyDependencies.cmake create mode 100644 cmake/tribits/core/utils/CMakeOverrides.cmake rename cmake/tribits/core/utils/{TribitsCreateReverseList.cmake => SetAndIncDirs.cmake} (80%) delete mode 100644 cmake/tribits/core/utils/TribitsAddEnumCacheVar.cmake delete mode 100644 cmake/tribits/core/utils/TribitsDeprecatedHelpers.cmake delete mode 100644 cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLLAPACKDependencies.cmake delete mode 100644 cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLParMETISDependencies.cmake delete mode 100644 cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDependencies.cmake delete mode 100644 cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDistDependencies.cmake delete mode 100644 cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/PackagesList.cmake delete mode 100644 cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/TPLsList.cmake delete mode 100644 cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/cmake/Dependencies.cmake delete mode 100644 cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/inc/SimpleCxx_HelloWorld_Tests.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 01f7a476c14a..f6aef3721c6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,6 @@ INCLUDE(${CMAKE_CURRENT_LIST_DIR}/ProjectName.cmake) # not in an include file :-( PROJECT(${PROJECT_NAME} NONE) -# Set up to use ccache if($ENV{CCACHE_NODISABLE}) # ccache must be requested explicitly by setting env-var CCACHE_NODISABLE find_program(CCACHE_PROGRAM ccache) @@ -101,12 +100,9 @@ else() endif() endif() -# Set an env so we know we are in configure +## set an env so we know we are in configure set(ENV{CMAKE_IS_IN_CONFIGURE_MODE} 1) -# Don't define TriBITS override of include_directories() -set(TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE TRUE) - # # B) Pull in the TriBITS system and execute # diff --git a/cmake/tribits/CHANGELOG.md b/cmake/tribits/CHANGELOG.md index c0ad93274308..144bb070dce2 100644 --- a/cmake/tribits/CHANGELOG.md +++ b/cmake/tribits/CHANGELOG.md @@ -2,82 +2,6 @@ ChangeLog for TriBITS ---------------------------------------- -## 2022-12-20: - -* **Deprecated:** The macro `set_and_inc_dirs()` is deprecated and replaced by - `tribits_set_and_inc_dirs()`. Use the script - `TriBITS/refactoring/replace_set_and_inc_dirs_r.sh` to update - `CMakeLists.txt` files. - -## 2022-11-03: - -* **Deprecated:** The long-deprecated TriBITS function override - `include_directories()` now emits a deprecated warning. To replace all - usages of `include_directories()` that should be - `tribits_include_directories()`, use the script - `TriBITS/refactoring/replace_include_directories_r.sh` (see documentation in - that script). - -* **Deprecated:** Many previously deprecated TriBITS features now will trigger - a CMake DEPRECATION warning message by default (by calling - `message(DEPRECATION ...)`). The message printed to the CMake output will - typically describe how to remove the usage of the deprecated feature. To - remove deprecation warnings, change to use the non-deprecated features - mentioned in the deprecation warning message. To temporarily disable - deprecation warnings, configure with `-D - TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE=IGNORE` (see build reference entry - for `TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE` for more details). - -## 2022-10-20: - -* **Changed:** Disabling an external package/TPL will now disable any - downstream external packages/TPLs that list a dependency on that external - package/TPL through its - [`FindTPLDependencies.cmake`](https://tribitspub.github.io/TriBITS/users_guide/index.html#findtpl-tplname-dependencies-cmake) - file. Prior to this, disabling an external package/TPL would not disable - dependent downstream external packages/TPLs (it would only disable - downstream dependent required internal packages). To avoid this, simply - leave the enable status of the upstream external package/TPL empty "" and no - downstream propagation of disables will take place. - -## 2022-10-16: - -* **Removed:** Removed the variables `_LIBRARY_DIRS`, - `_TPL_LIST` and `_TPL_LIBRARIES` from the installed - `Config.cmake` file. These are not needed after the change to - modern CMake targets `::all_libs` (see `::all_libs` - below). To determine if a TPL is enabled, check `if (TARGET - ::all_libs)`. To get the libraries and include dirs for a TPL, - link against the IMPORTED target `::all_libs` (see the updated - TriBITS example APP projects for details). - -* **Removed:** Removed the variables `_PACKAGE_LIST`, - `_TPL_LIST`, `_INCLUDE_DIR`, `_LIBRARY_DIRS`, - `_TPL_INCLUDE_DIRS`, `_TPL_LIBRARIES` and - `_TPL_LIBRARY_DIRS` from the generated `Config.cmake` - files. These are not needed with the move to modern CMake targets (see - `::all_libs` below). - -* **Changed:** Changed `_LIBRARIES` in generated - `Config.cmake` files from the full list of the package's library - targets to just `::all_libs`. (There is no need to list the - individual libraries after the move to modern CMake targets.) - -## 2022-10-11: - -* **Changed:** Added option `_ASSERT_DEFINED_DEPENDENCIES` to - determine if listed external package/TPL and internal package dependencies - are defined within the project or not. The initial default is `FATAL_ERROR` - for development mode and `IGNORE` for release mode. (Previously, undefined - external package/TPL dependencies where ignore.) To set a different - default, set `_ASSERT_DEFINED_DEPENDENCIES_DEFAULT` to `WARNING`, - for example, in the project's `ProjectName.cmake` file. - -* **Removed:** `_ASSERT_MISSING_PACKAGES` has been removed and setting - it will result in a `FATAL_ERROR`. Instead, use - `_ASSERT_DEFINED_DEPENDENCIES` (and make sure all of your project's - listed TPL dependencies are all defined within the project). - ## 2022-10-02: * **Changed:** The TriBITS FindTPLCUDA.cmake module changed @@ -87,6 +11,7 @@ ChangeLog for TriBITS `find_package(CUDAToolkit)` (see [Trilinos #10954](https://github.com/trilinos/Trilinos/issues/10954)). + ## 2022-09-16: * **Changed:** Changed nomenclature for packages and TPLs (see updated diff --git a/cmake/tribits/ci_support/TribitsDumpDepsXmlScript.cmake b/cmake/tribits/ci_support/TribitsDumpDepsXmlScript.cmake index 5c926e9023f6..771c2e6dcd31 100644 --- a/cmake/tribits/ci_support/TribitsDumpDepsXmlScript.cmake +++ b/cmake/tribits/ci_support/TribitsDumpDepsXmlScript.cmake @@ -116,8 +116,8 @@ include(TribitsWriteXmlDependenciesFiles) # Generate the dependencies file -set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES OFF) -set(${PROJECT_NAME}_OUTPUT_DEPENDENCY_FILES FALSE) +set(${PROJECT_NAME}_ASSERT_MISSING_PACKAGES FALSE) +set(${PROJECT_NAME}_OUTPUT_DEPENDENCY_FILES FALSE) if (NOT ${PROJECT_NAME}_PRE_REPOSITORIES) # Make sure is defined! set(${PROJECT_NAME}_PRE_REPOSITORIES "") endif() diff --git a/cmake/tribits/ci_support/TribitsWriteXmlDependenciesFiles.cmake b/cmake/tribits/ci_support/TribitsWriteXmlDependenciesFiles.cmake index 1091008e3c01..4050ba3e5060 100644 --- a/cmake/tribits/ci_support/TribitsWriteXmlDependenciesFiles.cmake +++ b/cmake/tribits/ci_support/TribitsWriteXmlDependenciesFiles.cmake @@ -38,215 +38,172 @@ # @HEADER -################################################################################ -# NOTE: This file gets included in the main TriBITS core framework. It is put -# here to reduce the size of the tribits/core/ directory as this is optional -# behavior. -################################################################################ - - -# @MACRO: tribits_write_xml_dependency_files() -# -# Usage:: -# -# tribits_write_xml_dependency_files() # -# Macro that outputs XML dependency files if asked based in the global project -# package dependency graph previously constructed. +# This file gets included in the main TriBITS framework. It is put here to +# reduce the size of the tribits/core/ directory. # -macro(tribits_write_xml_dependency_files) - tribits_config_code_start_timer(WRITE_DEPENDENCY_FILES_TIME_START_SECONDS) - if (${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE) - if (NOT IS_ABSOLUTE ${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE}) - set(${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE - ${CMAKE_CURRENT_BINARY_DIR}/${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE}) - endif() - message("" ) - message("Dumping the XML dependencies file" - " ${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} ..." ) - tribits_dump_deps_xml_file() - endif() +function(tribits_write_deps_to_xml_string PACKAGE_NAME LIST_TYPE + XML_VAR + ) - if (${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE AND ${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE) - if (NOT IS_ABSOLUTE ${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE}) - set(${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE - ${CMAKE_CURRENT_BINARY_DIR}/${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE}) - endif() - message("" ) - message("Dumping the HTML dependencies webpage file" - " ${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE} ..." ) - set(tribitsCiSupportDir "${${PROJECT_NAME}_TRIBITS_DIR}/${TRIBITS_CI_SUPPORT_DIR}") - execute_process( - COMMAND ${PYTHON_EXECUTABLE} - ${tribitsCiSupportDir}/dump-package-dep-table.py - --input-xml-deps-file=${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} - --output-html-deps-file=${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE} ) - endif() + set(LOC_XML "${${XML_VAR}}") + + set(DEPS_VAR ${PACKAGE_NAME}_${LIST_TYPE}) + assert_defined(DEPS_VAR) + set(DEPS ${${DEPS_VAR}}) + + #print_var(PACKAGE_NAME) + #print_var(DEPS) + + if (NOT DEPS) + + list(APPEND LOC_XML + " <${LIST_TYPE}/>\n" ) + + else() + + set(VALUE_STR "") + + foreach(DEP ${DEPS}) + + if(VALUE_STR) + set(VALUE_STR "${VALUE_STR},") + endif() + + set(VALUE_STR "${VALUE_STR}${DEP}") + + endforeach() + + list(APPEND LOC_XML + " <${LIST_TYPE} value=\"${VALUE_STR}\"/>\n" ) - if (${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE AND ${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE) - if (NOT IS_ABSOLUTE ${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE}) - set(${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE - ${CMAKE_CURRENT_BINARY_DIR}/${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE}) - endif() - message("" ) - message("Dumping the CDash XML dependencies file" - " ${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE} ..." ) - set(tribitsCtestDriverDir - "${${PROJECT_NAME}_TRIBITS_DIR}/${TRIBITS_CTEST_DRIVER_DIR}") - if (EXISTS "${tribitsCtestDriverDir}") - execute_process( - COMMAND ${PYTHON_EXECUTABLE} - ${tribitsCtestDriverDir}/dump-cdash-deps-xml-file.py - --input-xml-deps-file=${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} - --output-cdash-deps-xml-file=${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE}) - else() - message(FATAL_ERROR "\nERROR: Can't write" - " ${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE}" - " because '${tribitsCtestDriverDir}' does not exist!") - endif() endif() - if (${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE - OR ${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE - OR ${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE - ) - tribits_config_code_stop_timer(WRITE_DEPENDENCY_FILES_TIME_START_SECONDS - "\nTotal time to write dependency files") + if (LOC_XML) + set(${XML_VAR} "${LOC_XML}" PARENT_SCOPE) endif() -endmacro() +endfunction() -# Function that writes the dependency information for the TriBITS project -# ${PROJECT_NAME} into an XML file for other tools to use. # +# Function that writes the dependency information for ${PROJECT_NAME} into +# an XML file for other tools to use. +# + function(tribits_dump_deps_xml_file) - set(depsXml "") + set(DEPS_XM) get_filename_component(PROJECT_BASE_DIR_NAME "${${PROJECT_NAME}_SOURCE_DIR}" NAME) - list(APPEND depsXml + list(APPEND DEPS_XML "\n" ) - foreach(tribitsPackage ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) - list(APPEND depsXml - " \n") + #message("") + #print_var(TRIBITS_PACKAGE) - tribits_write_deps_to_xml_string(${tribitsPackage} LIB REQUIRED PACKAGES depsXml) - tribits_write_deps_to_xml_string(${tribitsPackage} LIB OPTIONAL PACKAGES depsXml) - tribits_write_deps_to_xml_string(${tribitsPackage} TEST REQUIRED PACKAGES depsXml) - tribits_write_deps_to_xml_string(${tribitsPackage} TEST OPTIONAL PACKAGES depsXml) - tribits_write_deps_to_xml_string(${tribitsPackage} LIB REQUIRED TPLS depsXml) - tribits_write_deps_to_xml_string(${tribitsPackage} LIB OPTIONAL TPLS depsXml) - tribits_write_deps_to_xml_string(${tribitsPackage} TEST REQUIRED TPLS depsXml) - tribits_write_deps_to_xml_string(${tribitsPackage} TEST OPTIONAL TPLS depsXml) + list(APPEND DEPS_XML + " \n") - list(APPEND depsXml + tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} LIB_REQUIRED_DEP_PACKAGES DEPS_XML) + tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} LIB_OPTIONAL_DEP_PACKAGES DEPS_XML) + tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} TEST_REQUIRED_DEP_PACKAGES DEPS_XML) + tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} TEST_OPTIONAL_DEP_PACKAGES DEPS_XML) + tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} LIB_REQUIRED_DEP_TPLS DEPS_XML) + tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} LIB_OPTIONAL_DEP_TPLS DEPS_XML) + tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} TEST_REQUIRED_DEP_TPLS DEPS_XML) + tribits_write_deps_to_xml_string(${TRIBITS_PACKAGE} TEST_OPTIONAL_DEP_TPLS DEPS_XML) + + list(APPEND DEPS_XML " \n" - " \n" + " \n" " \n" ) - list(APPEND depsXml - " \n" + list(APPEND DEPS_XML + " \n" ) - list(APPEND depsXml + list(APPEND DEPS_XML " \n" ) endforeach() - list(APPEND depsXml + list(APPEND DEPS_XML "\n" ) - string(REPLACE "\n;" "\n" depsXml "${depsXml}") - file(WRITE ${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} "${depsXml}" ) - -endfunction() - - -function(tribits_write_deps_to_xml_string packageName libOrTest requiredOrOptional - packagesOrTpls xmlVarInOut - ) - - set(localXml "${${xmlVarInOut}}") - - set(listType ${libOrTest}_${requiredOrOptional}_DEP_${packagesOrTpls}) - message("") - print_var(listType) - - tribits_get_legacy_package_deps_sublist(${packageName} ${libOrTest} - ${requiredOrOptional} ${packagesOrTpls} legacyPackageDepsList) - - if (NOT legacyPackageDepsList) - list(APPEND localXml - " <${listType}/>\n" ) - else() - set(depsListStr "") - foreach(depPkg IN LISTS legacyPackageDepsList) - tribits_append_dep_to_xml_string(${depPkg} depsListStr) - endforeach() - list(APPEND localXml - " <${listType} value=\"${depsListStr}\"/>\n" ) - endif() - - if (localXml) - set(${xmlVarInOut} "${localXml}" PARENT_SCOPE) - endif() + #print_var(DEPS_XML) + string(REPLACE "\n;" "\n" DEPS_XML "${DEPS_XML}") + file(WRITE ${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} "${DEPS_XML}" ) endfunction() -function(tribits_get_legacy_package_deps_sublist packageName libOrTest - requiredOrOptional packagesOrTpls legacyPackageDepsListOut - ) - - set(legacyPackageDepsList "") +# @MACRO: tribits_write_xml_dependency_files() +# +# Usage:: +# +# tribits_write_xml_dependency_files() +# +# Macro that output XML dependency files if asked based in the global project +# package dependency graph previously constructed.. +# +macro(tribits_write_xml_dependency_files) - foreach(depPkg IN LISTS ${packageName}_${libOrTest}_DEFINED_DEPENDENCIES) + tribits_config_code_start_timer(WRITE_DEPENDENCY_FILES_TIME_START_SECONDS) - set(matchesRequriedOrOptional FALSE) - if (((requiredOrOptional STREQUAL "REQUIRED") - AND ${packageName}_${libOrTest}_DEP_REQUIRED_${depPkg}) - OR - ((requiredOrOptional STREQUAL "OPTIONAL") - AND (NOT ${packageName}_${libOrTest}_DEP_REQUIRED_${depPkg})) - ) - set(matchesRequriedOrOptional TRUE) + #print_var(${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE) + if (${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE) + if (NOT IS_ABSOLUTE ${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE}) + set(${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE + ${CMAKE_CURRENT_BINARY_DIR}/${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE}) endif() + message("" ) + message("Dumping the XML dependencies file ${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} ..." ) + tribits_dump_deps_xml_file() + endif() - set(matchesPackagesOrTpls FALSE) - if (((packagesOrTpls STREQUAL "PACKAGES") - AND (${depPkg}_PACKAGE_BUILD_STATUS STREQUAL "INTERNAL")) - OR - ((packagesOrTpls STREQUAL "TPLS") - AND (${depPkg}_PACKAGE_BUILD_STATUS STREQUAL "EXTERNAL")) - ) - set(matchesPackagesOrTpls TRUE) + #print_var(${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE) + if (${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE AND ${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE) + if (NOT IS_ABSOLUTE ${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE}) + set(${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE + ${CMAKE_CURRENT_BINARY_DIR}/${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE}) endif() + message("" ) + message("Dumping the HTML dependencies webpage file ${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE} ..." ) + execute_process( + COMMAND ${PYTHON_EXECUTABLE} + ${${PROJECT_NAME}_TRIBITS_DIR}/${TRIBITS_CI_SUPPORT_DIR}/dump-package-dep-table.py + --input-xml-deps-file=${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} + --output-html-deps-file=${${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE} ) + endif() - if (matchesRequriedOrOptional AND matchesPackagesOrTpls) - list(APPEND legacyPackageDepsList ${depPkg}) + #print_var(${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE) + if (${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE AND ${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE) + if (NOT IS_ABSOLUTE ${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE}) + set(${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE}) endif() + message("" ) + message("Dumping the CDash XML dependencies file ${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE} ..." ) + execute_process( + COMMAND ${PYTHON_EXECUTABLE} + ${${PROJECT_NAME}_TRIBITS_DIR}/${TRIBITS_CTEST_DRIVER_DIR}/dump-cdash-deps-xml-file.py + --input-xml-deps-file=${${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE} + --output-cdash-deps-xml-file=${${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE} ) + endif() - endforeach() - - set(${legacyPackageDepsListOut} "${legacyPackageDepsList}" PARENT_SCOPE) - -endfunction() - - - -function(tribits_append_dep_to_xml_string depPkg depsListStrInOut) - set(depsListStr "${${depsListStrInOut}}") - if (depsListStr) - string(APPEND depsListStr ",") + if (${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE + OR ${PROJECT_NAME}_DEPS_HTML_OUTPUT_FILE + OR ${PROJECT_NAME}_CDASH_DEPS_XML_OUTPUT_FILE + ) + tribits_config_code_stop_timer(WRITE_DEPENDENCY_FILES_TIME_START_SECONDS + "\nTotal time to write dependency files") endif() - string(APPEND depsListStr "${depPkg}") - set(${depsListStrInOut} "${depsListStr}" PARENT_SCOPE) -endfunction() + +endmacro() diff --git a/cmake/tribits/common_tpls/FindTPLHDF5.cmake b/cmake/tribits/common_tpls/FindTPLHDF5.cmake index d89e4cd98415..57bb3c3eff01 100644 --- a/cmake/tribits/common_tpls/FindTPLHDF5.cmake +++ b/cmake/tribits/common_tpls/FindTPLHDF5.cmake @@ -6,7 +6,7 @@ set(HDF5_INTERNAL_IS_MODERN FALSE) if (Netcdf_ALLOW_MODERN) - set(minimum_modern_HDF5_version 1.10.9) + set(minimum_modern_HDF5_version 1.13.2) print_var(Netcdf_ALLOW_MODERN) message("-- Using find_package(HDF5 ${minimum_modern_HDF5_version} CONFIG) ...") find_package(HDF5 ${minimum_modern_HDF5_version} CONFIG) diff --git a/cmake/tribits/common_tpls/FindTPLLAPACKDependencies.cmake b/cmake/tribits/common_tpls/FindTPLLAPACKDependencies.cmake deleted file mode 100644 index 0256dbbfd4dd..000000000000 --- a/cmake/tribits/common_tpls/FindTPLLAPACKDependencies.cmake +++ /dev/null @@ -1,2 +0,0 @@ -tribits_extpkg_define_dependencies( LAPACK - DEPENDENCIES BLAS) diff --git a/cmake/tribits/common_tpls/FindTPLNetcdf.cmake b/cmake/tribits/common_tpls/FindTPLNetcdf.cmake index d025130f7d82..f81e3b9259d5 100644 --- a/cmake/tribits/common_tpls/FindTPLNetcdf.cmake +++ b/cmake/tribits/common_tpls/FindTPLNetcdf.cmake @@ -37,7 +37,9 @@ # ************************************************************************ # @HEADER -cmake_policy(SET CMP0074 NEW) +if (${CMAKE_VERSION} GREATER "3.13") + cmake_policy(SET CMP0074 NEW) +endif() set(Netcdf_ALLOW_MODERN FALSE CACHE BOOL "Allow finding Netcdf as a modern CMake config file with exported targets (and only this way)") diff --git a/cmake/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in b/cmake/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in index 499d5352e45f..465648d63ac3 100644 --- a/cmake/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in +++ b/cmake/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in @@ -101,8 +101,23 @@ set(${EXPORT_FILE_VAR_PREFIX}_AR ${CMAKE_AR}) ## Base install location (if not in the build tree) set(${EXPORT_FILE_VAR_PREFIX}_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@") +## List of package include dirs +set(${EXPORT_FILE_VAR_PREFIX}_INCLUDE_DIRS "") + +## List of package library paths +set(${EXPORT_FILE_VAR_PREFIX}_LIBRARY_DIRS "") + ## List of package libraries -set(${EXPORT_FILE_VAR_PREFIX}_LIBRARIES ${PACKAGE_NAME}::all_libs) +set(${EXPORT_FILE_VAR_PREFIX}_LIBRARIES "${FULL_LIBRARY_SET}") + +## Specification of directories for TPL headers +set(${EXPORT_FILE_VAR_PREFIX}_TPL_INCLUDE_DIRS "") + +## Specification of directories for TPL libraries +set(${EXPORT_FILE_VAR_PREFIX}_TPL_LIBRARY_DIRS "") + +## List of required TPLs +set(${EXPORT_FILE_VAR_PREFIX}_TPL_LIBRARIES "${${PACKAGE_NAME}_TPL_LIBRARIES}") ## --------------------------------------------------------------------------- ## MPI specific variables @@ -121,6 +136,12 @@ set(${EXPORT_FILE_VAR_PREFIX}_MPI_EXEC_NUMPROCS_FLAG "${MPI_EXEC_NUMPROCS_FLAG}" ## Set useful general variables ## --------------------------------------------------------------------------- +## The packages enabled for this project +set(${EXPORT_FILE_VAR_PREFIX}_PACKAGE_LIST "${FULL_PACKAGE_SET}") + +## The TPLs enabled for this project +set(${EXPORT_FILE_VAR_PREFIX}_TPL_LIST "${ORDERED_FULL_TPL_SET}") + ${PACKAGE_CONFIG_CODE} ## ---------------------------------------------------------------------------- diff --git a/cmake/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in b/cmake/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in index 09c413821945..67eb685ed483 100644 --- a/cmake/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in +++ b/cmake/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in @@ -123,6 +123,7 @@ foreach (comp IN ITEMS ${PDOLLAR}{COMPONENTS_LIST}) include(${PDOLLAR}{compPkgConfigFile}) # Add variables to lists. list(APPEND ${PROJECT_NAME}_LIBRARIES ${PDOLLAR}{${PDOLLAR}{comp}_LIBRARIES}) + list(APPEND ${PROJECT_NAME}_TPL_LIBRARIES ${PDOLLAR}{${PDOLLAR}{comp}_TPL_LIBRARIES}) list(APPEND selectedComponentsFound ${PDOLLAR}{comp}) else() set(${PROJECT_NAME}_${PDOLLAR}{comp}_FOUND FALSE) @@ -137,8 +138,18 @@ endforeach() # Deprecated (see #299)! set(${PROJECT_NAME}_INCLUDE_DIRS "${TRIBITS_PROJECT_INSTALL_INCLUDE_DIR}") +# Deprecated (see #299)! +set(${PROJECT_NAME}_LIBRARY_DIRS "") + # Remove duplicates in ${PROJECT_NAME}_LIBRARIES +list(REVERSE ${PROJECT_NAME}_LIBRARIES) list(REMOVE_DUPLICATES ${PROJECT_NAME}_LIBRARIES) +list(REVERSE ${PROJECT_NAME}_LIBRARIES) + +# Remove duplicates in ${PROJECT_NAME}_TPL_LIBRARIES +list(REVERSE ${PROJECT_NAME}_TPL_LIBRARIES) +list(REMOVE_DUPLICATES ${PROJECT_NAME}_TPL_LIBRARIES) +list(REVERSE ${PROJECT_NAME}_TPL_LIBRARIES) ## --------------------------------------------------------------------------- ## MPI specific variables @@ -175,6 +186,9 @@ set(${PROJECT_NAME}_PACKAGE_LIST "${FULL_PACKAGE_SET}") ## The selected packages for this project set(${PROJECT_NAME}_SELECTED_PACKAGE_LIST "${PDOLLAR}{selectedComponentsFound}") +## The TPLs enabled for this project +set(${PROJECT_NAME}_TPL_LIST "${FULL_TPL_SET}") + ## --------------------------------------------------------------------------- ## Modern CMake (IMPORTED) targets ## --------------------------------------------------------------------------- diff --git a/cmake/tribits/core/package_arch/TribitsAddAdvancedTest.cmake b/cmake/tribits/core/package_arch/TribitsAddAdvancedTest.cmake index 0faae73d3a13..b7627d603882 100644 --- a/cmake/tribits/core/package_arch/TribitsAddAdvancedTest.cmake +++ b/cmake/tribits/core/package_arch/TribitsAddAdvancedTest.cmake @@ -157,10 +157,13 @@ include(PrintVar) # for the overall test to pass. # # Finally, the test is only added if tests are enabled for the package -# (i.e. `${PACKAGE_NAME}_ENABLE_TESTS`_ ``= ON``) and if other criteria are -# met (see `Overall Arguments (tribits_add_advanced_test())`_). (NOTE: A more -# efficient way to optionally enable tests is to put them in a ``test/`` -# subdir and then include that subdir with `tribits_add_test_directories()`_.) +# (i.e. `${PACKAGE_NAME}_ENABLE_TESTS`_ ``= ON``) or the parent package (if +# this is a subpackage) (i.e. ``${PARENT_PACKAGE_NAME}_ENABLE_TESTS=ON``) or +# if other criteria are met (see some of the arguments in `Overall Arguments +# (tribits_add_advanced_test())`_ that can trigger a test to not be added). +# (NOTE: A more efficient way to optionally enable tests is to put them in a +# ``test/`` subdir and then include that subdir with +# `tribits_add_test_directories()`_.) # # *Sections:* # diff --git a/cmake/tribits/core/package_arch/TribitsAddExecutable.cmake b/cmake/tribits/core/package_arch/TribitsAddExecutable.cmake index ec989628f82f..f08e7b78bca0 100644 --- a/cmake/tribits/core/package_arch/TribitsAddExecutable.cmake +++ b/cmake/tribits/core/package_arch/TribitsAddExecutable.cmake @@ -44,7 +44,6 @@ include(TribitsAddTestHelpers) include(TribitsGeneralMacros) include(TribitsLibIsTestOnly) include(TribitsReportInvalidTribitsUsage) -include(TribitsDeprecatedHelpers) include(PrintVar) include(AppendSet) @@ -375,7 +374,7 @@ function(tribits_add_executable EXE_NAME) endif() if (PARSE_DEFINES) - tribits_deprecated("Passing extra defines through 'DEFINES' ${PARSE_DEFINES}" + message(WARNING "WARNING: Passing extra defines through 'DEFINES' ${PARSE_DEFINES}" " is deprecated. Instead, pass them through 'TARGET_DEFINES'. The 'DEFINES'" " argument was incorrectly implemented by calling add_definitions() which has" " directory scope and not function scope as was documented. This resulted in" @@ -658,12 +657,12 @@ macro(tribits_add_executable_convert_from_deplibs) set(prefixedDepLib "${${PROJECT_NAME}_LIBRARY_NAME_PREFIX}${depLib}") tribits_lib_is_testonly(${prefixedDepLib} depLibIsTestOnlyLib) if (depLibIsTestOnlyLib) - tribits_deprecated("Passing TESTONLY lib '${depLib}' through DEPLIBS" + message(WARNING "WARNING: Passing TESTONLY lib '${depLib}' through DEPLIBS" " is deprecated! Instead, please pass through TESTONLYLIBS instead!" " DEPLIBS is deprecated!") list(APPEND PARSE_TESTONLYLIBS ${depLib}) elseif (TARGET ${prefixedDepLib}) - tribits_deprecated("Passing non-TESTONLY lib '${depLib}' through DEPLIBS" + message(WARNING "WARNING: Passing non-TESTONLY lib '${depLib}' through DEPLIBS" " is deprecated! The library '${depLib}' appears to be a" " library defined in this CMake project." " TriBITS takes care of linking against libraries in dependent upstream" diff --git a/cmake/tribits/core/package_arch/TribitsAddExecutableAndTest.cmake b/cmake/tribits/core/package_arch/TribitsAddExecutableAndTest.cmake index 73148b8a8a76..298f64ac75c7 100644 --- a/cmake/tribits/core/package_arch/TribitsAddExecutableAndTest.cmake +++ b/cmake/tribits/core/package_arch/TribitsAddExecutableAndTest.cmake @@ -40,7 +40,6 @@ include(TribitsAddExecutable) include(TribitsAddTest) -include(TribitsDeprecatedHelpers) # @@ -106,7 +105,6 @@ endmacro() # [COMM [serial] [mpi]] # [ARGS " ..." " ..." ...] # [NUM_MPI_PROCS ] -# [RUN_SERIAL] # [LINKER_LANGUAGE (C|CXX|Fortran)] # [STANDARD_PASS_OUTPUT # | PASS_REGULAR_EXPRESSION ";;..."] @@ -148,16 +146,6 @@ endmacro() # through ``ARGS``. For more flexibility, just use # ``tribits_add_executable()`` followed by ``tribits_add_test()``. # -# Finally, the tests are only added if tests are enabled for the package -# (i.e. `${PACKAGE_NAME}_ENABLE_TESTS`_ ``= ON``) and other criteria are met. -# But the test executable will always be added if this function is called, -# regardless of the value of ``${PACKAGE_NAME}_ENABLE_TESTS``. To avoid -# adding the test (or example) executable when -# ``${PACKAGE_NAME}_ENABLE_TESTS=OFF``, put this command in a subdir under -# ``test/`` or ``example/`` and that subdir with -# `tribits_add_test_directories()`_ or `tribits_add_example_directories()`_, -# respectively. -# function(tribits_add_executable_and_test EXE_NAME) # @@ -168,7 +156,7 @@ function(tribits_add_executable_and_test EXE_NAME) #prefix PARSE #options - "RUN_SERIAL;STANDARD_PASS_OUTPUT;WILL_FAIL;ADD_DIR_TO_NAME;INSTALLABLE;NOEXEPREFIX;NOEXESUFFIX" + "STANDARD_PASS_OUTPUT;WILL_FAIL;ADD_DIR_TO_NAME;INSTALLABLE;NOEXEPREFIX;NOEXESUFFIX" #one_value_keywords "DISABLED" #mulit_value_keywords @@ -209,10 +197,6 @@ function(tribits_add_executable_and_test EXE_NAME) # C) tribits_add_executable(...) # - if (PARSE_DEPLIBS) - tribits_deprecated("DEPLIBS argument of tribits_add_executable_and_test() is deprecated.") - endif() - set(CALL_ARGS "") tribits_fwd_parse_arg(CALL_ARGS SOURCES) tribits_fwd_parse_arg(CALL_ARGS DEPLIBS) # Deprecated @@ -250,7 +234,6 @@ function(tribits_add_executable_and_test EXE_NAME) tribits_fwd_parse_arg(CALL_ARGS FAIL_REGULAR_EXPRESSION) tribits_fwd_parse_arg(CALL_ARGS ENVIRONMENT) tribits_fwd_parse_arg(CALL_ARGS DISABLED) - tribits_fwd_parse_opt(CALL_ARGS RUN_SERIAL) tribits_fwd_parse_opt(CALL_ARGS STANDARD_PASS_OUTPUT) tribits_fwd_parse_opt(CALL_ARGS WILL_FAIL) tribits_fwd_parse_arg(CALL_ARGS TIMEOUT) @@ -274,5 +257,3 @@ function(tribits_add_executable_and_test EXE_NAME) endif() endfunction() - -# LocalWords: executables diff --git a/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake b/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake index 30036149dbdc..4bac9f943c0b 100644 --- a/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake +++ b/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake @@ -48,8 +48,7 @@ include(PrependGlobalSet) include(RemoveGlobalDuplicates) include(TribitsGeneralMacros) include(TribitsReportInvalidTribitsUsage) -include(TribitsDeprecatedHelpers) -include(TribitsSetAndIncDirs) +include(SetAndIncDirs) # @FUNCTION: tribits_add_library() @@ -671,7 +670,7 @@ function(tribits_add_library_assert_deplibs) # dependency on the upstream package that owns this upstream TESTONLY # library if it comes from an upstream package. elseif (NOT PARSE_TESTONLY AND depLibIsTestOnlyLib) # any depLibAlreadyInPkgLibs - tribits_deprecated("'${depLib}' in DEPLIBS is a TESTONLY lib" + message(WARNING "WARNING: '${depLib}' in DEPLIBS is a TESTONLY lib" " and it is illegal to link to this non-TESTONLY library '${LIBRARY_NAME}'." " Such usage is deprecated (and this warning will soon become an error)!" " If this is a regular library in this package or in an dependent upstream" @@ -681,7 +680,7 @@ function(tribits_add_library_assert_deplibs) " ${${PACKAGE_NAME}_SOURCE_DIR}/cmake/Dependencies.cmake") # ToDo: Turn the above to FATAL_ERROR after dropping deprecated code elseif (NOT depLibAlreadyInPkgLibs AND TARGET ${prefixedDepLib}) # any PARSE_TESTONLY - tribits_deprecated("'${depLib}' in DEPLIBS is not" + message(WARNING "WARNING: '${depLib}' in DEPLIBS is not" " a lib in this package but is a library defined in the current" " cmake project! Such usage is deprecated (and" " will result in a configure error soon). If this is a library in" @@ -692,7 +691,7 @@ function(tribits_add_library_assert_deplibs) " this package's dependencies file" " ${${PACKAGE_NAME}_SOURCE_DIR}/cmake/Dependencies.cmake.") elseif (NOT depLibAlreadyInPkgLibs AND NOT TARGET ${prefixedDepLib} ) - tribits_deprecated("'${depLib}' in DEPLIBS is not" + message(WARNING "WARNING: '${depLib}' in DEPLIBS is not" " a lib defined in the current cmake project! Such usage is deprecated (and" " will result in a configure error soon). If this is an external" " lib you are trying to link in, it should likely be handled as a TriBITS" @@ -726,7 +725,7 @@ function(tribits_add_library_assert_importedlibs) FOUND_IMPORTEDLIB_IN_LIBRARIES_IDX) tribits_lib_is_testonly(${prefixedImportedLib} importedLibIsTestOnlyLib) if (importedLibIsTestOnlyLib) - tribits_deprecated("'${importedLib}' in IMPORTEDLIBS is a TESTONLY lib" + message(WARNING "WARNING: '${importedLib}' in IMPORTEDLIBS is a TESTONLY lib" " and it is illegal to pass in through IMPORTEDLIBS!" " Such usage is deprecated (and this warning will soon become an error)!" " Should '${importedLib}' instead be passed through DEPLIBS?") diff --git a/cmake/tribits/core/package_arch/TribitsAddTest.cmake b/cmake/tribits/core/package_arch/TribitsAddTest.cmake index 842bf3b2b94c..d9dfa911133a 100644 --- a/cmake/tribits/core/package_arch/TribitsAddTest.cmake +++ b/cmake/tribits/core/package_arch/TribitsAddTest.cmake @@ -78,11 +78,10 @@ include(TribitsAddTestHelpers) # ) # # The tests are only added if tests are enabled for the package -# (i.e. `${PACKAGE_NAME}_ENABLE_TESTS`_ ``= ON``). (NOTE: A more efficient -# way to optionally enable tests or examples is to put them in a ``test/`` or -# ``example/`` subdir and then include that subdir with -# `tribits_add_test_directories()`_ or `tribits_add_example_directories()`_, -# respectively.) +# (i.e. `${PACKAGE_NAME}_ENABLE_TESTS`_) or the parent package (if this is a +# subpackage) (i.e. ``${PARENT_PACKAGE_NAME}_ENABLE_TESTS``). (NOTE: A more +# efficient way to optionally enable tests is to put them in a ``test/`` +# subdir and then include that subdir with `tribits_add_test_directories()`_.) # # *Sections:* # diff --git a/cmake/tribits/core/package_arch/TribitsAddTestHelpers.cmake b/cmake/tribits/core/package_arch/TribitsAddTestHelpers.cmake index ba8a6412b67b..453de5432672 100644 --- a/cmake/tribits/core/package_arch/TribitsAddTestHelpers.cmake +++ b/cmake/tribits/core/package_arch/TribitsAddTestHelpers.cmake @@ -211,8 +211,8 @@ function(tribits_add_test_process_enable_tests ADD_THE_TEST_OUT) set(ADD_THE_TEST TRUE) else() message_wrapper( - "-- ${TEST_NAME}: NOT added test because" - " ${PACKAGE_NAME}_ENABLE_TESTS='${${PACKAGE_NAME}_ENABLE_TESTS}'.") + "-- ${TEST_NAME}: NOT added test because ${PACKAGE_NAME}_ENABLE_TESTS='${${PACKAGE_NAME}_ENABLE_TESTS}'." + ) set(ADD_THE_TEST FALSE) endif() set(${ADD_THE_TEST_OUT} ${ADD_THE_TEST} PARENT_SCOPE) diff --git a/cmake/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake b/cmake/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake index 53bbb1f2b5d5..55c83d96af77 100644 --- a/cmake/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake +++ b/cmake/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake @@ -42,9 +42,7 @@ include(TribitsProcessPackagesAndDirsLists) include(TribitsAddOptionAndDefine) include(TribitsGeneralMacros) include(TribitsPrintEnabledPackagesLists) -include(TribitsPrintDependencyInfo) include(TribitsPackageDependencies) -include(TribitsGetPackageEnableStatus) include(AdvancedOption) include(AdvancedSet) @@ -61,385 +59,258 @@ include(SetDefault) include(MessageWrapper) include(DualScopeSet) include(CMakeParseArguments) -include(TribitsCreateReverseList) -# NOTE: A nice way to view and navigate the contents of this file is to use -# the emacs 'occur' string: # -# "\(^##########\|^# .*-level\|^function\|^macro\)" - - -# @MACRO: tribits_adjust_package_enables() -# -# Usage: -# -# tribits_adjust_package_enables() -# -# Macro that adjusts all of the package enables from what the user input to -# the final set that will be used to enable packages. -# -macro(tribits_adjust_package_enables) - tribits_unenable_enabled_packages() - tribits_sweep_forward_apply_disables() - tribits_sweep_forward_apply_enables() - tribits_disable_and_enable_tests_and_examples() - tribits_sweep_backward_enable_upstream_packages() - tribits_set_cache_vars_for_current_enabled_packages() - tribits_do_final_parent_packages_enables_for_subpackage_enables() - tribits_setup_enabled_lists_and_pkg_idxs() - tribits_setup_direct_packages_dependencies_lists_and_lib_required_enable_vars() - tribits_print_direct_packages_dependencies_lists() -endmacro() - - - -################################################################################ +# Private helper macros # -# First-level macros called directly from ``tribits_adjust_package_enables()`` -# -# NOTE: In the below macros, local variables are prefixed by 'tap1_' in all of -# the macros() which will not clash because they are at the same level in the -# call stack (and are initialized in each macro). -# -################################################################################ -# @MACRO: tribits_unenable_enabled_packages() -# -# Macro to enable all unenabled packages if asked. -# -# See implementation for details. -# -macro(tribits_unenable_enabled_packages) - if (${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES) - message("\nSetting to empty '' all enabled packages because" - " ${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES=" - "'${${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES}'\n") - foreach(tap1_tribitsPkg IN LISTS ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES) - if (${PROJECT_NAME}_ENABLE_${tap1_tribitsPkg}) - message("-- " "Setting ${PROJECT_NAME}_ENABLE_${tap1_tribitsPkg}=''") - set_cache_on_off_empty(${PROJECT_NAME}_ENABLE_${tap1_tribitsPkg} "" - "Forced to empty '' by ${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES=ON" FORCE) - endif() - # NOTE: Above, we don't want to set to empty those packages that have hard - # disables because this will mess up the logic in later invocations. - endforeach() - advanced_set(${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES OFF CACHE BOOL - "Forced to FALSE after use" FORCE) +function(tribits_private_print_disable + ENABLE_BEING_DISABLED_VAR_NAME PACKAGE_WITH_SOMETHING_BEING_DISABLED + DEP_TYPE_STR THING_DISALBED_TYPE THING_DISABLED_NAME + ) + #print_var(${ENABLE_BEING_DISABLED_VAR_NAME}) + if (${ENABLE_BEING_DISABLED_VAR_NAME}) + if (${PROJECT_NAME}_DISABLE_ENABLED_FORWARD_DEP_PACKAGES) + message( + " ***\n" + " *** NOTE: Setting ${ENABLE_BEING_DISABLED_VAR_NAME}=OFF" + " which was '${${ENABLE_BEING_DISABLED_VAR_NAME}}' because" + " ${PACKAGE_WITH_SOMETHING_BEING_DISABLED} has" + " a required ${DEP_TYPE_STR} dependence on disabled" + " ${THING_DISALBED_TYPE} ${THING_DISABLED_NAME}" + " but ${PROJECT_NAME}_DISABLE_ENABLED_FORWARD_DEP_PACKAGES=ON!\n" + " ***\n" + ) + else() + message(FATAL_ERROR + " ***\n" + " *** ERROR: Setting ${ENABLE_BEING_DISABLED_VAR_NAME}=OFF" + " which was '${${ENABLE_BEING_DISABLED_VAR_NAME}}' because" + " ${PACKAGE_WITH_SOMETHING_BEING_DISABLED} has" + " a required ${DEP_TYPE_STR} dependence on disabled" + " ${THING_DISALBED_TYPE} ${THING_DISABLED_NAME}!\n" + " ***\n" + ) + endif() + else() + message("-- " + "Setting ${ENABLE_BEING_DISABLED_VAR_NAME}=OFF" + " because ${PACKAGE_WITH_SOMETHING_BEING_DISABLED} has a required ${DEP_TYPE_STR}" + " dependence on disabled ${THING_DISALBED_TYPE} ${THING_DISABLED_NAME}") endif() -endmacro() +endfunction() -# @MACRO: tribits_sweep_forward_apply_disables() -# -# Sweep forward and apply all disables in order first. -# -# See implementation for details. -# -macro(tribits_sweep_forward_apply_disables) +macro(tribits_private_disable_tpl_required_package_enable + TPL_NAME PACKAGE_NAME LIBRARY_DEP + ) - message("\nDisabling all packages that have a required dependency" - " on disabled TPLs and optional package TPL support based on TPL_ENABLE_=OFF ...\n") + #message("TRIBITS_PRIVATE_DISABLE_TPL_REQUIRED_PACKAGE_ENABLE" + # " ${TPL_NAME} ${PACKAGE_NAME} ${LIBRARY_DEP}") - message("\nDisabling subpackages for hard disables of parent packages" - " due to ${PROJECT_NAME}_ENABLE_=OFF ...\n") - foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES) - tribits_disable_parents_subpackages(${tad1_tribitsPkg}) - endforeach() + # Only turn off PACKAGE_NAME libraries and test/examples if it + # is currently enabled or could be enabled. - message("\nDisabling forward required packages and optional intra-package" - " support that have a dependency on disabled packages" - " ${PROJECT_NAME}_ENABLE_=OFF (or" - " TPL_ENABLE_=OFF) ...\n") - foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_DEFINED_PACKAGES) - tribits_disable_forward_required_dep_packages(${tad1_tribitsPkg}) - endforeach() + assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} + OR ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} STREQUAL "" + ) -endmacro() + if ("${LIBRARY_DEP}" STREQUAL "TRUE") + tribits_private_print_disable( + ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} ${PACKAGE_NAME} "library" + "TPL" ${TPL_NAME} + ) -# @MACRO: tribits_sweep_forward_apply_enables() -# -# Updates the following variables in the local scope: -# -# * ``${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES`` -# * `${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES`_ -# -# See implementation for details. -# -macro(tribits_sweep_forward_apply_enables) + set(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} OFF) - tribits_get_sublist_nondisabled( ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES - ${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES "") - tribits_create_reverse_list(${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES - ${PROJECT_NAME}_REVERSE_NOTDISABLED_INTERNAL_PACKAGES) + else() - message("\nEnabling subpackages for hard enables of parent packages" - " due to ${PROJECT_NAME}_ENABLE_=ON ...\n") - foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES) - tribits_enable_parents_subpackages(${tad1_tribitsPkg}) - endforeach() + set(DEP_TYPE_STR "test/example") - if (${PROJECT_NAME}_ENABLE_ALL_PACKAGES) - message("\nEnabling all packages that are not currently disabled because of" - " ${PROJECT_NAME}_ENABLE_ALL_PACKAGES=ON" - " (${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE=" - "${${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE}) ...\n") - foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES) - tribits_apply_all_package_enables(${tad1_tribitsPkg}) - endforeach() - endif() + if (${PACKAGE_NAME}_ENABLE_TESTS + OR "${${PACKAGE_NAME}_ENABLE_TESTS}" STREQUAL "" + ) + tribits_private_print_disable( + ${PACKAGE_NAME}_ENABLE_TESTS ${PACKAGE_NAME} "${DEP_TYPE_STR}" + "TPL" ${TPL_NAME} + ) + set(${PACKAGE_NAME}_ENABLE_TESTS OFF) + endif() - if (${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES) - message("\nSweep forward enabling all forward library dependent packages because" - " ${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES=ON ...\n") - foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES) - tribits_enable_forward_lib_package_enables(${tad1_tribitsPkg}) - endforeach() + if (${PACKAGE_NAME}_ENABLE_EXAMPLES + OR "${${PACKAGE_NAME}_ENABLE_EXAMPLES}" STREQUAL "" + ) + tribits_private_print_disable( + ${PACKAGE_NAME}_ENABLE_EXAMPLES ${PACKAGE_NAME} "${DEP_TYPE_STR}" + "TPL" ${TPL_NAME} + ) + set(${PACKAGE_NAME}_ENABLE_EXAMPLES OFF) + endif() - tribits_get_sublist_enabled( ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES - ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES "") - tribits_create_reverse_list(${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES - ${PROJECT_NAME}_REVERSE_ENABLED_INTERNAL_PACKAGES) + # NOTE: We can't assert that ${PACKAGE_NAME}_ENABLE_TESTS or + # ${PACKAGE_NAME}_ENABLE_EXAMPLES exists yet because + # tribits_set_up_optional_package_enables_and_cache_vars() which defines + # them is not called until after the final package enables are set. - message("\nSweep backward enabling all forward test dependent packages because" - " ${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES=ON ...\n") - foreach(tad1_tribitsPkg IN LISTS - ${PROJECT_NAME}_REVERSE_ENABLED_INTERNAL_PACKAGES - ) - tribits_enable_forward_test_package_enables(${tad1_tribitsPkg}) - endforeach() - # NOTE: Above, we want to sweep backward to enable test-dependent packages - # because we don't want to enable package Z just because package Y was enabled - # because it had a test-only dependency on package X. Sweeping backwards through - # the packages makes sure this does not happen. - set(${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES ON) - endif() + endif() - tribits_get_sublist_enabled( ${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES - ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES "") + endif() endmacro() -# NOTE: Above, we are sweeping over *all* of the not-disabled packages listed -# in ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES, including those package that -# might have _PACKAGE_BUILD_STATUS=EXTERNAL. That makes sense -# because these are TriBITS (or TriBITS compatible) packages so we should -# assume that all of their downstream packages, whether internal or external, -# should be enabled as well. If we find this is not the desirable behavior, -# then we can change this later. -# @MACRO: tribits_disable_and_enable_tests_and_examples() -# -# Adjust test and example enables based on different criteria. -# -# See implementation for details. -# -macro(tribits_disable_and_enable_tests_and_examples) +function(tribits_private_print_disable_required_package_enable + PACKAGE_NAME PACKAGE_ENABLE_SOMETHING_VAR_NAME FORWARD_DEP_PACKAGE_NAME + DEP_TYPE_STR + ) + tribits_private_print_disable( + ${PACKAGE_ENABLE_SOMETHING_VAR_NAME} ${FORWARD_DEP_PACKAGE_NAME} + "${DEP_TYPE_STR}" "package" ${PACKAGE_NAME} ) +endfunction() - message("\nDisabling subpackage tests/examples based on parent package" - " tests/examples disables ...\n") - foreach(tad1_tribitsPkg IN LISTS - ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES - ) - tribits_apply_package_examples_disable(${tad1_tribitsPkg} TESTS) - tribits_apply_subpackage_tests_or_examples_disables(${tad1_tribitsPkg} TESTS) - tribits_apply_subpackage_tests_or_examples_disables(${tad1_tribitsPkg} EXAMPLES) - endforeach() - if (${PROJECT_NAME}_ENABLE_TESTS OR ${PROJECT_NAME}_ENABLE_EXAMPLES) - message("\nEnabling all tests and/or examples that have not been" - " explicitly disabled because ${PROJECT_NAME}_ENABLE_[TESTS,EXAMPLES]=ON ...\n") - foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES) - tribits_apply_test_example_enables(${tad1_tribitsPkg}) - endforeach() - endif() - # NOTE: Above, we enable tests and examples here, before the remaining required - # packages so that we don't enable tests that don't need to be enabled based - # on the use of the option ${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES. +macro(tribits_private_disable_required_package_enables + FORWARD_DEP_PACKAGE_NAME PACKAGE_NAME LIBRARY_DEP + ) - message("\nEnabling subpackage tests/examples based on parent package tests/examples enables ...\n") - foreach(tad1_tribitsPkg IN LISTS - ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES - ) - tribits_apply_subpackage_tests_examples_enables(${tad1_tribitsPkg}) - endforeach() - # NOTE: We want to apply this logic here instead of later after the backward - # sweep of package enables because we don't want to enable the - # tests/examples for a subpackage if it is not needed based on set of - # requested subpackages and packages to be enabled and the optional forward - # sweep of downstream packages. + #message("TRIBITS_PRIVATE_DISABLE_REQUIRED_PACKAGE_ENABLES" + # " ${FORWARD_DEP_PACKAGE_NAME} ${LIBRARY_DEP}") -endmacro() + # Only turn off FORWARD_DEP_PACKAGE libraries and test/examples if it + # is currently enabled or could be enabled + assert_defined(${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME}) + if (${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME} + OR ${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME} STREQUAL "" + ) -# @MACRO: tribits_sweep_backward_enable_upstream_packages() -# -# Sweep backwards and enable required and (optionally) optional upstream -# packages. -# -# This sets the final value for: -# -# * `${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES`_ -# -# See implementation for details. -# -macro(tribits_sweep_backward_enable_upstream_packages) + if ("${LIBRARY_DEP}" STREQUAL "TRUE") - set(tap1_extraMsgStr "") - if (${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES) - set(tap1_extraMsgStr - " (and optional since ${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES=ON)") - endif() + tribits_private_print_disable_required_package_enable( + ${PACKAGE_NAME} ${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME} + ${FORWARD_DEP_PACKAGE_NAME} "library" ) - tribits_get_sublist_nondisabled( ${PROJECT_NAME}_DEFINED_PACKAGES - ${PROJECT_NAME}_NOTDISABLED_PACKAGES "") - tribits_create_reverse_list(${PROJECT_NAME}_NOTDISABLED_PACKAGES - ${PROJECT_NAME}_REVERSE_NOTDISABLED_PACKAGES) - - message("\nEnabling all required${tap1_extraMsgStr} upstream packages for current" - " set of enabled packages (${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE=" - "${${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE}) ...\n") - foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_REVERSE_NOTDISABLED_PACKAGES) - tribits_enable_upstream_packages(${tad1_tribitsPkg}) - endforeach() - # NOTE: Above, we have to loop through the packages backward to enable all - # the packages that this package depends on. This has to include *all* - # upstream package enables including required packages, and optional - # packages (when ${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES). + set(${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME} OFF) - tribits_get_sublist_enabled( ${PROJECT_NAME}_NOTDISABLED_INTERNAL_PACKAGES - ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES "") + else() - message("\nEnabling all optional intra-package enables" - " _ENABLE_ that are not currently disabled" - " if both sets of packages are enabled ...\n") - foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES) - tribits_postprocess_optional_package_enables(${tad1_tribitsPkg}) - endforeach() + set(DEP_TYPE_STR "test/example") -endmacro() + if (${FORWARD_DEP_PACKAGE_NAME}_ENABLE_TESTS + OR "${${FORWARD_DEP_PACKAGE_NAME}_ENABLE_TESTS}" STREQUAL "" + ) + tribits_private_print_disable_required_package_enable( + ${PACKAGE_NAME} ${FORWARD_DEP_PACKAGE_NAME}_ENABLE_TESTS + ${FORWARD_DEP_PACKAGE_NAME} "${DEP_TYPE_STR}" ) + set(${FORWARD_DEP_PACKAGE_NAME}_ENABLE_TESTS OFF) + endif() + if (${FORWARD_DEP_PACKAGE_NAME}_ENABLE_EXAMPLES + OR "${${FORWARD_DEP_PACKAGE_NAME}_ENABLE_EXAMPLES}" STREQUAL "" + ) + tribits_private_print_disable_required_package_enable( + ${PACKAGE_NAME} ${FORWARD_DEP_PACKAGE_NAME}_ENABLE_EXAMPLES + ${FORWARD_DEP_PACKAGE_NAME} "${DEP_TYPE_STR}" ) + set(${FORWARD_DEP_PACKAGE_NAME}_ENABLE_EXAMPLES OFF) + endif() -# @MACRO: tribits_set_cache_vars_for_current_enabled_packages() -# -macro(tribits_set_cache_vars_for_current_enabled_packages) - message("\nSet cache entries for optional packages/TPLs and tests/examples for packages actually enabled ...\n") - foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES) - tribits_setup_optional_package_enables_and_cache_vars(${tad1_tribitsPkg}) - endforeach() -endmacro() + endif() + endif() -# @MACRO: tribits_do_final_parent_packages_enables_for_subpackage_enables() -# -macro(tribits_do_final_parent_packages_enables_for_subpackage_enables) +endmacro() - message("\nEnabling the shell of non-enabled parent packages (mostly for show)" - " that have at least one subpackage enabled ...\n") - foreach(tad1_tribitsPkg IN LISTS - ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES - ) - tribits_enable_parent_package_for_subpackage_enables(${tad1_tribitsPkg}) - endforeach() - # NOTE: The above ensures that loops involving the parent package will - # process the parent package. But this has to be done after all of the - # other enable/disable logic to ensure no downstream dependencies will be - # enabled based on this. -endmacro() +macro(tribits_private_disable_optional_package_enables + FORWARD_DEP_PACKAGE_NAME PACKAGE_NAME + ) + #message("TRIBITS_PRIVATE_DISABLE_OPTIONAL_PACKAGE_ENABLES" + # " ${FORWARD_DEP_PACKAGE_NAME} ${PACKAGE_NAME}") + #message("-- " "${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME} = ${${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME}}") -# Macro that sets up the basic lists of enabled packages and packages. -# -macro(tribits_setup_enabled_lists_and_pkg_idxs) - - # ${PROJECT_NAME}_ENABLED_PACKAGES - tribits_get_sublist_enabled( - ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES - ${PROJECT_NAME}_ENABLED_INTERNAL_TOPLEVEL_PACKAGES - ${PROJECT_NAME}_NUM_ENABLED_INTERNAL_TOPLEVEL_PACKAGES) - - # ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES - tribits_get_sublist_enabled( ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES - ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES - ${PROJECT_NAME}_NUM_ENABLED_INTERNAL_PACKAGES) - - # ${PROJECT_NAME}_REVERSE_ENABLED_INTERNAL_PACKAGES - unset(${PROJECT_NAME}_REVERSE_ENABLED_INTERNAL_PACKAGES) # Wipe out temp value - - # Set ${tribitsPackage}_PKG_IDX for each enabled package - set(pkgIdx 0) - foreach(tribitsPackage ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) - set(${tribitsPackage}_PKG_IDX ${pkgIdx}) - math(EXPR pkgIdx "${pkgIdx} + 1") - endforeach() + #assert_defined(${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME}) + if (${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME} OR "${${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME}}" STREQUAL "") + # Always disable the conditional enable but only print the message if the package is enabled. + #message("-- Disable ${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME} ...") + if (${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME}) + if (${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME}) # is explicitly try already! + message("-- " + "NOTE: Setting ${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME}=OFF" + " which was ${${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME}}" + " because ${FORWARD_DEP_PACKAGE_NAME} has an optional library dependence" + " on disabled package ${PACKAGE_NAME}") + else() # Not explicitly set + message("-- " + "Setting ${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME}=OFF" + " because ${FORWARD_DEP_PACKAGE_NAME} has an optional library dependence" + " on disabled package ${PACKAGE_NAME}") + endif() + endif() + set(${FORWARD_DEP_PACKAGE_NAME}_ENABLE_${PACKAGE_NAME} OFF) + endif() endmacro() -# @MACRO: tribits_setup_direct_packages_dependencies_lists_and_lib_required_enable_vars() -# -# Set up flat list of direct external and inner package dependencies (even for -# non-enabled packages) and enabled package dependencies for enabled packages. +# Macro that disabled a packages if its required upstream TPL is disabled.. # -macro(tribits_setup_direct_packages_dependencies_lists_and_lib_required_enable_vars) +macro(tribits_disable_package_if_tpl_disabled TRIBITS_PACKAGE) - foreach(tad1_externalPkgName IN LISTS ${PROJECT_NAME}_DEFINED_TPLS) - tribits_extpkg_setup_enabled_dependencies(${tad1_externalPkgName}) - # ToDo: Assert that all of the listed dependencies in - # ${tad1_externalPkgName}_LIB_ENABLED_DEPENDENCIES exist and are - # upstream from ${tad1_externalPkgName} + foreach(TPL_NAME ${${TRIBITS_PACKAGE}_LIB_REQUIRED_DEP_TPLS}) + if ( (NOT TPL_ENABLE_${TPL_NAME}) AND + (NOT "${TPL_ENABLE_${TPL_NAME}}" STREQUAL "") + ) + tribits_private_disable_tpl_required_package_enable( + ${TPL_NAME} ${TRIBITS_PACKAGE} TRUE ) + endif() endforeach() - foreach(tad1_internalPkgName IN LISTS ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES) - tribits_setup_enabled_dependencies_lists_and_enable_vars(${tad1_internalPkgName}) + foreach(TPL_NAME ${${TRIBITS_PACKAGE}_TEST_REQUIRED_DEP_TPLS}) + if ( (NOT TPL_ENABLE_${TPL_NAME}) AND + (NOT "${TPL_ENABLE_${TPL_NAME}}" STREQUAL "") + ) + tribits_private_disable_tpl_required_package_enable( + ${TPL_NAME} ${TRIBITS_PACKAGE} FALSE ) + endif() endforeach() endmacro() -# @MACRO: tribits_print_direct_packages_dependencies_lists() -# -macro(tribits_print_direct_packages_dependencies_lists) - if (${PROJECT_NAME}_DUMP_PACKAGE_DEPENDENCIES) - message("\nDumping direct enabled dependencies for each package ...") - foreach(tad1_tribitsPkg IN LISTS ${PROJECT_NAME}_DEFINED_PACKAGES) - tribits_print_direct_package_dependencies_lists(${tad1_tribitsPkg}) - endforeach() - endif() -endmacro() - - - -################################################################################ -# -# Second-level macros called indirectly from ``tribits_adjust_package_enables()`` +# Macro that disables all of the subpackages of a parent package. # -################################################################################ +macro(tribits_disable_parents_subpackages PARENT_PACKAGE_NAME) + #message("TRIBITS_DISABLE_PARENTS_SUBPACKAGES: ${PARENT_PACKAGE_NAME}") -# Macro that disables all of the subpackages of a parent package. -# -macro(tribits_disable_parents_subpackages parentPackageName) + #print_var(${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME}) - if(NOT ${PROJECT_NAME}_ENABLE_${parentPackageName} - AND (NOT ${PROJECT_NAME}_ENABLE_${parentPackageName} STREQUAL "") + if(NOT ${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME} + AND NOT ${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME} STREQUAL "" ) - foreach(tap2_subPkgName IN LISTS ${parentPackageName}_SUBPACKAGES) + set(SUBPACKAGE_IDX 0) + foreach(TRIBITS_SUBPACKAGE ${${PARENT_PACKAGE_NAME}_SUBPACKAGES}) - set(subpkgFullName ${parentPackageName}${tap2_subPkgName}) + set(SUBPACKAGE_NAME ${TRIBITS_SUBPACKAGE}) + set(SUBPACKAGE_FULLNAME ${PARENT_PACKAGE_NAME}${TRIBITS_SUBPACKAGE}) - if (NOT ${PROJECT_NAME}_ENABLE_${subpkgFullName} STREQUAL "OFF") - set(packageBeingDisabledVarName ${PROJECT_NAME}_ENABLE_${subpkgFullName}) + #print_var(${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}) + if (NOT ${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME} STREQUAL "OFF") + set(ENABLE_BEING_DISABLED_VAR_NAME ${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}) message("-- " - "Setting subpackage enable ${packageBeingDisabledVarName}=OFF" - " because parent package ${PROJECT_NAME}_ENABLE_${parentPackageName}=OFF") - set(${packageBeingDisabledVarName} OFF) + "Setting subpackage enable ${ENABLE_BEING_DISABLED_VAR_NAME}=OFF" + " because parent package ${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME}=OFF") + set(${ENABLE_BEING_DISABLED_VAR_NAME} OFF) endif() + math(EXPR SUBPACKAGE_IDX "${SUBPACKAGE_IDX}+1") + endforeach() endif() @@ -447,62 +318,44 @@ macro(tribits_disable_parents_subpackages parentPackageName) endmacro() -# Macro that disables forward package that depends on the passed-in package +# Macro that enables all of the subpackages of a parent package. # -macro(tribits_disable_forward_required_dep_packages packageName) - tribits_get_package_enable_status(${packageName} packageEnable "") - if ((NOT packageEnable) AND (NOT "${packageEnable}" STREQUAL "")) - foreach(fwdDepPkg IN LISTS ${packageName}_FORWARD_LIB_DEFINED_DEPENDENCIES) - if (${fwdDepPkg}_LIB_DEP_REQUIRED_${packageName}) - tribits_private_disable_required_package_enables(${fwdDepPkg} - ${packageName} TRUE) - else() - tribits_private_disable_optional_package_enables(${fwdDepPkg} - ${packageName} TRUE) - endif() - endforeach() - foreach(fwdDepPkg IN LISTS ${packageName}_FORWARD_TEST_DEFINED_DEPENDENCIES) - if (${fwdDepPkg}_TEST_DEP_REQUIRED_${packageName}) - tribits_private_disable_required_package_enables(${fwdDepPkg} - ${packageName} FALSE) - endif() - endforeach() - endif() -endmacro() +macro(tribits_enable_parents_subpackages PARENT_PACKAGE_NAME) + #message("TRIBITS_ENABLE_PARENTS_SUBPACKAGES: ${PARENT_PACKAGE_NAME}") -# Macro that enables all of the subpackages of a parent package. -# -macro(tribits_enable_parents_subpackages parentPackageName) + #print_var(${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME}) - if(${PROJECT_NAME}_ENABLE_${parentPackageName}) + if(${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME}) - set(subpkgIdx 0) - foreach(tap2_subPkgName IN LISTS ${parentPackageName}_SUBPACKAGES) + set(SUBPACKAGE_IDX 0) + foreach(TRIBITS_SUBPACKAGE ${${PARENT_PACKAGE_NAME}_SUBPACKAGES}) - set(subpkgFullName ${parentPackageName}${tap2_subPkgName}) + set(SUBPACKAGE_NAME ${TRIBITS_SUBPACKAGE}) + set(SUBPACKAGE_FULLNAME ${PARENT_PACKAGE_NAME}${TRIBITS_SUBPACKAGE}) - if (NOT ${PROJECT_NAME}_ENABLE_${subpkgFullName} AND - NOT "${${PROJECT_NAME}_ENABLE_${subpkgFullName}}" STREQUAL "" + #print_var(${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}) + + if (NOT ${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME} AND + NOT "${${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}}" STREQUAL "" ) # The subpackage is already disabled and is not just empty! - elseif (${PROJECT_NAME}_ENABLE_${subpkgFullName}) + elseif (${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}) # The subpackage is already enabled so there is no reason to enable it! else() # The subpackage is not hard off or on so turn it on by default - tribits_implicit_package_enable_is_allowed( "" ${subpkgFullName} - subpkgAllowImplicitEnable) - if (subpkgAllowImplicitEnable) - set(enableVarName ${PROJECT_NAME}_ENABLE_${subpkgFullName}) + tribits_implicit_package_enable_is_allowed( "" ${SUBPACKAGE_FULLNAME} + SUBPACKAGE_ALLOW_IMPLICIT_ENABLE) + if (SUBPACKAGE_ALLOW_IMPLICIT_ENABLE) + set(ENABLE_BEING_ENABLED_VAR_NAME ${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}) message("-- " - "Setting subpackage enable ${enableVarName}=ON" - " because parent package ${PROJECT_NAME}_ENABLE_${parentPackageName}=" - "${${PROJECT_NAME}_ENABLE_${parentPackageName}}") - set(${enableVarName} ON) + "Setting subpackage enable ${ENABLE_BEING_ENABLED_VAR_NAME}=ON" + " because parent package ${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME}=ON") + set(${ENABLE_BEING_ENABLED_VAR_NAME} ON) endif() endif() - math(EXPR subpkgIdx "${subpkgIdx}+1") + math(EXPR SUBPACKAGE_IDX "${SUBPACKAGE_IDX}+1") endforeach() @@ -511,201 +364,129 @@ macro(tribits_enable_parents_subpackages parentPackageName) endmacro() -# Macro used to set ${PROJECT_NAME}_ENABLE_ based on -# ${PROJECT_NAME}_ENABLE_ALL_PACKAGES +# Macro that disables all forward packages that depend on the given packages # -macro(tribits_apply_all_package_enables packageName) - tribits_is_primary_meta_project_package(${packageName} packageIsPmpp) - tribits_implicit_package_enable_is_allowed( "" ${packageName} - processThisPackageEnable ) - if (packageIsPmpp AND processThisPackageEnable) - tribits_set_package_enable_based_on_project_enable( - ${PROJECT_NAME}_ENABLE_ALL_PACKAGES ${PROJECT_NAME}_ENABLE_${packageName} ) - endif() -endmacro() +macro(tribits_disable_forward_required_dep_packages PACKAGE_NAME) + #message("TRIBITS_DISABLE_FORWARD_REQUIRED_DEP_PACKAGES: ${PACKAGE_NAME}") -# Macro used to set ${PROJECT_NAME}_ENABLE_${FWD_PACKAGE_NAME}=ON for all -# forward required or optional LIB dependency on ${packageName} -# -macro(tribits_enable_forward_lib_package_enables packageName) - if (${PROJECT_NAME}_ENABLE_${packageName}) - foreach(fwdDepPkgName IN LISTS ${packageName}_FORWARD_LIB_DEFINED_DEPENDENCIES) - tribits_private_enable_forward_package(${fwdDepPkgName} ${packageName}) + if ( + (NOT ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + AND + (NOT "${${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}}" STREQUAL "") + ) + + foreach(FWD_DEP_PKG ${${PACKAGE_NAME}_FORWARD_LIB_REQUIRED_DEP_PACKAGES}) + tribits_private_disable_required_package_enables(${FWD_DEP_PKG} ${PACKAGE_NAME} TRUE) + endforeach() + + foreach(FWD_DEP_PKG ${${PACKAGE_NAME}_FORWARD_LIB_OPTIONAL_DEP_PACKAGES}) + tribits_private_disable_optional_package_enables(${FWD_DEP_PKG} ${PACKAGE_NAME}) endforeach() + + foreach(FWD_DEP_PKG ${${PACKAGE_NAME}_FORWARD_TEST_REQUIRED_DEP_PACKAGES}) + tribits_private_disable_required_package_enables(${FWD_DEP_PKG} ${PACKAGE_NAME} FALSE) + endforeach() + endif() + endmacro() -# Macro used to set ${PROJECT_NAME}_ENABLE_${FWD_PACKAGE_NAME}=ON for all -# forward required or optional TEST dependency on ${packageName} +# Macro that prints out dependencies for a package # -macro(tribits_enable_forward_test_package_enables packageName) - foreach(fwdDepPkgName IN LISTS ${packageName}_FORWARD_TEST_DEFINED_DEPENDENCIES) - tribits_private_enable_forward_package(${fwdDepPkgName} ${packageName}) - endforeach() -endmacro() -# NOTE: The above macro does not need to check if ${packageName} is enabled -# because it will only be called for packages that are enabled already. This -# not only improves performance but it also aids in testing. +# Does not modify the global state. +# +macro(tribits_print_package_dependencies PACKAGE_NAME) + set(PRINTED_VAR "") -# Macro to disable ${parentPackageName)_ENABLE_ENABLES by default if -# ${parentPackageName)_ENABLE_TESTS is explicitly disabled. -# -macro(tribits_apply_package_examples_disable parentPackageName) - if ( (NOT ${parentPackageName}_ENABLE_TESTS) - AND (NOT "${${parentPackageName}_ENABLE_TESTS}" STREQUAL "") - AND ("${${parentPackageName}_ENABLE_EXAMPLES}" STREQUAL "") - ) - message("-- " "Setting" - " ${parentPackageName}_ENABLE_EXAMPLES" - "=${${parentPackageName}_ENABLE_TESTS}" - " because" - " ${parentPackageName}_ENABLE_TESTS" - "=${${parentPackageName}_ENABLE_TESTS}" ) - set(${parentPackageName}_ENABLE_EXAMPLES ${${parentPackageName}_ENABLE_TESTS}) + print_nonempty_var_with_spaces(${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES PRINTED_VAR) + print_nonempty_var_with_spaces(${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES PRINTED_VAR) + print_nonempty_var_with_spaces(${PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES PRINTED_VAR) + print_nonempty_var_with_spaces(${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES PRINTED_VAR) + + if (${PROJECT_NAME}_DUMP_FORWARD_PACKAGE_DEPENDENCIES) + print_nonempty_var_with_spaces(${PACKAGE_NAME}_FORWARD_LIB_REQUIRED_DEP_PACKAGES + PRINTED_VAR) + print_nonempty_var_with_spaces(${PACKAGE_NAME}_FORWARD_LIB_OPTIONAL_DEP_PACKAGES + PRINTED_VAR) + print_nonempty_var_with_spaces(${PACKAGE_NAME}_FORWARD_TEST_REQUIRED_DEP_PACKAGES + PRINTED_VAR) + print_nonempty_var_with_spaces(${PACKAGE_NAME}_FORWARD_TEST_OPTIONAL_DEP_PACKAGES + PRINTED_VAR) endif() -endmacro() -# NOTE: Above, the top-level package ${parentPackageName} may not even be -# enabled yet when this gets called but its subpackages might and we need to -# process this default disable in case their are any enabled subpackages. + print_nonempty_var_with_spaces(${PACKAGE_NAME}_LIB_REQUIRED_DEP_TPLS PRINTED_VAR) + print_nonempty_var_with_spaces(${PACKAGE_NAME}_LIB_OPTIONAL_DEP_TPLS PRINTED_VAR) + print_nonempty_var_with_spaces(${PACKAGE_NAME}_TEST_REQUIRED_DEP_TPLS PRINTED_VAR) + print_nonempty_var_with_spaces(${PACKAGE_NAME}_TEST_OPTIONAL_DEP_TPLS PRINTED_VAR) -# Macro to disable _ENABLE_TESTS and -# _ENABLE_EXAMPLES based on -# _ENABLE_TESTS or _ENABLE_EXAMPLES -# -macro(tribits_apply_subpackage_tests_or_examples_disables parentPackageName - testsOrExamples - ) - set(parentPkgEnableVar ${parentPackageName}_ENABLE_${testsOrExamples}) - if ((NOT ${parentPkgEnableVar}) AND (NOT "${${parentPkgEnableVar}}" STREQUAL "")) - foreach(subpkgName IN LISTS ${parentPackageName}_SUBPACKAGES) - set(fullSpkgName ${parentPackageName}${subpkgName}) - if (${PROJECT_NAME}_ENABLE_${fullSpkgName}) - if ("${${fullSpkgName}_ENABLE_${testsOrExamples}}" STREQUAL "") - message("-- " "Setting" - " ${fullSpkgName}_ENABLE_${testsOrExamples}=${${parentPkgEnableVar}}" - " because parent package" - " ${parentPkgEnableVar}=${${parentPkgEnableVar}}") - set(${fullSpkgName}_ENABLE_${testsOrExamples} ${${parentPkgEnableVar}}) - endif() - endif() - endforeach() + if (NOT PRINTED_VAR) + message("-- ${PACKAGE_NAME}: No dependencies!") endif() + endmacro() -# Macro used to set _ENABLE_TESTS and -# _ENABLE_EXAMPLES based on ${PROJECT_NAME}_ENABLE_TESTS and -# ${PROJECT_NAME}_ENABLE_EXAMPLES # -macro(tribits_apply_test_example_enables packageName) - if (${PROJECT_NAME}_ENABLE_${packageName}) - tribits_is_primary_meta_project_package(${packageName} packageIsPmmp) - if (packageIsPmmp) - tribits_set_package_enable_based_on_project_enable_on( - ${PROJECT_NAME}_ENABLE_TESTS ${packageName}_ENABLE_TESTS ) - tribits_set_package_enable_based_on_project_enable_on( - ${PROJECT_NAME}_ENABLE_EXAMPLES ${packageName}_ENABLE_EXAMPLES ) - endif() - endif() -endmacro() +# Private helper macros +# -# Macro to enable subpackage tests and examples based on parent package tests -# and examples enables -# -macro(tribits_apply_subpackage_tests_examples_enables parentPackageName) - # Set default for ${parentPackageName}_ENABLE_EXAMPLES=OFF if tests disabled - if ( ("${${parentPackageName}_ENABLE_EXAMPLES}" STREQUAL "") - AND ${parentPackageName}_ENABLE_TESTS - ) - message("-- " "Setting" - " ${parentPackageName}_ENABLE_EXAMPLES=${${parentPackageName}_ENABLE_TESTS}" - " because" - " ${parentPackageName}_ENABLE_TESTS=${${parentPackageName}_ENABLE_TESTS}") - set(${parentPackageName}_ENABLE_EXAMPLES ${${parentPackageName}_ENABLE_TESTS}) - endif() - # Set defaults for _ENABLE_[TESTS|EXAMPLES] - set(parentEnableExamples ${${parentPackageName}_ENABLE_EXAMPLES}) - set(parentEnableTests ${${parentPackageName}_ENABLE_TESTS}) - foreach(subpkgName IN LISTS ${parentPackageName}_SUBPACKAGES) - set(fullSpkgName ${parentPackageName}${subpkgName}) - if (${PROJECT_NAME}_ENABLE_${fullSpkgName}) - if (parentEnableTests AND ("${${fullSpkgName}_ENABLE_TESTS}" STREQUAL "")) - message("-- " "Setting" - " ${fullSpkgName}_ENABLE_TESTS=${parentEnableTests}" - " because parent package" - " ${parentPackageName}_ENABLE_TESTS=${parentEnableTests}") - set(${fullSpkgName}_ENABLE_TESTS ${parentEnableTests}) - endif() - if (parentEnableExamples AND ("${${fullSpkgName}_ENABLE_EXAMPLES}" STREQUAL "")) - message("-- " "Setting" - " ${fullSpkgName}_ENABLE_EXAMPLES=${parentEnableExamples}" - " because parent package" - " ${parentPackageName}_ENABLE_EXAMPLES=${parentEnableExamples}") - set(${fullSpkgName}_ENABLE_EXAMPLES ${parentEnableExamples}) - endif() - endif() - endforeach() -endmacro() -# NOTE: Above, the parent package may not actually be enabled yet -# (i.e. ${PROJECT_NAME}_ENABLE_${parentPackageName} my not be TRUE) if only -# subpackages needed to be enabled in the forward sweep but we want the tests -# and examples for a subpackage to be enabled if the tests and examples for -# the parent package, respectfully, are enabled. +macro(tribits_private_add_optional_package_enable PACKAGE_NAME OPTIONAL_DEP_PACKAGE + TYPE SET_AS_CACHE_IN + ) + #message("\nPACKAGE_ARCH_PRIVATE_ADD_OPTIONAL_PACKAGE_ENABLE: ${PACKAGE_NAME} ${OPTIONAL_DEP_PACKAGE}") -# Macro that enables upstream (required and optional) packages for a given -# package -# -macro(tribits_enable_upstream_packages packageName) + if (SET_AS_CACHE_IN) - if (${PROJECT_NAME}_ENABLE_${packageName}) + multiline_set(DOCSTR + "Enable optional ${TYPE} support in the package ${PACKAGE_NAME}" + " for the package ${OPTIONAL_DEP_PACKAGE}." + " Set to 'ON', 'OFF', or leave empty" + " to allow for other logic to decide." + ) - foreach(depPkg IN LISTS ${packageName}_LIB_DEFINED_DEPENDENCIES) - tribits_private_enable_dep_package(${packageName} ${depPkg} LIB) - endforeach() + set_cache_on_off_empty( ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE} "" + ${DOCSTR} ) - foreach(depPkg IN LISTS ${packageName}_TEST_DEFINED_DEPENDENCIES) - tribits_private_enable_dep_package(${packageName} ${depPkg} TEST) - endforeach() + else() + + if (NOT DEFINED ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}) + set( ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE} "" ) + endif() endif() endmacro() -# NOTE: The above macro has a defect. It is enabling upstream test dependent -# packages even if tests nor examples are not enabled (see -# TriBITSPub/TriBITS#56). But fixing this will break backward compatibility -# and therefore require upgrading the packages that currently only work -# correctly because of this defect. -# Macro that post-processes optional dependencies after all other -# dependencies have been worked out -# -macro(tribits_postprocess_optional_package_enables packageName) +macro(tribits_private_add_optional_tpl_enable PACKAGE_NAME OPTIONAL_DEP_TPL + TYPE SET_AS_CACHE_IN ) - if (${PROJECT_NAME}_ENABLE_${packageName}) + if (SET_AS_CACHE_IN) - foreach(depPkg ${${packageName}_LIB_DEFINED_DEPENDENCIES}) - tribits_private_postprocess_optional_package_enable( - ${packageName} ${depPkg} ) - endforeach() + multiline_set(DOCSTR + "Enable optional ${TYPE} support in the package ${PACKAGE_NAME}" + " for the TPL ${OPTIONAL_DEP_TPL}." + " Set to 'ON', 'OFF', or leave empty" + " to allow for other logic to decide." + ) - foreach(depPkg ${${packageName}_TEST_DEFINED_DEPENDENCIES}) - tribits_private_postprocess_optional_package_enable( - ${packageName} ${depPkg} ) - endforeach() + set_cache_on_off_empty( ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL} "" + ${DOCSTR} ) + + else() + + if (NOT DEFINED ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}) + set( ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL} "" ) + endif() endif() endmacro() -# NOTE: Above, it is harmless to process required dependencies as well so we -# leave of the if () statement based on -# ${packageName}_[LIB|TEST]_DEP_REQUIRED_${depPkg}. # Macro that sets cache vars for optional package interdependencies @@ -713,84 +494,65 @@ endmacro() # This also will set ${PACKAGE_NAME}_ENABLE_TESTS and # ${PACKAGE_NAME}_ENABLE_EXAMPLES to empty non-cache vars # -macro(tribits_setup_optional_package_enables_and_cache_vars packageName) +macro(tribits_set_up_optional_package_enables_and_cache_vars PACKAGE_NAME) + + #message("\nPACKAGE_ARCH_ADD_OPTIONAL_PACKAGE_ENABLES: ${PACKAGE_NAME}") - assert_defined(${PROJECT_NAME}_ENABLE_${packageName}) - set(setAsCacheVar ${${PROJECT_NAME}_ENABLE_${packageName}}) + assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + set(SET_AS_CACHE ${${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}}) - if (setAsCacheVar) + if (SET_AS_CACHE) - multiline_set(docStr - "Build tests for the package ${packageName}. Set to 'ON', 'OFF', or leave empty ''" + multiline_set(DOCSTR + "Build tests for the package ${PACKAGE_NAME}. Set to 'ON', 'OFF', or leave empty ''" " to allow for other logic to decide." ) - set_cache_on_off_empty( ${packageName}_ENABLE_TESTS "" ${docStr} ) + set_cache_on_off_empty( ${PACKAGE_NAME}_ENABLE_TESTS "" ${DOCSTR} ) - multiline_set(docStr - "Build examples for the package ${packageName}. Set to 'ON', 'OFF', or leave empty ''" + multiline_set(DOCSTR + "Build examples for the package ${PACKAGE_NAME}. Set to 'ON', 'OFF', or leave empty ''" " to allow for other logic to decide." ) - set_cache_on_off_empty( ${packageName}_ENABLE_EXAMPLES "" ${docStr} ) + set_cache_on_off_empty( ${PACKAGE_NAME}_ENABLE_EXAMPLES "" ${DOCSTR} ) - multiline_set(docStr - "Build examples for the package ${packageName}. Set to 'ON', 'OFF', or leave empty ''" + multiline_set(DOCSTR + "Build examples for the package ${PACKAGE_NAME}. Set to 'ON', 'OFF', or leave empty ''" " to allow for other logic to decide." ) - set( ${packageName}_SKIP_CTEST_ADD_TEST - "${${PROJECT_NAME}_SKIP_CTEST_ADD_TEST}" CACHE BOOL ${docStr} ) + set( ${PACKAGE_NAME}_SKIP_CTEST_ADD_TEST + "${${PROJECT_NAME}_SKIP_CTEST_ADD_TEST}" CACHE BOOL ${DOCSTR} ) else() - if (NOT DEFINED ${packageName}_ENABLE_TESTS) - set( ${packageName}_ENABLE_TESTS "" ) + if (NOT DEFINED ${PACKAGE_NAME}_ENABLE_TESTS) + set( ${PACKAGE_NAME}_ENABLE_TESTS "" ) endif() - if (NOT DEFINED ${packageName}_ENABLE_EXAMPLES) - set( ${packageName}_ENABLE_EXAMPLES "" ) + if (NOT DEFINED ${PACKAGE_NAME}_ENABLE_EXAMPLES) + set( ${PACKAGE_NAME}_ENABLE_EXAMPLES "" ) endif() endif() - foreach(optDepPkg ${${packageName}_LIB_DEFINED_DEPENDENCIES}) + foreach(OPTIONAL_DEP_PACKAGE ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES}) tribits_private_add_optional_package_enable( - ${packageName} ${optDepPkg} "library" "${setAsCacheVar}" ) + ${PACKAGE_NAME} ${OPTIONAL_DEP_PACKAGE} "library" "${SET_AS_CACHE}" ) endforeach() - foreach(optDepPkg ${${packageName}_TEST_DEFINED_DEPENDENCIES}) + foreach(OPTIONAL_DEP_PACKAGE ${${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES}) tribits_private_add_optional_package_enable( - ${packageName} ${optDepPkg} "test" "${setAsCacheVar}" ) + ${PACKAGE_NAME} ${OPTIONAL_DEP_PACKAGE} "test" "${SET_AS_CACHE}" ) + endforeach() + + foreach(OPTIONAL_DEP_TPL ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_TPLS}) + tribits_private_add_optional_tpl_enable( + ${PACKAGE_NAME} ${OPTIONAL_DEP_TPL} "library" "${SET_AS_CACHE}" ) + endforeach() + + foreach(OPTIONAL_DEP_TPL ${${PACKAGE_NAME}_TEST_OPTIONAL_DEP_TPLS}) + tribits_private_add_optional_tpl_enable( + ${PACKAGE_NAME} ${OPTIONAL_DEP_TPL} "test" "${SET_AS_CACHE}" ) endforeach() -endmacro() - - -# Macro that enables a the top-level parent package enable if any of its -# subpackages are enabled. -# -macro(tribits_enable_parent_package_for_subpackage_enables toplevelPackageName) - foreach(tap2_subPkgName IN LISTS ${toplevelPackageName}_SUBPACKAGES) - set(subpkgFullName ${toplevelPackageName}${tap2_subPkgName}) - if (${PROJECT_NAME}_ENABLE_${subpkgFullName} - AND (NOT ${PROJECT_NAME}_ENABLE_${toplevelPackageName}) - ) - message("-- " - "Setting ${PROJECT_NAME}_ENABLE_${toplevelPackageName}=ON" - " because ${PROJECT_NAME}_ENABLE_${subpkgFullName}=ON") - set(${PROJECT_NAME}_ENABLE_${toplevelPackageName} ON) - tribits_set_parent_package_subpackage_enable_for_enabled_subpackages( - ${toplevelPackageName}) - tribits_set_parent_package_test_example_enable_for_enabled_subpackages( - ${toplevelPackageName} TESTS) - tribits_set_parent_package_test_example_enable_for_enabled_subpackages( - ${toplevelPackageName} EXAMPLES) - # NOTE: Above, we need to enable the parent package even if it was - # disabled by some means before this. (There are use cases where the - # parent package my be disabled but that may not trigger the disable of - # subpackages of that package.) Other logic should ensure that the - # parent package is never explicitly disabled and a subpackage is - # allowed to be enabled. - break() # We only need trigger above code for single enabled subpackage! - endif() - endforeach() endmacro() @@ -803,11 +565,17 @@ endmacro() # # NOTES: # +# * ${packageName}_LIB_DEFINED_DEPENDENCIES will be set regardless if +# ${packageName} is enabled or not. +# # * ${packageName}_LIB_ENABLED_DEPENDENCIES is only set if ${packageName} is # enabled and will only contain the names of direct library upstream # internal and external packages ${depPkg} that are required or are # optional and ${packageName}_ENABLE_${depPkg} is set to ON. # +# * ${packageName}_TEST_DEFINED_DEPENDENCIES will be set regardless if +# ${packageName} is enabled or not. +# # * ${packageName}_TEST_ENABLED_DEPENDENCIES is only set if ${packageName} is # enabled and will only contain the names of direct test/example upstream # internal and external packages ${depPkg} that are required or are @@ -821,387 +589,1196 @@ endmacro() # packages where only the shell of the parent package is enabled and not # all of its required subpackages are enabled. # -macro(tribits_setup_enabled_dependencies_lists_and_enable_vars packageName) +macro(tribits_setup_direct_package_dependencies_lists_and_lib_required_enable_vars + packageName + ) - tribits_get_package_enable_status(${packageName} packageEnable packageEnableVar) + # LIB dependencies + set(${packageName}_LIB_DEFINED_DEPENDENCIES "") set(${packageName}_LIB_ENABLED_DEPENDENCIES "") - foreach(depPkg IN LISTS ${packageName}_LIB_DEFINED_DEPENDENCIES) - tribits_get_package_enable_status(${depPkg} depPkgEnable depPkgEnableVar) - if (${packageName}_LIB_DEP_REQUIRED_${depPkg}) - if (packageEnable AND depPkgEnable) - set(${packageName}_ENABLE_${depPkg} ON) - # See below NOTE about required subpackage dependencies not being - # enabled in some cases - list(APPEND ${packageName}_LIB_ENABLED_DEPENDENCIES ${depPkg}) - endif() - else() - if (packageEnable AND ${packageName}_ENABLE_${depPkg}) - list(APPEND ${packageName}_LIB_ENABLED_DEPENDENCIES ${depPkg}) - endif() + + foreach(depPkg ${${packageName}_LIB_REQUIRED_DEP_PACKAGES}) + list(APPEND ${packageName}_LIB_DEFINED_DEPENDENCIES ${depPkg}) + if (${PROJECT_NAME}_ENABLE_${packageName} AND ${PROJECT_NAME}_ENABLE_${depPkg}) + set(${packageName}_ENABLE_${depPkg} ON) + list(APPEND ${packageName}_LIB_ENABLED_DEPENDENCIES ${depPkg}) + endif() + endforeach() + # See below NOTE about required subpackage dependencies not being enabled in + # some cases! + + foreach(depPkg ${${packageName}_LIB_OPTIONAL_DEP_PACKAGES}) + list(APPEND ${packageName}_LIB_DEFINED_DEPENDENCIES ${depPkg}) + if (${PROJECT_NAME}_ENABLE_${packageName} AND ${packageName}_ENABLE_${depPkg}) + list(APPEND ${packageName}_LIB_ENABLED_DEPENDENCIES ${depPkg}) endif() endforeach() + foreach(depPkg ${${packageName}_LIB_REQUIRED_DEP_TPLS}) + list(APPEND ${packageName}_LIB_DEFINED_DEPENDENCIES ${depPkg}) + if (${PROJECT_NAME}_ENABLE_${packageName}) + set(${packageName}_ENABLE_${depPkg} ON) + list(APPEND ${packageName}_LIB_ENABLED_DEPENDENCIES ${depPkg}) + endif() + endforeach() + + foreach(depPkg ${${packageName}_LIB_OPTIONAL_DEP_TPLS}) + list(APPEND ${packageName}_LIB_DEFINED_DEPENDENCIES ${depPkg}) + if (${PROJECT_NAME}_ENABLE_${packageName} AND ${packageName}_ENABLE_${depPkg}) + list(APPEND ${packageName}_LIB_ENABLED_DEPENDENCIES ${depPkg}) + endif() + endforeach() + + # TEST dependencies + + set(${packageName}_TEST_DEFINED_DEPENDENCIES "") set(${packageName}_TEST_ENABLED_DEPENDENCIES "") - if (packageEnable AND (${packageName}_ENABLE_TESTS OR ${packageName}_ENABLE_EXAMPLES)) - foreach(depPkg IN LISTS ${packageName}_TEST_DEFINED_DEPENDENCIES) - if (${packageName}_TEST_DEP_REQUIRED_${depPkg}) - list(APPEND ${packageName}_TEST_ENABLED_DEPENDENCIES ${depPkg}) - else() - if (${packageName}_ENABLE_${depPkg}) - list(APPEND ${packageName}_TEST_ENABLED_DEPENDENCIES ${depPkg}) - endif() - endif() - endforeach() + + if (${PROJECT_NAME}_ENABLE_${packageName} + AND + (${packageName}_ENABLE_TESTS OR ${packageName}_ENABLE_EXAMPLES) + ) + set(enablePkgAndTestsOrExamples ON) + else() + set(enablePkgAndTestsOrExamples OFF) endif() + foreach(depPkg ${${packageName}_TEST_REQUIRED_DEP_PACKAGES}) + list(APPEND ${packageName}_TEST_DEFINED_DEPENDENCIES ${depPkg}) + if (enablePkgAndTestsOrExamples) + list(APPEND ${packageName}_TEST_ENABLED_DEPENDENCIES ${depPkg}) + endif() + endforeach() + + foreach(depPkg ${${packageName}_TEST_OPTIONAL_DEP_PACKAGES}) + list(APPEND ${packageName}_TEST_DEFINED_DEPENDENCIES ${depPkg}) + if (enablePkgAndTestsOrExamples AND ${packageName}_ENABLE_${depPkg}) + list(APPEND ${packageName}_TEST_ENABLED_DEPENDENCIES ${depPkg}) + endif() + endforeach() + + foreach(depPkg ${${packageName}_TEST_REQUIRED_DEP_TPLS}) + list(APPEND ${packageName}_TEST_DEFINED_DEPENDENCIES ${depPkg}) + if (enablePkgAndTestsOrExamples) + list(APPEND ${packageName}_TEST_ENABLED_DEPENDENCIES ${depPkg}) + endif() + endforeach() + + foreach(depPkg ${${packageName}_TEST_OPTIONAL_DEP_TPLS}) + list(APPEND ${packageName}_TEST_DEFINED_DEPENDENCIES ${depPkg}) + if (enablePkgAndTestsOrExamples AND ${packageName}_ENABLE_${depPkg}) + list(APPEND ${packageName}_TEST_ENABLED_DEPENDENCIES ${depPkg}) + endif() + endforeach() + endmacro() # NOTE: Above, a required dependency of an enabled package may not actually be -# enabled if the upstream depPkg is a required subpackage of a parent package -# and the parent package was not actually enabled due to a dependency, but -# instead, only the shell of the parent package was enabled at the very end -# (in tribits_do_final_parent_packages_enables_for_subpackage_enables()). -# This is one of the more confusing aspects of the TriBITS dependency system. +# enabled if it is a required subpackage of a parent package and the parent +# package was not actually enabled due to a dependency but the shell of the +# parent package was only enabled at the very end. This is one of the more +# confusing aspects of the TriBITS dependency system. # Function to print the direct package dependency lists # function(tribits_print_direct_package_dependencies_lists packageName) + set(PRINTED_VAR "") message("") - set(printedVar "") - tribits_print_nonempty_package_deps_list(${packageName} LIB ENABLED printedVar) - tribits_print_nonempty_package_deps_list(${packageName} TEST ENABLED printedVar) - if (NOT printedVar) - message("-- ${packageName}: No enabled dependencies!") - endif() + print_nonempty_var_with_spaces(${packageName}_LIB_ENABLED_DEPENDENCIES PRINTED_VAR) + print_var_with_spaces(${packageName}_LIB_DEFINED_DEPENDENCIES PRINTED_VAR) + print_nonempty_var_with_spaces(${packageName}_TEST_ENABLED_DEPENDENCIES PRINTED_VAR) + print_nonempty_var_with_spaces(${packageName}_TEST_DEFINED_DEPENDENCIES PRINTED_VAR) endfunction() - -################################################################################ # -# Third and lower-level macros called indirectly from -# ``tribits_adjust_package_enables()`` +# Private helper macros # -################################################################################ -# Only turn off ${fwdDepPkgName} libraries or test/examples if it is currently -# enabled or could be enabled +# Enable optional intra-package support for enabled target package +# ${PACKAGE_NAME} (i.e. ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} is assumed to +# be TRUE before calling this macro. # -macro(tribits_private_disable_required_package_enables - fwdDepPkgName packageName libraryDep - ) - tribits_get_package_enable_status(${fwdDepPkgName} "" fwdDepPkgEnableVarName) - if (${fwdDepPkgEnableVarName} OR "${${fwdDepPkgEnableVarName}}" STREQUAL "") - if ("${libraryDep}" STREQUAL "TRUE") - tribits_private_print_disable_required_package_enable( - ${packageName} ${fwdDepPkgEnableVarName} - ${fwdDepPkgName} "library" ) - set(${fwdDepPkgEnableVarName} OFF) - else() - set(depTypeStr "test/example") - if (${fwdDepPkgName}_ENABLE_TESTS - OR "${${fwdDepPkgName}_ENABLE_TESTS}" STREQUAL "" - ) - tribits_private_print_disable_required_package_enable( - ${packageName} ${fwdDepPkgName}_ENABLE_TESTS - ${fwdDepPkgName} "${depTypeStr}" ) - set(${fwdDepPkgName}_ENABLE_TESTS OFF) - endif() +macro(tribits_private_postprocess_optional_package_enable PACKAGE_NAME OPTIONAL_DEP_PACKAGE) - if (${fwdDepPkgName}_ENABLE_EXAMPLES - OR "${${fwdDepPkgName}_ENABLE_EXAMPLES}" STREQUAL "" - ) - tribits_private_print_disable_required_package_enable( - ${packageName} ${fwdDepPkgName}_ENABLE_EXAMPLES - ${fwdDepPkgName} "${depTypeStr}" ) - set(${fwdDepPkgName}_ENABLE_EXAMPLES OFF) - endif() + #message("TRIBITS_PRIVATE_POSTPROCESS_OPTIONAL_PACKAGE_ENABLE: ${PACKAGE_NAME} ${OPTIONAL_DEP_PACKAGE}") + #print_var(${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}) + #print_var(${PROJECT_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}) + + if (${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE} AND ${PROJECT_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}) + message("-- " "NOTE:" + " ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}=${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}}" + " is already set!") + elseif ("${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}}" STREQUAL "") + if (${PROJECT_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}) + message("-- " "Setting ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}=ON" + " since ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}=ON AND" + " ${PROJECT_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}=ON") + set(${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE} ON) + else() + message("-- " "NOT setting ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}=ON" + " since ${OPTIONAL_DEP_PACKAGE} is NOT enabled at this point!") endif() + elseif (NOT "${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}}" STREQUAL "" + AND NOT ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE} + AND ${PROJECT_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE} + ) + message("-- " "NOTE: ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}=${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}}" + " is already set so not enabling even though ${PROJECT_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}=${${PROJECT_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}} is set!") + endif() + + string(TOUPPER ${PACKAGE_NAME} PACKAGE_NAME_UPPER) + string(TOUPPER ${OPTIONAL_DEP_PACKAGE} OPTIONAL_DEP_PACKAGE_UPPER) + set(MACRO_DEFINE_NAME HAVE_${PACKAGE_NAME_UPPER}_${OPTIONAL_DEP_PACKAGE_UPPER}) + + if(${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_PACKAGE}) + set(${MACRO_DEFINE_NAME} ON) + else() + set(${MACRO_DEFINE_NAME} OFF) endif() + endmacro() -function(tribits_private_print_disable_required_package_enable - packageName packageEnableSomethingVarName fwdDepPkgName - depTypeStr - ) - tribits_private_print_disable( - ${packageEnableSomethingVarName} ${fwdDepPkgName} - "${depTypeStr}" "package" ${packageName} ) -endfunction() +# Enable optional intra-package support for enabled target package +# ${PACKAGE_NAME} (i.e. ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} is assumed to +# be TRUE before calling this macro. +# +macro(tribits_private_postprocess_optional_tpl_enable PACKAGE_NAME OPTIONAL_DEP_TPL) -function(tribits_private_print_disable - packageBeingDisabledVarName packageWithSomethingBeingDisabledName - depTypeStr thingBeingDisabledType thingBeingDisabledName - ) - if (${packageBeingDisabledVarName}) - if (${PROJECT_NAME}_DISABLE_ENABLED_FORWARD_DEP_PACKAGES) - message( - " ***\n" - " *** NOTE: Setting ${packageBeingDisabledVarName}=OFF" - " which was '${${packageBeingDisabledVarName}}' because" - " ${packageWithSomethingBeingDisabledName} has" - " a required ${depTypeStr} dependence on disabled" - " ${thingBeingDisabledType} ${thingBeingDisabledName}" - " but ${PROJECT_NAME}_DISABLE_ENABLED_FORWARD_DEP_PACKAGES=ON!\n" - " ***\n" - ) - else() - message(FATAL_ERROR - " ***\n" - " *** ERROR: Setting ${packageBeingDisabledVarName}=OFF" - " which was '${${packageBeingDisabledVarName}}' because" - " ${packageWithSomethingBeingDisabledName} has" - " a required ${depTypeStr} dependence on disabled" - " ${thingBeingDisabledType} ${thingBeingDisabledName}!\n" - " ***\n" - ) - endif() + #message("TRIBITS_PRIVATE_POSTPROCESS_OPTIONAL_TPL_ENABLE: ${PACKAGE_NAME} ${OPTIONAL_DEP_TPL}") + + if (${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL} AND TPL_ENABLE_${OPTIONAL_DEP_TPL}) + message("-- " "NOTE:" + " ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}=${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}}" + " is already set!") + elseif ( + (NOT TPL_ENABLE_${OPTIONAL_DEP_TPL}) + AND + (NOT "${TPL_ENABLE_${OPTIONAL_DEP_TPL}}" STREQUAL "") + AND + ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL} + ) + message( + "\n***" + "\n*** NOTE: Setting ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}=OFF" + " which was ON since TPL_ENABLE_${OPTIONAL_DEP_TPL}=OFF" + "\n***\n" + ) + set(${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL} OFF) + elseif ("${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}}" STREQUAL "" + AND TPL_ENABLE_${OPTIONAL_DEP_TPL} + ) + message("-- " "Setting ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}=ON" + " since TPL_ENABLE_${OPTIONAL_DEP_TPL}=ON") + set(${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL} ON) + elseif (NOT "${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}}" STREQUAL "" + AND NOT ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL} + AND TPL_ENABLE_${OPTIONAL_DEP_TPL} + ) + message("-- " "NOTE: ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}=${${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}}" + " is already set so not enabling even though TPL_ENABLE_${OPTIONAL_DEP_TPL}=${TPL_ENABLE_${OPTIONAL_DEP_TPL}} is set!") + endif() + + string(TOUPPER ${PACKAGE_NAME} PACKAGE_NAME_UPPER) + string(TOUPPER ${OPTIONAL_DEP_TPL} OPTIONAL_DEP_TPL_UPPER) + set(MACRO_DEFINE_NAME HAVE_${PACKAGE_NAME_UPPER}_${OPTIONAL_DEP_TPL_UPPER}) + + if (${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}) + set(${MACRO_DEFINE_NAME} ON) else() - message("-- " - "Setting ${packageBeingDisabledVarName}=OFF" - " because ${packageWithSomethingBeingDisabledName} has a required ${depTypeStr}" - " dependence on disabled ${thingBeingDisabledType} ${thingBeingDisabledName}") + set(${MACRO_DEFINE_NAME} OFF) endif() -endfunction() +endmacro() -macro(tribits_private_disable_optional_package_enables fwdDepPkgName packageName) - if (${fwdDepPkgName}_ENABLE_${packageName} - OR "${${fwdDepPkgName}_ENABLE_${packageName}}" STREQUAL "" - ) - # Always disable the conditional enable but only print the message if the - # package is enabled or if a disable overrides an enable - if (${PROJECT_NAME}_ENABLE_${fwdDepPkgName}) - if (${fwdDepPkgName}_ENABLE_${packageName}) # is explicitly enabled already! - message("-- " - "NOTE: Setting ${fwdDepPkgName}_ENABLE_${packageName}=OFF" - " which was ${${fwdDepPkgName}_ENABLE_${packageName}}" - " because ${fwdDepPkgName} has an optional library dependence" - " on disabled package ${packageName}") - else() # Not explicitly set - message("-- " - "Setting ${fwdDepPkgName}_ENABLE_${packageName}=OFF" - " because ${fwdDepPkgName} has an optional library dependence" - " on disabled package ${packageName}") - endif() +# Macro that post-processes optional dependencies after all other +# dependencies have been worked out +# +macro(tribits_postprocess_optional_package_enables PACKAGE_NAME) + + #message("\nPACKAGE_ARCH_POSTPROCESS_OPTIONAL_PACKAGE_ENABLES: ${PACKAGE_NAME}") + + assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + + foreach(OPTIONAL_DEP_PACKAGE ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES}) + tribits_private_postprocess_optional_package_enable( + ${PACKAGE_NAME} ${OPTIONAL_DEP_PACKAGE} ) + endforeach() + + foreach(OPTIONAL_DEP_PACKAGE ${${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES}) + tribits_private_postprocess_optional_package_enable( + ${PACKAGE_NAME} ${OPTIONAL_DEP_PACKAGE} ) + endforeach() + + endif() + +endmacro() + + +# Macro that post-processes final package enables for packages with subpackage +# enables. +# +macro(tribits_postprocess_package_with_subpackages_enables PACKAGE_NAME) + #message("TRIBITS_POSTPROCESS_PACKAGE_WITH_SUBPACKAGES_ENABLES '${PACKAGE_NAME}'") + foreach(TRIBITS_SUBPACKAGE ${${PACKAGE_NAME}_SUBPACKAGES}) + set(SUBPACKAGE_FULLNAME ${PACKAGE_NAME}${TRIBITS_SUBPACKAGE}) + #print_var(${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}) + #print_var(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + #print_var(${SUBPACKAGE_FULLNAME}_ENABLE_TESTS) + #print_var(${PACKAGE_NAME}_ENABLE_TESTS) + #print_var(${SUBPACKAGE_FULLNAME}_ENABLE_EXAMPLES) + #print_var(${PACKAGE_NAME}_ENABLE_EXAMPLES) + if (${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME} + AND NOT ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} + ) + message("-- " + "Setting ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}=ON" + " because ${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}=ON") + set(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} ON) + tribits_postprocess_package_with_subpackages_optional_subpackage_enables( + ${PACKAGE_NAME}) + tribits_postprocess_package_with_subpackages_test_example_enables( + ${PACKAGE_NAME} TESTS) + tribits_postprocess_package_with_subpackages_test_example_enables( + ${PACKAGE_NAME} EXAMPLES) + # NOTE: We need to enable the parent package even if it was disabled by + # some means before this because a subpackage is enabled. But other + # logic should ensure that the parent package is never disabled and a + # subpackage is allowed to be enabled. + endif() + endforeach() +endmacro() + + +# Set _ENABLE_=ON if not already enabled for all +# subpackages of a parent package. +# +macro(tribits_postprocess_package_with_subpackages_optional_subpackage_enables + PACKAGE_NAME + ) + #message("TRIBITS_POSTPROCESS_PACKAGE_WITH_SUBPACKAGES_TEST_EXAMPLE_ENABLES '${PACKAGE_NAME}'") + foreach(TRIBITS_SUBPACKAGE ${${PACKAGE_NAME}_SUBPACKAGES}) + set(SUBPACKAGE_FULLNAME ${PACKAGE_NAME}${TRIBITS_SUBPACKAGE}) + if (${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME} + AND "${${PACKAGE_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}}" STREQUAL "" + ) + message("-- " + "Setting ${PACKAGE_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}=ON" + " because ${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}=ON") + set(${PACKAGE_NAME}_ENABLE_${SUBPACKAGE_FULLNAME} ON) endif() - if (${fwdDepPkgName}_ENABLE_${packageName} - AND (NOT ${PROJECT_NAME}_ENABLE_${packageName}) - AND (NOT "${${PROJECT_NAME}_ENABLE_${packageName}}" STREQUAL "") + endforeach() +endmacro() + + +# Set the parent package tests/examples enables if one subpackage is enabled +# and has its tests/examples +# +macro(tribits_postprocess_package_with_subpackages_test_example_enables + PACKAGE_NAME TESTS_OR_EXAMPLES + ) + #message("TRIBITS_POSTPROCESS_PACKAGE_WITH_SUBPACKAGES_TEST_EXAMPLE_ENABLES '${PACKAGE_NAME}'") + foreach(TRIBITS_SUBPACKAGE ${${PACKAGE_NAME}_SUBPACKAGES}) + set(SUBPACKAGE_FULLNAME ${PACKAGE_NAME}${TRIBITS_SUBPACKAGE}) + #print_var(${PROJECT_NAME}_ENABLE_${SUBPACKAGE_FULLNAME}) + #print_var(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + #print_var(${SUBPACKAGE_FULLNAME}_ENABLE_${TESTS_OR_EXAMPLES}) + #print_var(${PACKAGE_NAME}_ENABLE_${TESTS_OR_EXAMPLES}) + #print_var(${SUBPACKAGE_FULLNAME}_ENABLE_EXAMPLES) + #print_var(${PACKAGE_NAME}_ENABLE_EXAMPLES) + if (${SUBPACKAGE_FULLNAME}_ENABLE_${TESTS_OR_EXAMPLES} + AND "${${PACKAGE_NAME}_ENABLE_${TESTS_OR_EXAMPLES}}" STREQUAL "" ) - message("-- " "NOTE: ${fwdDepPkgName}_ENABLE_${packageName}=" - "${${fwdDepPkgName}_ENABLE_${packageName}} but" - " ${PROJECT_NAME}_ENABLE_${packageName}=" - "${${PROJECT_NAME}_ENABLE_${packageName}} is set. Setting" - " ${fwdDepPkgName}_ENABLE_${packageName}=OFF!") + message("-- " + "Setting ${PACKAGE_NAME}_ENABLE_${TESTS_OR_EXAMPLES}=ON" + " because ${SUBPACKAGE_FULLNAME}_ENABLE_${TESTS_OR_EXAMPLES}=ON") + set(${PACKAGE_NAME}_ENABLE_${TESTS_OR_EXAMPLES} ON) endif() - set(${fwdDepPkgName}_ENABLE_${packageName} OFF) + endforeach() +endmacro() + + +# Post-processes optional package TPL based on if the TPL +# has been enabled or not +# +macro(tribits_postprocess_optional_tpl_enables PACKAGE_NAME) + + #message("\nPACKAGE_ARCH_ADD_OPTIONAL_TPL_ENABLES: ${PACKAGE_NAME}") + + if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + + foreach(OPTIONAL_DEP_TPL ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_TPLS}) + tribits_private_postprocess_optional_tpl_enable( + ${PACKAGE_NAME} ${OPTIONAL_DEP_TPL} ) + endforeach() + + foreach(OPTIONAL_DEP_TPL ${${PACKAGE_NAME}_TEST_OPTIONAL_DEP_TPLS}) + tribits_private_postprocess_optional_tpl_enable( + ${PACKAGE_NAME} ${OPTIONAL_DEP_TPL} ) + endforeach() + endif() endmacro() -# Set an individual package variable enable variable (to ON or OFF) based on a +# Set an individual package variable enable variable (to on or off) based on a # global enable value # -macro(tribits_set_package_enable_based_on_project_enable projectEnableVar +macro(tribits_set_package_enable_based_on_global_enable projectEnableVar packageEnableVar ) + if (${PROJECT_NAME}_VERBOSE_CONFIGURE) + message("") + message("TRIBITS_SET_PACKAGE_ENABLE_BASED_ON_GLOBAL_ENABLE:") + message("-- " "${projectEnableVar} = ${${projectEnableVar}}") + message("-- " "${packageEnableVar} = ${${packageEnableVar}}") + endif() + if ("${${packageEnableVar}}" STREQUAL "") if (${projectEnableVar}) message("-- " "Setting ${packageEnableVar}=ON") set(${packageEnableVar} ON) - elseif ( (NOT ${projectEnableVar}) - AND (NOT "${projectEnableVar}" STREQUAL "") + elseif ( + (NOT ${projectEnableVar}) + AND + (NOT "${projectEnableVar}" STREQUAL "") ) message("-- " "Setting ${packageEnableVar}=OFF") set(${packageEnableVar} OFF) else() - # Otherwise, we will leave it up the the individual package - # to decide? + if (${PROJECT_NAME}_VERBOSE_CONFIGURE) + message("-- " "ELSE") + # Otherwise, we will leave it up the the individual package + # to decide? + endif() endif() else() - # "${packageEnableVar} not at the default empty '' + if (${PROJECT_NAME}_VERBOSE_CONFIGURE) + message("-- " "${packageEnableVar} NOT DEFAULT") + endif() + endif() + + if (${PROJECT_NAME}_VERBOSE_CONFIGURE) + message("-- " "${packageEnableVar} = ${${packageEnableVar}}") endif() endmacro() -# Set an individual package test or examples enable to on only if global -# enable var is on +# Set an individual package test or examples enable to on only if global enable var is on # -macro(tribits_set_package_enable_based_on_project_enable_on projectEnableVar +macro(tribits_set_package_enable_based_on_global_enable_on projectEnableVar packageEnableVar ) - if (("${${packageEnableVar}}" STREQUAL "") AND ${projectEnableVar}) - message("-- " "Setting ${packageEnableVar}=ON") - set(${packageEnableVar} ON) + if ("${${packageEnableVar}}" STREQUAL "") + if (${projectEnableVar}) + message("-- " "Setting ${packageEnableVar}=ON") + set(${packageEnableVar} ON) + endif() endif() endmacro() -macro(tribits_private_enable_dep_package packageName depPkgName libOrTest) - tribits_get_package_enable_status(${depPkgName} depPkgEnable depPkgEnableVar) - if (depPkgEnable) - #message("The package is already enabled so there is nothing to enable!") - elseif (${depPkgEnableVar} STREQUAL "") - set(tpedp_enableDepPkg "") - if (${packageName}_${libOrTest}_DEP_REQUIRED_${depPkgName}) - message("-- " "Setting ${depPkgEnableVar}=ON" - " because ${packageName} has a required dependence on ${depPkgName}") - set(tpedp_enableDepPkg ON) - elseif (${packageName}_ENABLE_${depPkgName}) - # Enable the upstream package if the user directly specified the - # optional package enable regardless if it is PT or ST or even EX. - message("-- " "Setting ${depPkgEnableVar}=ON" - " because ${packageName}_ENABLE_${depPkgName}=ON") - set(tpedp_enableDepPkg ON) - elseif (${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES) - # Enable the package if there is an optional dependence and we are asked - # to enabled optional dependencies. - tribits_implicit_package_enable_is_allowed(${packageName} ${depPkgName} - allowImplicitEnable) - if (allowImplicitEnable) - message("-- " "Setting ${depPkgEnableVar}=ON" - " because ${packageName} has an optional dependence on ${depPkgName}") - set(tpedp_enableDepPkg ON) - endif() - endif() - # Enable the upstream package - if (tpedp_enableDepPkg) - set(${depPkgEnableVar} ON) - set(${depPkgName}_ENABLING_PKG ${packageName}) - endif() +# Macro used to set ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} based on +# ${PROJECT_NAME}_ENABLE_ALL_PACKAGES +# +macro(tribits_apply_all_package_enables PACKAGE_NAME) + tribits_is_primary_meta_project_package(${PACKAGE_NAME} PACKAGE_IS_PMPP) + tribits_implicit_package_enable_is_allowed( "" ${PACKAGE_NAME} + PROCESS_PACKAGE_ENABLE ) + if (PACKAGE_IS_PMPP AND PROCESS_PACKAGE_ENABLE) + tribits_set_package_enable_based_on_global_enable( + ${PROJECT_NAME}_ENABLE_ALL_PACKAGES ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} ) endif() endmacro() -# Enable optional intra-package support for enabled target package -# ${packageName} (i.e. ${PROJECT_NAME}_ENABLE_${packageName} is assumed to -# be TRUE before calling this macro. +# Macro used to set ${TRIBITS_PACKAGE)_ENABLE_TESTS and ${TRIBITS_PACKAGE)_ENABLE_EXAMPLES +# based on ${PROJECT_NAME}_ENABLE_TESTS and ${PROJECT_NAME}_ENABLE_EXAMPLES # -macro(tribits_private_postprocess_optional_package_enable packageName optDepPkg) +macro(tribits_apply_test_example_enables PACKAGE_NAME) + if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + tribits_is_primary_meta_project_package(${PACKAGE_NAME} PACKAGE_IS_PMPP) + if (PACKAGE_IS_PMPP) + tribits_set_package_enable_based_on_global_enable_on( + ${PROJECT_NAME}_ENABLE_TESTS ${PACKAGE_NAME}_ENABLE_TESTS ) + tribits_set_package_enable_based_on_global_enable_on( + ${PROJECT_NAME}_ENABLE_EXAMPLES ${PACKAGE_NAME}_ENABLE_EXAMPLES ) + endif() + endif() +endmacro() - tribits_get_package_enable_status(${optDepPkg} optDepPkgEnable optDepPkgEnableVar) - tribits_get_package_enable_status(${packageName} packageEnable packageEnableVar) - if (${packageName}_ENABLE_${optDepPkg} AND optDepPkgEnable) - message("-- " "NOTE:" - " ${packageName}_ENABLE_${optDepPkg}=${${packageName}_ENABLE_${optDepPkg}}" - " is already set!") - elseif ("${${packageName}_ENABLE_${optDepPkg}}" STREQUAL "") - if (optDepPkgEnable) - message("-- " "Setting ${packageName}_ENABLE_${optDepPkg}=ON" - " since ${packageEnableVar}=ON AND" - " ${optDepPkgEnableVar}=ON") - set(${packageName}_ENABLE_${optDepPkg} ON) - else() - message("-- " "NOT setting ${packageName}_ENABLE_${optDepPkg}=ON" - " since ${optDepPkg} is NOT enabled at this point!") - endif() - elseif ((NOT "${${packageName}_ENABLE_${optDepPkg}}" STREQUAL "") - AND (NOT ${packageName}_ENABLE_${optDepPkg}) - AND optDepPkgEnable +# Macro to disable ${PARENT_PACKAGE_NAME)_ENABLE_ENABLES by default if +# ${PARENT_PACKAGE_NAME)_ENABLE_TESTS is explicitly disabled. +# +macro(tribits_apply_package_examples_disable PARENT_PACKAGE_NAME) + if (NOT "${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}" STREQUAL "" + AND NOT ${PARENT_PACKAGE_NAME}_ENABLE_TESTS + AND "${${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES}" STREQUAL "" ) - message("-- " "NOTE: ${packageName}_ENABLE_${optDepPkg}=" - "${${packageName}_ENABLE_${optDepPkg}} is already set so not enabling even" - " though ${optDepPkgEnableVar}=" - "${optDepPkgEnable} is set!") + message("-- " "Setting" + " ${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES" + "=${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}" + " because" + " ${PARENT_PACKAGE_NAME}_ENABLE_TESTS" + "=${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}" ) + set(${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES ${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}) endif() +endmacro() +# NOTE: Above, the top-level package ${PARENT_PACKAGE_NAME} may not even be +# enabled yet when this gets called but its subpackages might and we need to +# process this default disable in case their are any enabled subpackages. - string(TOUPPER ${packageName} packageName_UPPER) - string(TOUPPER ${optDepPkg} optDepPkg_UPPER) - set(macroDefineName HAVE_${packageName_UPPER}_${optDepPkg_UPPER}) - if(${packageName}_ENABLE_${optDepPkg}) - set(${macroDefineName} ON) - else() - set(${macroDefineName} OFF) +# Macro to disable ${TRIBITS_SUBPACKAGE)_ENABLE_TESTS and +# ${TRIBITS_SUBPACKAGE)_ENABLE_EXAMPLES based on +# ${TRIBITS_PARENTPACKAGE)_ENABLE_TESTS or +# ${TRIBITS_PARENTPACKAGE)_ENABLE_EXAMPLES +# +macro(tribits_apply_subpackage_tests_or_examples_disables PARENT_PACKAGE_NAME + TESTS_OR_EXAMPLES + ) + set(parentPkgEnableVar ${PARENT_PACKAGE_NAME}_ENABLE_${TESTS_OR_EXAMPLES}) + if (NOT "${${parentPkgEnableVar}}" STREQUAL "" AND NOT ${parentPkgEnableVar}) + foreach(spkg IN LISTS ${PARENT_PACKAGE_NAME}_SUBPACKAGES) + set(fullSpkgName ${PARENT_PACKAGE_NAME}${spkg}) + if (${PROJECT_NAME}_ENABLE_${fullSpkgName} AND NOT ${parentPkgEnableVar}) + if ("${${fullSpkgName}_ENABLE_${TESTS_OR_EXAMPLES}}" STREQUAL "") + message("-- " "Setting" + " ${fullSpkgName}_ENABLE_${TESTS_OR_EXAMPLES}=${${parentPkgEnableVar}}" + " because parent package" + " ${parentPkgEnableVar}=${${parentPkgEnableVar}}") + set(${fullSpkgName}_ENABLE_${TESTS_OR_EXAMPLES} ${${parentPkgEnableVar}}) + endif() + endif() + endforeach() endif() - endmacro() -macro(tribits_private_enable_forward_package fwdDepPkgName packageName) - tribits_implicit_package_enable_is_allowed( "" ${fwdDepPkgName} allowFwdDepPkgEnable) - if ("${${PROJECT_NAME}_ENABLE_${fwdDepPkgName}}" STREQUAL "" AND allowFwdDepPkgEnable) - message("-- " "Setting ${PROJECT_NAME}_ENABLE_${fwdDepPkgName}=ON" - " because ${PROJECT_NAME}_ENABLE_${packageName}=ON") - set(${PROJECT_NAME}_ENABLE_${fwdDepPkgName} ON) +# Macro to enable ${TRIBITS_SUBPACKAGE)_ENABLE_TESTS and +# ${TRIBITS_SUBPACKAGE)_ENABLE_EXAMPLES based on +# ${TRIBITS_PARENTPACKAGE)_ENABLE_TESTS or +# ${TRIBITS_PARENTPACKAGE)_ENABLE_EXAMPLES +# +macro(tribits_apply_subpackage_tests_examples_enables PARENT_PACKAGE_NAME) + if ("${${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES}" STREQUAL "" + AND ${PARENT_PACKAGE_NAME}_ENABLE_TESTS + ) + message("-- " "Setting" + " ${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES=${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}" + " because" + " ${PARENT_PACKAGE_NAME}_ENABLE_TESTS=${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}") + set(${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES ${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}) endif() + foreach(spkg IN LISTS ${PARENT_PACKAGE_NAME}_SUBPACKAGES) + set(fullSpkgName ${PARENT_PACKAGE_NAME}${spkg}) + if (${PROJECT_NAME}_ENABLE_${fullSpkgName}) + if (${PARENT_PACKAGE_NAME}_ENABLE_TESTS) + if ("${${fullSpkgName}_ENABLE_TESTS}" STREQUAL "") + message("-- " "Setting" + " ${fullSpkgName}_ENABLE_TESTS=${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}" + " because parent package" + " ${PARENT_PACKAGE_NAME}_ENABLE_TESTS" + "=${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}") + set(${fullSpkgName}_ENABLE_TESTS ${${PARENT_PACKAGE_NAME}_ENABLE_TESTS}) + endif() + endif() + if (${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES) + if ("${${fullSpkgName}_ENABLE_EXAMPLES}" STREQUAL "") + message("-- " "Setting" + " ${fullSpkgName}_ENABLE_EXAMPLES=${${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES}" + " because parent package" + " ${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES" + "=${${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES}") + set(${fullSpkgName}_ENABLE_EXAMPLES ${${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES}) + endif() + endif() + endif() + endforeach() endmacro() +# NOTE: Above, the parent package may not actually be enabled yet +# (i.e. ${PROJECT_NAME}_ENABLE_${PARENT_PACKAGE_NAME} my not be TRUE) if only +# subpackages needed to be enabled in the forward sweep but we want the tests +# and examples for subpackage to be enabled if +# ${PARENT_PACKAGE_NAME}_ENABLE_TESTS=ON or just examples i +# f${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES=ON -macro(tribits_private_add_optional_package_enable packageName optionalDepPkgName - libraryOrTest setAsCacheVar - ) +macro(tribits_private_enable_forward_package FORWARD_DEP_PACKAGE_NAME PACKAGE_NAME) + tribits_implicit_package_enable_is_allowed( "" ${FORWARD_DEP_PACKAGE_NAME} + ALLOW_PACKAGE_ENABLE ) + assert_defined(${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME}) + if("${${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME}}" STREQUAL "" + AND ALLOW_PACKAGE_ENABLE + ) + message("-- " "Setting ${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME}=ON" + " because ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}=ON") + assert_defined(${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME}) + set(${PROJECT_NAME}_ENABLE_${FORWARD_DEP_PACKAGE_NAME} ON) + endif() +endmacro() - if (setAsCacheVar) - multiline_set(docStr - "Enable optional ${libraryOrTest} support in the package ${packageName}" - " for the package ${optionalDepPkgName}." - " Set to 'ON', 'OFF', or leave empty" - " to allow for other logic to decide." - ) +# Macro used to set ${PROJECT_NAME}_ENABLE_${FWD_PACKAGE_NAME)=ON for all +# +macro(tribits_enable_forward_lib_package_enables PACKAGE_NAME) - set_cache_on_off_empty( ${packageName}_ENABLE_${optionalDepPkgName} "" - ${docStr} ) + assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - else() + foreach(FWD_DEP_PKG ${${PACKAGE_NAME}_FORWARD_LIB_REQUIRED_DEP_PACKAGES}) + tribits_private_enable_forward_package(${FWD_DEP_PKG} ${PACKAGE_NAME}) + endforeach() - if (NOT DEFINED ${packageName}_ENABLE_${optionalDepPkgName}) - set(${packageName}_ENABLE_${optionalDepPkgName} "" ) - endif() + foreach(FWD_DEP_PKG ${${PACKAGE_NAME}_FORWARD_LIB_OPTIONAL_DEP_PACKAGES}) + tribits_private_enable_forward_package(${FWD_DEP_PKG} ${PACKAGE_NAME}) + endforeach() endif() endmacro() -# Macro that sets ``_ENABLE_=ON`` if not already -# enabled for all enabled subpackages of a parent package. +# Macro used to set ${PROJECT_NAME}_ENABLE_${FWD_PACKAGE_NAME)=ON for all +# optional and required forward test dependencies of the package +# ${PACKAGE_NAME} # -macro(tribits_set_parent_package_subpackage_enable_for_enabled_subpackages - toplevelPackageName - ) - foreach(tap3_subPkg IN LISTS ${toplevelPackageName}_SUBPACKAGES) - set(subpkgFullName ${toplevelPackageName}${tap3_subPkg}) - if (${PROJECT_NAME}_ENABLE_${subpkgFullName} - AND "${${toplevelPackageName}_ENABLE_${subpkgFullName}}" STREQUAL "" - ) - message("-- " - "Setting ${toplevelPackageName}_ENABLE_${subpkgFullName}=ON" - " because ${PROJECT_NAME}_ENABLE_${subpkgFullName}=ON") - set(${toplevelPackageName}_ENABLE_${subpkgFullName} ON) - endif() - endforeach() +macro(tribits_enable_forward_test_package_enables PACKAGE_NAME) + + assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + + foreach(FWD_DEP_PKG ${${PACKAGE_NAME}_FORWARD_TEST_REQUIRED_DEP_PACKAGES}) + tribits_private_enable_forward_package(${FWD_DEP_PKG} ${PACKAGE_NAME}) + endforeach() + + foreach(FWD_DEP_PKG ${${PACKAGE_NAME}_FORWARD_TEST_OPTIONAL_DEP_PACKAGES}) + tribits_private_enable_forward_package(${FWD_DEP_PKG} ${PACKAGE_NAME}) + endforeach() + + endif() + endmacro() -# Macro that sets ``_ENABLE_[TESTS|EXAMPLES]=ON`` if subpackage -# is enabled and has its tests/examples are enabled. # -macro(tribits_set_parent_package_test_example_enable_for_enabled_subpackages - toplevelPackageName testOrExamples +# Private helper macros +# + + +macro(tribits_private_enable_dep_package PACKAGE_NAME DEP_PACKAGE_NAME + OPTREQ_IN ) - foreach(tap3_subPkg IN LISTS ${toplevelPackageName}_SUBPACKAGES) - set(subpkgFullName ${toplevelPackageName}${tap3_subPkg}) - if (${subpkgFullName}_ENABLE_${testOrExamples} - AND "${${toplevelPackageName}_ENABLE_${testOrExamples}}" STREQUAL "" - ) - message("-- " - "Setting ${toplevelPackageName}_ENABLE_${testOrExamples}=ON" - " because ${subpkgFullName}_ENABLE_${testOrExamples}=ON") - set(${toplevelPackageName}_ENABLE_${testOrExamples} ON) - endif() - endforeach() -endmacro() + #message("TRIBITS_PRIVATE_ENABLE_DEP_PACKAGE: '${PACKAGE_NAME}' '${DEP_PACKAGE_NAME}' '${OPTREQ_IN}'") + + assert_defined(${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME}) + #print_var(${PACKAGE_NAME}_ENABLE_${DEP_PACKAGE_NAME}) + + if (${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME}) + + #message("The package is already enabled so there is nothing to enable!") + + elseif (${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME} STREQUAL "") + + set(TRIBITS_PRIVATE_ENABLE_DEP_PACKAGES_ENABLE_PACKAGE "") + + if ("${OPTREQ_IN}" STREQUAL "REQUIRED") -# LocalWords: tribits TriBITS foreach endmacro endfunction + #message("Always enable the upstream dependency if it is required") + + message("-- " "Setting ${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME}=ON" + " because ${PACKAGE_NAME} has a required dependence on ${DEP_PACKAGE_NAME}") + + set(TRIBITS_PRIVATE_ENABLE_DEP_PACKAGES_ENABLE_PACKAGE ON) + + elseif (${PACKAGE_NAME}_ENABLE_${DEP_PACKAGE_NAME}) + + # Enable the upstream package if the user directly specified the + # optional package enable regardless if it is PT or ST or even EX. + + message("-- " "Setting ${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME}=ON" + " because ${PACKAGE_NAME}_ENABLE_${DEP_PACKAGE_NAME}=ON") + + set(TRIBITS_PRIVATE_ENABLE_DEP_PACKAGES_ENABLE_PACKAGE ON) + + elseif (${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES) + + # Enable the package if there is an optional dependence and we are asked + # to enabled optional dependencies. + + tribits_implicit_package_enable_is_allowed(${PACKAGE_NAME} ${DEP_PACKAGE_NAME} + ALLOW_IMPLICIT_ENABLE) + if (ALLOW_IMPLICIT_ENABLE) + message("-- " "Setting ${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME}=ON" + " because ${PACKAGE_NAME} has an optional dependence on ${DEP_PACKAGE_NAME}") + set(TRIBITS_PRIVATE_ENABLE_DEP_PACKAGES_ENABLE_PACKAGE ON) + endif() + + endif() + + # Enable the upstream package + if (TRIBITS_PRIVATE_ENABLE_DEP_PACKAGES_ENABLE_PACKAGE) + assert_defined(${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME}) + set(${PROJECT_NAME}_ENABLE_${DEP_PACKAGE_NAME} ON) + endif() + + endif() + +endmacro() + + +macro(tribits_private_enable_dep_tpl PACKAGE_NAME DEP_TPL_NAME) + assert_defined(TPL_ENABLE_${DEP_TPL_NAME}) + if(TPL_ENABLE_${DEP_TPL_NAME} STREQUAL "") + message("-- " "Setting TPL_ENABLE_${DEP_TPL_NAME}=ON because" + " it is required by the enabled package ${PACKAGE_NAME}") + assert_defined(TPL_ENABLE_${DEP_TPL_NAME}) + set(TPL_ENABLE_${DEP_TPL_NAME} ON) + set(TPL_${DEP_TPL_NAME}_ENABLING_PKG ${PACKAGE_NAME}) + endif() +endmacro() + + +macro(tribits_private_enable_optional_dep_tpl PACKAGE_NAME DEP_TPL_NAME) + #assert_defined(${PACKAGE_NAME}_ENABLE_${DEP_TPL_NAME}) + if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} + AND ${PACKAGE_NAME}_ENABLE_${DEP_TPL_NAME} + AND TPL_ENABLE_${DEP_TPL_NAME} STREQUAL "" + ) + message("-- " "Setting TPL_ENABLE_${DEP_TPL_NAME}=ON because" + " ${PACKAGE_NAME}_ENABLE_${DEP_TPL_NAME}=ON") + assert_defined(TPL_ENABLE_${DEP_TPL_NAME}) + set(TPL_ENABLE_${DEP_TPL_NAME} ON) + endif() +endmacro() + + +# Macro that enables the optional TPLs for given package +# +macro(tribits_enable_optional_tpls PACKAGE_NAME) + + #message("TRIBITS_ENABLE_OPTIONAL_TPLS: ${PACKAGE_NAME}") + #message("-- " "${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}=${${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}}") + + assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + + if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + + foreach(DEP_TPL ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_TPLS}) + tribits_private_enable_optional_dep_tpl(${PACKAGE_NAME} ${DEP_TPL}) + endforeach() + + foreach(DEP_TPL ${${PACKAGE_NAME}_TEST_OPTIONAL_DEP_TPLS}) + tribits_private_enable_optional_dep_tpl(${PACKAGE_NAME} ${DEP_TPL}) + endforeach() + + endif() + +endmacro() + + +# Macro that enables upstream (required and optional) packages given package +# +# Here I have to enable the required packages too or the logic just does no +# work as expected. +# +macro(tribits_enable_upstream_packages PACKAGE_NAME) + + #message("TRIBITS_ENABLE_UPSTREAM_PACKAGES: ${PACKAGE_NAME}") + #message("-- " "${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}=${${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}}") + + assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + + if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + + foreach(DEP_PKG ${${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES}) + tribits_private_enable_dep_package(${PACKAGE_NAME} ${DEP_PKG} REQUIRED) + endforeach() + + foreach(DEP_PKG ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES}) + tribits_private_enable_dep_package(${PACKAGE_NAME} ${DEP_PKG} OPTIONAL) + endforeach() + + foreach(DEP_PKG ${${PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES}) + tribits_private_enable_dep_package(${PACKAGE_NAME} ${DEP_PKG} REQUIRED) + endforeach() + + foreach(DEP_PKG ${${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES}) + tribits_private_enable_dep_package(${PACKAGE_NAME} ${DEP_PKG} OPTIONAL) + endforeach() + + endif() + +endmacro() + + +# Macro that sets the required TPLs for given package +# +macro(tribits_enable_required_tpls PACKAGE_NAME) + + #message("PACKAGE_ARCH_ENABLE_REQUIRED_TPL_ENABLES: ${PACKAGE_NAME}") + #message("-- " "${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}=${${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}}") + + assert_defined(${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + + if (${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) + + foreach(DEP_TPL ${${PACKAGE_NAME}_LIB_REQUIRED_DEP_TPLS}) + tribits_private_enable_dep_tpl(${PACKAGE_NAME} ${DEP_TPL}) + endforeach() + + foreach(DEP_TPL ${${PACKAGE_NAME}_TEST_REQUIRED_DEP_TPLS}) + tribits_private_enable_dep_tpl(${PACKAGE_NAME} ${DEP_TPL}) + endforeach() + + endif() + +endmacro() + + +# @MACRO: tribits_adjust_package_enables() +# +# Usage: +# +# tribits_adjust_package_enables() +# +# Macro that adjusts all of the package enables from what the user input to +# the final set that will be used to enable packages. +# +macro(tribits_adjust_package_enables) + + if (${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES) + message("") + message("Setting to empty '' all enabled packages on request ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) + if (${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE}) + set_cache_on_off_empty(${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE} "" + "Forced to empty '' by ${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES=ON" FORCE) + set(${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE} "") + endif() + #print_var(${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE}) + # NOTE: Above, we don't want to set to empty those packages that have hard + # disables because this will mess up the logic in later invocations. + endforeach() + advanced_set(${PROJECT_NAME}_UNENABLE_ENABLED_PACKAGES OFF CACHE BOOL + "Forced to FALSE after use" FORCE) + endif() + + # + # A) Sweep forward through and apply all disables first! + # + + tribits_get_nondisabled_list( ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${PROJECT_NAME} + ${PROJECT_NAME}_NOTDISABLED_PACKAGES "") + + message("") + message("Disabling all packages that have a required dependency" + " on disabled TPLs and optional package TPL support based on TPL_ENABLE_=OFF ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_NOTDISABLED_PACKAGES}) + tribits_disable_package_if_tpl_disabled(${TRIBITS_PACKAGE}) + endforeach() + + message("") + message("Disabling subpackages for hard disables of parent packages" + " due to ${PROJECT_NAME}_ENABLE_=OFF ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) + tribits_disable_parents_subpackages(${TRIBITS_PACKAGE}) + endforeach() + + message("") + message("Disabling forward required packages and optional intra-package" + " support that have a dependency on disabled packages" + " ${PROJECT_NAME}_ENABLE_=OFF ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) + tribits_disable_forward_required_dep_packages(${TRIBITS_PACKAGE}) + endforeach() + + tribits_get_nondisabled_list( ${PROJECT_NAME}_NOTDISABLED_PACKAGES ${PROJECT_NAME} + ${PROJECT_NAME}_NOTDISABLED_PACKAGES "") + + set(${PROJECT_NAME}_REVERSE_NOTDISABLED_PACKAGES + "${${PROJECT_NAME}_NOTDISABLED_PACKAGES}") + list(REVERSE ${PROJECT_NAME}_REVERSE_NOTDISABLED_PACKAGES) + + # + # B) Apply all forward enables + # + + message("") + message("Enabling subpackages for hard enables of parent packages" + " due to ${PROJECT_NAME}_ENABLE_=ON ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_NOTDISABLED_PACKAGES}) + tribits_enable_parents_subpackages(${TRIBITS_PACKAGE}) + endforeach() + + if (${PROJECT_NAME}_ENABLE_ALL_PACKAGES) + message("") + message("Enabling all packages that are not currently disabled because of" + " ${PROJECT_NAME}_ENABLE_ALL_PACKAGES=ON" + " (${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE=${${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE})" + " ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_NOTDISABLED_PACKAGES}) + tribits_apply_all_package_enables(${TRIBITS_PACKAGE}) + endforeach() + endif() + + if (${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES) + message("") + message("Sweep forward enabling all forward library dependent packages because" + " ${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES=ON ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_NOTDISABLED_PACKAGES}) + tribits_enable_forward_lib_package_enables(${TRIBITS_PACKAGE}) + endforeach() + message("") + message("Sweep backward enabling all forward test dependent packages because" + " ${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES=ON ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_REVERSE_NOTDISABLED_PACKAGES}) + tribits_enable_forward_test_package_enables(${TRIBITS_PACKAGE}) + endforeach() + # NOTE: Above, we want to sweep backward to enable test-dependent packages + # because we don't want to enable package Z just because package Y was enabled + # because it had a test-only dependency on package X. Sweeping backwards through + # the packages makes sure this does not happen. + set(${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES ON) + endif() + + tribits_get_enabled_list( ${PROJECT_NAME}_NOTDISABLED_PACKAGES ${PROJECT_NAME} + ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES "") + + # + # C) Disable and enable tests for currently enabled packages + # + + message("") + message("Disabling subpackage tests/examples based on parent package tests/examples disables ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES}) + tribits_apply_package_examples_disable(${TRIBITS_PACKAGE} TESTS) + tribits_apply_subpackage_tests_or_examples_disables(${TRIBITS_PACKAGE} TESTS) + tribits_apply_subpackage_tests_or_examples_disables(${TRIBITS_PACKAGE} EXAMPLES) + endforeach() + + if (${PROJECT_NAME}_ENABLE_TESTS OR ${PROJECT_NAME}_ENABLE_EXAMPLES) + message("") + message("Enabling all tests and/or examples that have not been" + " explicitly disabled because ${PROJECT_NAME}_ENABLE_[TESTS,EXAMPLES]=ON ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) + tribits_apply_test_example_enables(${TRIBITS_PACKAGE}) + endforeach() + endif() + # NOTE: Above, we enable tests and examples here, before the remaining required + # packages so that we don't enable tests that don't need to be enabled based + # on the use of the option ${PROJECT_NAME}_ENABLE_ALL_FORWARD_DEP_PACKAGES. + + message("") + message("Enabling subpackage tests/examples based on parent package tests/examples enables ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES}) + tribits_apply_subpackage_tests_examples_enables(${TRIBITS_PACKAGE}) + endforeach() + # NOTE: We want to apply this logic here instead of later after the backward + # sweep of package enables because we don't want to enable the + # tests/examples for a subpackage if it is not needed based on set of + # requested subpackages and packages to be enabled and the optional forward + # sweep of downstream packages. + + # + # D) Sweep backwards and enable upstream required and optional packages + # + + if (${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES) + set(EXTRA_MSG_STR " (and optional since ${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES=ON)") + else() + set(EXTRA_MSG_STR "") + endif() + + message("") + message("Enabling all required${EXTRA_MSG_STR} upstream packages for current set of" + " enabled packages" + " (${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE=${${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE})" + " ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_REVERSE_NOTDISABLED_PACKAGES}) + tribits_enable_upstream_packages(${TRIBITS_PACKAGE}) + endforeach() + # NOTE: Above, we have to loop through the packages backward to enable all + # the packages that feed into these packages. This has to include *all* + # upstream package enables including required packages, optional packages + # (when ${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES), and packages + + tribits_get_enabled_list( ${PROJECT_NAME}_NOTDISABLED_PACKAGES ${PROJECT_NAME} + ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES "") + + message("") + message("Enabling all optional intra-package enables _ENABLE_" + " that are not currently disabled if both sets of packages are enabled ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) + tribits_postprocess_optional_package_enables(${TRIBITS_PACKAGE}) + endforeach() + + # + # E) Enable TPLs + # + + message("") + message("Enabling all remaining required TPLs for current set of" + " enabled packages ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) + tribits_enable_required_tpls(${TRIBITS_PACKAGE}) + endforeach() + + message("") + message("Enabling all optional package TPL support" + " _ENABLE_ not currently disabled for" + " enabled TPLs ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) + tribits_postprocess_optional_tpl_enables(${TRIBITS_PACKAGE}) + endforeach() + + message("") + message("Enabling TPLs based on _ENABLE_=ON if TPL is not explicitly disabled ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) + tribits_enable_optional_tpls(${TRIBITS_PACKAGE}) + endforeach() + # NOTE: We need to do this after the above optional package TPL support + # logic so that the TPL will be turned on for this package only as requested + # in bug 4298. + + # + # F) Set user cache variables for current set of enabled packages + # + + message("") + message("Set cache entries for optional packages/TPLs and tests/examples for packages actually enabled ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) + tribits_set_up_optional_package_enables_and_cache_vars(${TRIBITS_PACKAGE}) + endforeach() + + # + # G) Turn on parent packages where at least one subpackage has been enabled + # + + message("") + message("Enabling the shell of non-enabled parent packages (mostly for show) that have at least one subpackage enabled ...") + message("") + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES}) + tribits_postprocess_package_with_subpackages_enables(${TRIBITS_PACKAGE}) + endforeach() + # NOTE: The above ensures that loops involving the parent package will + # process the parent package but doing this last ensures that no downstream + # dependencies will be enabled. + + tribits_set_up_enabled_lists_and_pkg_idx() + + # + # H) Set up flat list of direct external and inner package dependencies (even + # for non-enabled packages) and enabled package dependencies for enabled + # packages + # + + foreach(externalPkgName ${${PROJECT_NAME}_DEFINED_TPLS}) + tribits_extpkg_setup_enabled_dependencies(${externalPkgName}) + # ToDo: Assert that all of the listed dependencies in + # ${externalPkgName}_LIB_ENABLED_DEPENDENCIES exist and are upstream from + # ${externalPkgName} + endforeach() + + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) + tribits_setup_direct_package_dependencies_lists_and_lib_required_enable_vars( + ${TRIBITS_PACKAGE}) + endforeach() + + if (${PROJECT_NAME}_DUMP_PACKAGE_DEPENDENCIES) + message("\nDumping direct dependencies for each package ...") + foreach(tribitsPkg IN LISTS ${PROJECT_NAME}_DEFINED_TPLS + ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES + ) + tribits_print_direct_package_dependencies_lists(${tribitsPkg}) + endforeach() + endif() + +endmacro() + + +# Function that sets up the full package dependencies for each enabled package +# including all of its indirect upstream package dependencies. +# +# This is needed in several different parts of the TriBITS implementation. +# +# ToDo: #63: Remove this function since we should not need a full list of +# direct and indirect package dependencies! +# +function(tribits_package_set_full_enabled_dep_packages PACKAGE_NAME) + + set(PACKAGE_FULL_DEPS_LIST "") + + foreach(DEP_PKG ${${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES}) + if (${PROJECT_NAME}_ENABLE_${DEP_PKG}) + list(APPEND PACKAGE_FULL_DEPS_LIST ${DEP_PKG}) + endif() + # NOTE: This if() should not be needed but this is a safeguard + endforeach() + + foreach(DEP_PKG ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES}) + if (${PACKAGE_NAME}_ENABLE_${DEP_PKG}) + list(APPEND PACKAGE_FULL_DEPS_LIST ${DEP_PKG}) + endif() + endforeach() + + if(PACKAGE_FULL_DEPS_LIST) + list(REMOVE_DUPLICATES PACKAGE_FULL_DEPS_LIST) + + foreach(DEP_PACKAGE ${PACKAGE_FULL_DEPS_LIST}) + list(APPEND PACKAGE_FULL_DEPS_LIST ${${DEP_PACKAGE}_FULL_ENABLED_DEP_PACKAGES}) + endforeach() + + list(REMOVE_DUPLICATES PACKAGE_FULL_DEPS_LIST) + endif() + + set(ORDERED_PACKAGE_FULL_DEPS_LIST "") + + foreach(DEP_PACKAGE ${PACKAGE_FULL_DEPS_LIST}) + + #print_var(${DEP_PACKAGE}_PKG_IDX) + set(DEP_PACKAGE_VALUE ${${DEP_PACKAGE}_PKG_IDX}) + + set(SORTED_INDEX 0) + set(INSERTED_DEP_PACKAGE FALSE) + + foreach(SORTED_PACKAGE ${ORDERED_PACKAGE_FULL_DEPS_LIST}) + + #print_var(${SORTED_PACKAGE}_PKG_IDX) + set(SORTED_PACKAGE_VALUE ${${SORTED_PACKAGE}_PKG_IDX}) + + if (${DEP_PACKAGE_VALUE} GREATER ${SORTED_PACKAGE_VALUE}) + list(INSERT ORDERED_PACKAGE_FULL_DEPS_LIST ${SORTED_INDEX} ${DEP_PACKAGE}) + set(INSERTED_DEP_PACKAGE TRUE) + break() + endif() + + math(EXPR SORTED_INDEX ${SORTED_INDEX}+1) + + endforeach() + + if(NOT INSERTED_DEP_PACKAGE) + list(APPEND ORDERED_PACKAGE_FULL_DEPS_LIST ${DEP_PACKAGE}) + endif() + + endforeach() + + global_set(${PACKAGE_NAME}_FULL_ENABLED_DEP_PACKAGES + ${ORDERED_PACKAGE_FULL_DEPS_LIST}) + + if (${PROJECT_NAME}_VERBOSE_CONFIGURE) + print_var(${PACKAGE_NAME}_FULL_ENABLED_DEP_PACKAGES) + endif() + +endfunction() + + +# Function that creates enable-only dependency data-structures +# +# ToDo: #63: Remove this function since we should not need a full list of +# direct and indirect package dependencies! +# +function(tribits_set_up_enabled_only_dependencies) + + set(GENERATE_EXPORT_DEPENDENCIES ${${PROJECT_NAME}_GENERATE_EXPORT_FILE_DEPENDENCIES}) + set(lastExportTribitsPackage) + + if ("${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES}" STREQUAL "" + AND NOT + "${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES}" STREQUAL "" + ) + message(DEPRECATION + "WARNING! The cache var" + " ${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES" + "='${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES}'" + " is deprecated! Please instead set" + " ${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES" + "='${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES}'") + set(${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES + ${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES} ) + endif() + + if (GENERATE_EXPORT_DEPENDENCIES + AND ${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES + ) + # Find the last enabled package for which an export file is requested. + set(LAST_PKG_IDX -1) + set(LAST_PKG) + foreach(tribitsPkg ${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES}) + #print_var(tribitsPkg) + set(PKG_IDX ${${tribitsPkg}_PKG_IDX}) + #print_var(PKG_IDX) + if (PKG_IDX) + # The listed package is enabled so we will consider it + if (PKG_IDX GREATER ${LAST_PKG_IDX}) + set(LAST_PKG_IDX ${PKG_IDX}) + set(LAST_PKG ${tribitsPkg}) + #print_var(LAST_PKG_IDX) + #print_var(LAST_PKG) + endif() + endif() + endforeach() + if (LAST_PKG) + # At least one listed package was enabled + set(lastExportTribitsPackage ${LAST_PKG}) + else() + # None of the listed packages were enabled so don't bother generating + # any export dependencies + set(GENERATE_EXPORT_DEPENDENCIES FALSE) + endif() + + endif() + + if (GENERATE_EXPORT_DEPENDENCIES) + + if (lastExportTribitsPackage) + message("\nSetting up export dependencies up through ${lastExportTribitsPackage} ...\n") + else() + message("\nSetting up export dependencies for all enabled packages ...\n") + endif() + + foreach(tribitsPackage ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) + tribits_package_set_full_enabled_dep_packages(${tribitsPackage}) + if (${PROJECT_NAME}_DUMP_PACKAGE_DEPENDENCIES) + set(PRINTED_VAR FALSE) + print_nonempty_var_with_spaces(${tribitsPackage}_FULL_ENABLED_DEP_PACKAGES + PRINTED_VAR) + if (NOT PRINTED_VAR) + message("-- ${tribitsPackage}: No library dependencies!") + endif() + endif() + if ("${lastExportTribitsPackage}" STREQUAL ${tribitsPackage}) + break() + endif() + endforeach() + + endif() + +endfunction() diff --git a/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake b/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake index fd4adb86a9f8..2d041a2ca424 100644 --- a/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake +++ b/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake @@ -166,9 +166,8 @@ endfunction() # @FUNCTION: tribits_extpkg_write_config_file_str() # -# Create the text string for a ``Config.cmake`` file given the list -# of include directories and libraries for an external package/TPL from the -# legacy TriBITS TPL specification. +# Create the text string for a ``Config.cmake`` file given the list of +# include directories and libraries for an external package/TPL. # # Usage:: # @@ -195,11 +194,9 @@ endfunction() # packages listed in ``_LIB_ENABLED_DEPENDENCIES``. # # The arguments in ``TPL__LIBRARIES`` are handled in special ways in -# order to create the namespaced IMPORTED targets -# ``tribits::::`` and the ``::all_libs`` target -# that depends on these. -# -# The types of arguments that are handled and how the are interpreted: +# order to create the namespaced IMPORTED targets ``::`` and +# the ``::all_libs`` target that depends on these. The types of +# arguments that are handled and how the are interpreted: # # ``/[lib].`` # @@ -207,13 +204,13 @@ endfunction() # imported target name ```` is derived from the file name (of the # form ``lib.`` removing beginning ``lib`` and file # extension ``.``). The IMPORTED target -# ``tribits::::`` is created and the file path is set -# using the ``IMPORTED_LOCATION`` target property. +# ``::`` is created and the file path is set using the +# ``IMPORTED_LOCATION`` target property. # # ``-l`` # # Arguments of the form ``-l`` are used to create IMPORTED -# targets with the name ``tribits::::`` using the +# targets with the name ``::`` using the # ``IMPORTED_LIBNAME`` target property. # # ```` @@ -251,20 +248,6 @@ endfunction() # ``_LIB_ENABLED_DEPENDENCIES``, a link dependency is created using # ``target_link_library(::all_libs INTERFACE )``. # -# NOTE: The IMPORTED targets generated for each library argument -# ``::`` are prefixed with ``tribits::`` to give -# ``tribits::::``. This is to avoid clashing with IMPORTED -# targets ``::`` from other package config files -# ``Config.cmake`` or find modules ``Find.cmake`` that may -# clash (see TriBITSPub/TriBITS#548). But the generated INTERFACE IMPORTED -# target ``::all_libs`` is **not** namespaced with ``tribits::`` -# since the ``all_libs`` target is unlikely to clash. The targets -# ``tribits::::`` are not directly used in downstream -# ``target_link_library()`` calls so the names of these targets are really -# just an implementation detail. (The reason we give these a name based of -# the library name they represent ```` is to make it more clear what -# the matching library is and to make the name unique.) -# function(tribits_extpkg_write_config_file_str tplName tplConfigFileStrOut) # A) Set up beginning of config file text @@ -546,14 +529,14 @@ function(tribits_extpkg_process_libraries_list_library_entry tribits_extpkg_get_libname_and_path_from_libentry( "${libentry}" ${libEntryType} libname libpath) # Create IMPORTED library target - set(prefixed_libname "tribits::${tplName}::${libname}") + set(prefixed_libname "${tplName}::${libname}") if (NOT (prefixed_libname IN_LIST libTargets)) tribits_extpkg_append_add_library_str (${libname} ${prefixed_libname} ${libEntryType} "${libpath}" configFileStr) if (lastLibProcessed) string(APPEND configFileStr "target_link_libraries(${prefixed_libname}\n" - " INTERFACE tribits::${tplName}::${lastLibProcessed})\n" + " INTERFACE ${tplName}::${lastLibProcessed})\n" ) else() tribits_extpkg_append_upstream_target_link_libraries_str( ${tplName} @@ -570,11 +553,10 @@ function(tribits_extpkg_process_libraries_list_library_entry set(${lastLibProcessedInOut} ${lastLibProcessed} PARENT_SCOPE) set(${configFileStrInOut} ${configFileStr} PARENT_SCOPE) endfunction() -# NOTE: Above, we only need to link the first library -# tribits:::: against the upstream TPL libraries -# ::all_libs. The other imported targets -# tribits:::: for this TPL are linked to this first -# tribits:::: which has the needed dependencies. +# NOTE: Above, we only need to link the first library :: +# against the upstream TPL libraries ::all_libs. The other +# imported targets :: for this TPL are linked to this first +# :: which has the needed dependencies. function(tribits_extpkg_get_libname_and_path_from_libentry diff --git a/cmake/tribits/core/package_arch/TribitsGeneralMacros.cmake b/cmake/tribits/core/package_arch/TribitsGeneralMacros.cmake index 0dc079655a34..9fc85539061e 100644 --- a/cmake/tribits/core/package_arch/TribitsGeneralMacros.cmake +++ b/cmake/tribits/core/package_arch/TribitsGeneralMacros.cmake @@ -42,8 +42,6 @@ include(AssertDefined) include(MessageWrapper) include(TribitsParseArgumentsHelpers) include(TribitsSortListAccordingToMasterList) -include(TribitsDeprecatedHelpers) -include(TribitsGetPackageEnableStatus) # Optionally start CMake code configure timing @@ -145,6 +143,165 @@ function(tribits_set_base_repo_dir BASE_DIR REPO_DIR BASE_REPO_DIR_OUT) endfunction() +# Get the list of explicitly enabled entries +# +# These is the list of entries in ${LISTVAR} for which: +# +# if (${ENABLED_PREFIX}_ENABLE_{ENTRY}) +# +# evaluates to true. +# +function(tribits_get_enabled_list LISTVAR ENABLED_PREFIX + ENABLED_LIST_OUT_OUT NUM_ENABLED_OUT_OUT + ) + set(ENABLED_LIST_OUT) + foreach(ENTITY ${${LISTVAR}}) + set(ENTITY_NAME ${ENABLED_PREFIX}_ENABLE_${ENTITY}) + assert_defined(${ENTITY_NAME}) + set(INCLUDE_ENTITY FALSE) + if (${ENTITY_NAME}) + list(APPEND ENABLED_LIST_OUT ${ENTITY}) + endif() + endforeach() + list(LENGTH ENABLED_LIST_OUT NUM_ENABLED_OUT) + set(${ENABLED_LIST_OUT_OUT} ${ENABLED_LIST_OUT} PARENT_SCOPE) + if (NUM_ENABLED_OUT_OUT) + set(${NUM_ENABLED_OUT_OUT} ${NUM_ENABLED_OUT} PARENT_SCOPE) + endif() +endfunction() + + +# Get the list non-disabled entries +# +# These is the list of entries in ${LISTVAR} for which: +# +# if ( +# (${ENABLED_PREFIX}_ENABLE_{ENTRY}) +# OR +# (${ENABLED_PREFIX}_ENABLE_{ENTRY} STREQUAL "" ) +# ) +# +# evaluates to true. +# +function(tribits_get_nondisabled_list LISTVAR ENABLED_PREFIX + NONDISABLED_LIST_OUT_OUT NUM_NONDISABLED_OUT_OUT + ) + set(NONDISABLED_LIST_OUT) + foreach(ENTITY ${${LISTVAR}}) + set(ENTITY_NAME ${ENABLED_PREFIX}_ENABLE_${ENTITY}) + assert_defined(${ENTITY_NAME}) + set(INCLUDE_ENTITY FALSE) + if (${ENTITY_NAME} OR ${ENTITY_NAME} STREQUAL "") + list(APPEND NONDISABLED_LIST_OUT ${ENTITY}) + endif() + endforeach() + list(LENGTH NONDISABLED_LIST_OUT NUM_NONDISABLED_OUT) + set(${NONDISABLED_LIST_OUT_OUT} ${NONDISABLED_LIST_OUT} PARENT_SCOPE) + if (NUM_NONDISABLED_OUT_OUT) + set(${NUM_NONDISABLED_OUT_OUT} ${NUM_NONDISABLED_OUT} PARENT_SCOPE) + endif() +endfunction() + + +# Get the list of explicitly disabled entries +# +# These is the list of entries in ${LISTVAR} for which: +# +# if ( +# (NOT ${ENABLED_PREFIX}_ENABLE_{ENTRY}) +# AND +# (NOT ${ENABLED_PREFIX}_ENABLE_{ENTRY} STREQUAL "" ) +# ) +# +# evaluates to true. +# +function(tribits_get_disabled_list LISTVAR ENABLED_PREFIX + DISABLED_LIST_OUT_OUT NUM_DISABLED_OUT_OUT + ) + set(DISABLED_LIST_OUT) + foreach(ENTITY ${${LISTVAR}}) + set(ENTITY_NAME ${ENABLED_PREFIX}_ENABLE_${ENTITY}) + assert_defined(${ENTITY_NAME}) + set(INCLUDE_ENTITY FALSE) + if ( (NOT ${ENTITY_NAME}) AND (NOT ${ENTITY_NAME} STREQUAL "") ) + list(APPEND DISABLED_LIST_OUT ${ENTITY}) + endif() + endforeach() + list(LENGTH DISABLED_LIST_OUT NUM_DISABLED_OUT) + set(${DISABLED_LIST_OUT_OUT} ${DISABLED_LIST_OUT} PARENT_SCOPE) + if (NUM_DISABLED_OUT_OUT) + set(${NUM_DISABLED_OUT_OUT} ${NUM_DISABLED_OUT} PARENT_SCOPE) + endif() +endfunction() + + +# Get the list of non-enabled entries +# +# These is the list of entries in ${LISTVAR} for which: +# +# if (NOT ${ENABLED_PREFIX}_ENABLE_{ENTRY}) +# +# evaluates to true. +# +function(tribits_get_nonenabled_list LISTVAR ENABLED_PREFIX + NONENABLED_LIST_OUT_OUT NUM_NONENABLED_OUT_OUT + ) + set(NONENABLED_LIST_OUT) + foreach(ENTITY ${${LISTVAR}}) + set(ENTITY_NAME ${ENABLED_PREFIX}_ENABLE_${ENTITY}) + assert_defined(${ENTITY_NAME}) + set(INCLUDE_ENTITY FALSE) + if (NOT ${ENTITY_NAME}) # Note that empty "" is also false! + list(APPEND NONENABLED_LIST_OUT ${ENTITY}) + endif() + endforeach() + list(LENGTH NONENABLED_LIST_OUT NUM_NONENABLED_OUT) + set(${NONENABLED_LIST_OUT_OUT} ${NONENABLED_LIST_OUT} PARENT_SCOPE) + if (NUM_NONENABLED_OUT_OUT) + set(${NUM_NONENABLED_OUT_OUT} ${NUM_NONENABLED_OUT} PARENT_SCOPE) + endif() +endfunction() + + +# Macro that sets up the basic lists of enabled packages and packages. +# +macro(tribits_set_up_enabled_lists_and_pkg_idx) + + # ${PROJECT_NAME}_ENABLED_PACKAGES + tribits_get_enabled_list( + ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES ${PROJECT_NAME} + ${PROJECT_NAME}_ENABLED_INTERNAL_TOPLEVEL_PACKAGES + ${PROJECT_NAME}_NUM_ENABLED_INTERNAL_TOPLEVEL_PACKAGES) + + # ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES + tribits_get_enabled_list( ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${PROJECT_NAME} + ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES + ${PROJECT_NAME}_NUM_ENABLED_INTERNAL_PACKAGES) + + # ${PROJECT_NAME}_REVERSE_ENABLED_INTERNAL_PACKAGES + set(${PROJECT_NAME}_REVERSE_ENABLED_INTERNAL_PACKAGES + "${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}") + list(REVERSE ${PROJECT_NAME}_REVERSE_ENABLED_INTERNAL_PACKAGES) + + # ${PACKAGE_NAME}_PKG_IDX + set(PKG_IDX 0) + foreach(tribitsPackage ${${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES}) + set(${tribitsPackage}_PKG_IDX ${PKG_IDX}) + math(EXPR PKG_IDX "${PKG_IDX} + 1") + endforeach() + + # ${PROJECT_NAME}_ENABLED_TPLS + tribits_get_enabled_list( ${PROJECT_NAME}_DEFINED_TPLS TPL + ${PROJECT_NAME}_ENABLED_TPLS ${PROJECT_NAME}_NUM_ENABLED_TPLS) + + # ${PROJECT_NAME}_REVERSE_ENABLED_TPLS + set(${PROJECT_NAME}_REVERSE_ENABLED_TPLS + "${${PROJECT_NAME}_ENABLED_TPLS}") + list(REVERSE ${PROJECT_NAME}_REVERSE_ENABLED_TPLS) + +endmacro() + + # @FUNCTION: tribits_set_st_for_dev_mode() # # Function that allows packages to easily make a feature ``ST`` for @@ -180,12 +337,47 @@ endfunction() # For backward compatibility macro(tribits_set_ss_for_dev_mode OUTPUT_VAR) - tribits_deprecated_command(tribits_set_ss_for_dev_mode - MESSAGE "Use tribits_set_st_for_dev_mode() instead.") + message(WARNING + "WARNING: tribits_set_ss_for_dev_mode() is deprecated," + " use tribits_set_st_for_dev_mode() instead!") tribits_set_st_for_dev_mode(${OUTPUT_VAR}) endmacro() +# Function that extracts all of the required and optional +# items for a given class of package lists +# +function( tribits_gather_enabled_items PACKAGE_NAME LISTTYPE_PREFIX + LISTTYPE_POSTFIX GATHERED_ITEMS_LIST_OUT + ) + + #message("TRIBITS_GATHER_ENABLED_ITEMS: '${PACKAGE_NAME}' '${LISTTYPE_PREFIX}'" + # " '${LISTTYPE_POSTFIX}' '${GATHERED_ITEMS_LIST_OUT}'") + + set(GATHERED_ITEMS_LIST_TMP + ${${PACKAGE_NAME}_${LISTTYPE_PREFIX}_REQUIRED_DEP_${LISTTYPE_POSTFIX}} + ) + + #message("TRIBITS_GATHER_ENABLED_ITEMS:" + # " ${PACKAGE_NAME}_${LISTTYPE_PREFIX}_REQUIRED_DEP_${LISTTYPE_POSTFIX} = ${GATHERED_ITEMS_LIST_TMP}") + + foreach(ITEM + ${${PACKAGE_NAME}_${LISTTYPE_PREFIX}_OPTIONAL_DEP_${LISTTYPE_POSTFIX}} + ) + assert_defined(${PACKAGE_NAME}_ENABLE_${ITEM}) + if (${PACKAGE_NAME}_ENABLE_${ITEM}) + append_set(GATHERED_ITEMS_LIST_TMP ${ITEM}) + endif() + endforeach() + + #message("TRIBITS_GATHER_ENABLED_ITEMS:" + # " ${GATHERED_ITEMS_LIST_OUT} = ${GATHERED_ITEMS_LIST_TMP}") + + set(${GATHERED_ITEMS_LIST_OUT} ${GATHERED_ITEMS_LIST_TMP} PARENT_SCOPE) + +endfunction() + + # @FUNCTION: tribits_trace_file_processing() # # Print trace of file processing when diff --git a/cmake/tribits/core/package_arch/TribitsGetEnabledSublists.cmake b/cmake/tribits/core/package_arch/TribitsGetEnabledSublists.cmake deleted file mode 100644 index 0444ba3dde25..000000000000 --- a/cmake/tribits/core/package_arch/TribitsGetEnabledSublists.cmake +++ /dev/null @@ -1,163 +0,0 @@ -# @HEADER -# ************************************************************************ -# -# TriBITS: Tribal Build, Integrate, and Test System -# Copyright 2013 Sandia Corporation -# -# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -# the U.S. Government retains certain rights in this software. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the Corporation nor the names of the -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# ************************************************************************ -# @HEADER - -include(TribitsGetPackageEnableStatus) - - -# @FUNCTION: tribits_get_sublist_enabled() -# -# Get sub-list of enabled packages -# -# Usage:: -# -# tribits_get_sublist_enabled( -# ) -# -# On output, ```` contains the sublist of entries in -# ```` which evaluate to ``TRUE`` in an ``if ()`` statement. -# -function(tribits_get_sublist_enabled enableListName - enabledSublistNameOut numEnabledVarOut - ) - set(enabledSublist) - foreach(pkgName IN LISTS ${enableListName}) - tribits_get_package_enable_status(${pkgName} enableVal "") - if (enableVal) - list(APPEND enabledSublist ${pkgName}) - endif() - endforeach() - list(LENGTH enabledSublist numEnabled) - set(${enabledSublistNameOut} ${enabledSublist} PARENT_SCOPE) - if (numEnabledVarOut) - set(${numEnabledVarOut} ${numEnabled} PARENT_SCOPE) - endif() -endfunction() - - -# @FUNCTION: tribits_get_sublist_nondisabled() -# -# Get sub-list of non-disabled packages -# -# Usage:: -# -# tribits_get_sublist_nondisabled( -# ) -# -# On output, ```` contains the sublist of entries from -# ```` for which evaluate to ``TRUE`` or empty ``""`` in an -# ``if ()`` statement. -# -function(tribits_get_sublist_nondisabled enableListName - nondisabledListNameOut numNondisabledVarOut - ) - set(nondisabledList "") - foreach(pkgName IN LISTS ${enableListName}) - tribits_get_package_enable_status(${pkgName} enableVal "") - if (enableVal OR "${enableVal}" STREQUAL "") - list(APPEND nondisabledList ${pkgName}) - endif() - endforeach() - list(LENGTH nondisabledList numNondisabled) - set(${nondisabledListNameOut} ${nondisabledList} PARENT_SCOPE) - if (numNondisabledVarOut) - set(${numNondisabledVarOut} ${numNondisabled} PARENT_SCOPE) - endif() -endfunction() - - -# @FUNCTION: tribits_get_sublist_disabled() -# -# Get sub-list of disabled packages -# -# Usage:: -# -# tribits_get_sublist_disabled( -# ) -# -# On output, ```` contains the sublist of entries -# ```` which evaluate to ``FALSE`` and is not empty ``""`` in -# an ``if ()`` statement. -# -function(tribits_get_sublist_disabled enableListName - disabledSublistNameOut numDisabledVarOut - ) - set(disabledSublist "") - foreach(pkgName IN LISTS ${enableListName}) - tribits_get_package_enable_status(${pkgName} enableVal "") - if ((NOT enableVal) AND (NOT "${enableVal}" STREQUAL "")) - list(APPEND disabledSublist ${pkgName}) - endif() - endforeach() - list(LENGTH disabledSublist numDisabled) - set(${disabledSublistNameOut} ${disabledSublist} PARENT_SCOPE) - if (numDisabledVarOut) - set(${numDisabledVarOut} ${numDisabled} PARENT_SCOPE) - endif() -endfunction() - - -# @FUNCTION: tribits_get_sublist_nonenabled() -# -# Get sub-list of non-enabled entries -# -# Usage:: -# -# tribits_get_sublist_nonenabled( -# ) -# -# On output, ```` contains the subset of entries in -# ```` that evaluate to ``FALSE`` (which can also be empty -# ``""``) in an ``if ()`` statement. -# -function(tribits_get_sublist_nonenabled enableListName - nonenabledListNameOut numNonenabledVarOut - ) - set(nonenabledList "") - foreach(pkgName IN LISTS ${enableListName}) - tribits_get_package_enable_status(${pkgName} enableVal "") - if (NOT enableVal) - list(APPEND nonenabledList ${pkgName}) - endif() - endforeach() - list(LENGTH nonenabledList numNonenabled) - set(${nonenabledListNameOut} ${nonenabledList} PARENT_SCOPE) - if (numNonenabledVarOut) - set(${numNonenabledVarOut} ${numNonenabled} PARENT_SCOPE) - endif() -endfunction() diff --git a/cmake/tribits/core/package_arch/TribitsGetPackageEnableStatus.cmake b/cmake/tribits/core/package_arch/TribitsGetPackageEnableStatus.cmake deleted file mode 100644 index 3fac736a78cc..000000000000 --- a/cmake/tribits/core/package_arch/TribitsGetPackageEnableStatus.cmake +++ /dev/null @@ -1,134 +0,0 @@ -# @HEADER -# ************************************************************************ -# -# TriBITS: Tribal Build, Integrate, and Test System -# Copyright 2013 Sandia Corporation -# -# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -# the U.S. Government retains certain rights in this software. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the Corporation nor the names of the -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# ************************************************************************ -# @HEADER - - -# @FUNCTION: tribits_get_package_enable_status() -# -# Function that determines if a given external or internal package's enable -# status (e.g. 'ON' or 'OFF') -# -# Usage:: -# -# tribits_get_package_enable_status( -# ) -# -# On return, if non-empty, the variable ```` will contain -# the actual value of ``${${PROJECT_NAME}_ENABLE_}`` or -# ``${TPL_ENABLE_}`` or will return empty "". If -# ``${packageName}_PACKAGE_BUILD_STATUS == "INTERNAL", then only the value of -# ``${PROJECT_NAME}_ENABLE_`` will be considered. -# -# On return, if non-empty, the variable ```` will be -# either ``${${PROJECT_NAME}_ENABLE_}`` or -# ``${TPL_ENABLE_}``, depending on which one is used to obtain -# the value ````. -# -# This works for both external packages/TPLs and internal packages. -# -function(tribits_get_package_enable_status packageName packageEnableOut - packageEnableVarNameOut - ) - tribits_get_package_enable_status_assert_args("${packageName}" - "${packageEnableOut}" "${packageEnableVarNameOut}") - tribits_assert_package_enable_status(${packageName}) - # Determine which variable, if any, to extract enable status from - set(packageEnableVarName "") - if (${packageName}_PACKAGE_BUILD_STATUS STREQUAL "INTERNAL") - set(packageEnableVarName ${PROJECT_NAME}_ENABLE_${packageName}) - elseif (${packageName}_PACKAGE_BUILD_STATUS STREQUAL "EXTERNAL") - if (NOT "${TPL_ENABLE_${packageName}}" STREQUAL "") - set(packageEnableVarName TPL_ENABLE_${packageName}) - elseif (NOT "${${PROJECT_NAME}_ENABLE_${packageName}}" STREQUAL "") - set(packageEnableVarName ${PROJECT_NAME}_ENABLE_${packageName}) - else() - # If neither is set, select the default var TPL name - set(packageEnableVarName TPL_ENABLE_${packageName}) - endif() - endif() - if (packageEnableVarName) - set(packageEnable ${${packageEnableVarName}}) - else() - set(packageEnable "") - endif() - # Set output args - if (packageEnableOut) - set(${packageEnableOut} ${packageEnable} PARENT_SCOPE) - endif() - if (packageEnableVarNameOut) - set(${packageEnableVarNameOut} ${packageEnableVarName} PARENT_SCOPE) - endif() -endfunction() - - -# @FUNCTION: tribits_assert_package_enable_status() -# -# Function that asserts that if both ``${PROJECT_NAME}_ENABLE_${packageName}`` -# and ``TPL_ENABLE_${packageName}`` are both set to non-empty, then they must -# be the same value or this is an error. -# -# Usage:: -# -# tribits_assert_package_enable_status() -# -function(tribits_assert_package_enable_status packageName) - if ( (NOT "${${PROJECT_NAME}_ENABLE_${packageName}}" STREQUAL "") - AND (NOT "${TPL_ENABLE_${packageName}}" STREQUAL "") - AND (NOT "${${PROJECT_NAME}_ENABLE_${packageName}}" STREQUAL - "${TPL_ENABLE_${packageName}}") - ) - message(SEND_ERROR "Error, ${PROJECT_NAME}_ENABLE_${packageName}=" - "'${${PROJECT_NAME}_ENABLE_${packageName}}' !=" - " TPL_ENABLE_${packageName} = '${TPL_ENABLE_${packageName}}'") - endif() -endfunction() -# ToDo: Create a cache var for the mode of message() above in case the user -# wants to disable the warning. - - -function(tribits_get_package_enable_status_assert_args packageName packageEnableOut - packageEnableVarNameOut - ) - if ("${packageName}" STREQUAL "") - message(FATAL_ERROR "Error, packageName='' is not allowed!") - endif() - if ("${packageEnableOut}" STREQUAL "" AND "${packageEnableVarNameOut}" STREQUAL "") - message(FATAL_ERROR "Error, both packageEnableOut='' and" - " packageEnableVarNameOut='' is not allowed!") - endif() -endfunction() diff --git a/cmake/tribits/core/package_arch/TribitsGlobalMacros.cmake b/cmake/tribits/core/package_arch/TribitsGlobalMacros.cmake index 7f452f338b7a..ac994b29a2e9 100644 --- a/cmake/tribits/core/package_arch/TribitsGlobalMacros.cmake +++ b/cmake/tribits/core/package_arch/TribitsGlobalMacros.cmake @@ -51,11 +51,9 @@ include(TribitsReportInvalidTribitsUsage) include(TribitsReadAllProjectDepsFilesCreateDepsGraph) include(TribitsAdjustPackageEnables) include(TribitsGitRepoVersionInfo) -include(TribitsSetUpEnabledOnlyDependencies) # Standard TriBITS utilities includes include(TribitsAddOptionAndDefine) -include(TribitsAddEnumCacheVar) include(AdvancedOption) include(AdvancedSet) include(AppendStringVar) @@ -71,7 +69,6 @@ include(Split) include(TimingUtils) include(SetDefaultAndFromEnv) # Used by some call-back files include(TribitsFilepathHelpers) -include(TribitsDeprecatedHelpers) # Standard CMake includes include(CheckIncludeFileCXX) @@ -720,49 +717,22 @@ macro(tribits_define_global_options_and_define_extra_repos) "Determines if a variety of development mode checks are turned on by default or not." ) - if ("${${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_DEFAULT}" STREQUAL "") - if (${PROJECT_NAME}_ENABLE_DEVELOPMENT_MODE) - set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_DEFAULT FATAL_ERROR) - else() - set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_DEFAULT IGNORE) - endif() - endif() - set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST - "FATAL_ERROR" "SEND_ERROR" ) - set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_VALUES_LIST - ${${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST} - "WARNING" "NOTICE" "IGNORE" "OFF" ) - tribits_add_enum_cache_var( ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES - DEFAULT_VAL ${${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_DEFAULT} - DOC_STRING - "Assert that all external and internal dependencies are defined in the project" - ALLOWED_STRINGS_LIST - ${${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_VALUES_LIST} - IS_ADVANCED ) - - if (NOT "${${PROJECT_NAME}_ASSERT_MISSING_PACKAGES}" STREQUAL "") - message(FATAL_ERROR "Error, ${PROJECT_NAME}_ASSERT_MISSING_PACKAGES=" - " '${${PROJECT_NAME}_ASSERT_MISSING_PACKAGES}' is set and is no" - " longer supported! Please set" - " ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES=FATAL_ERROR instead!" ) - endif() + advanced_set( ${PROJECT_NAME}_ASSERT_MISSING_PACKAGES + ${${PROJECT_NAME}_ENABLE_DEVELOPMENT_MODE} + CACHE BOOL + "Determines if asserts are performed on missing packages or not." ) if ("${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT}" STREQUAL "") if (${PROJECT_NAME}_ENABLE_DEVELOPMENT_MODE) - set(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT FATAL_ERROR) + set(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT FATAL_ERROR) else() - set(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT IGNORE) + set(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT IGNORE) endif() endif() - set(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_VALUES_LIST - "FATAL_ERROR" "SEND_ERROR" "WARNING" "IGNORE" "OFF") - tribits_add_enum_cache_var( ${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE - DEFAULT_VAL "${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT}" - DOC_STRING - "Assert correct usage of TriBITS" - ALLOWED_STRINGS_LIST - ${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_VALUES_LIST} - IS_ADVANCED ) + advanced_set( ${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE + "${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT}" + CACHE BOOL + "Assert correct usage of TriBITS. Value values include 'FATAL_ERROR', 'SEND_ERROR', 'WARNING', and 'IGNORE'. Default '${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT}' " ) advanced_set( ${PROJECT_NAME}_WARN_ABOUT_MISSING_EXTERNAL_PACKAGES FALSE CACHE BOOL @@ -959,17 +929,6 @@ macro(tribits_define_global_options_and_define_extra_repos) CACHE BOOL "Set to 'ON' to see the machine load for advanced tests." ) - if ("${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_DEFAULT}" STREQUAL "") - set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_DEFAULT "DEPRECATION") - endif() - - tribits_add_enum_cache_var(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE - DEFAULT_VAL "${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_DEFAULT}" - DOC_STRING "Mode for dealing with usage of TriBITS deprecated functionality" - ALLOWED_STRINGS_LIST ${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_ALL_VALID_VALUES} - IS_ADVANCED - ) - mark_as_advanced(BUILD_TESTING) mark_as_advanced(CMAKE_BACKWARDS_COMPATIBILITY) mark_as_advanced(DART_TESTING_TIMEOUT) @@ -2320,12 +2279,14 @@ macro(tribits_setup_packaging_and_distribution) # K.2) Removing any packages or packages not enabled from the tarball if (${PROJECT_NAME}_EXCLUDE_DISABLED_SUBPACKAGES_FROM_DISTRIBUTION) - set(tribitsPackageList ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) + set(tribitsPackage ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) else() - set(tribitsPackageList ${${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES}) + set(tribitsPackage ${${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES}) endif() - tribits_get_sublist_nonenabled(tribitsPackageList nonEnabledTribitsPackage "") + tribits_get_nonenabled_list( + tribitsPackage ${PROJECT_NAME} + nonEnabledTribitsPackage "") foreach(TRIBITS_PACKAGE ${nonEnabledTribitsPackage}) @@ -2384,18 +2345,18 @@ macro(tribits_setup_packaging_and_distribution) # K.3) Set up install component dependencies - tribits_get_sublist_enabled( - ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES - enabledInternalToplevelPackages "") - - foreach(pkgName ${enabledInternalToplevelPackages}) - if(NOT "${${pkgName}_LIB_ENABLED_DEPENDENCIES}" STREQUAL "") - string(TOUPPER ${pkgName} upperPkgName) - set(CPACK_COMPONENT_${upperPkgName}_DEPENDS ${${pkgName}_LIB_ENABLED_DEPENDENCIES}) - # ToDo: The above needs to be changed to the list of *internal* enabled - # package dependencies! (But there are no tests for this currently and - # I am not sure who is using this.) + tribits_get_enabled_list( + ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES ${PROJECT_NAME} + ENABLED_PACKAGES NUM_ENABLED) + #message("ENABLED PACKAGES: ${ENABLED_PACKAGES} ${NUM_ENABLED}") + + foreach(PKG ${ENABLED_PACKAGES}) + if(NOT "${${PKG}_LIB_REQUIRED_DEP_PACKAGES}" STREQUAL "") + string(TOUPPER ${PKG} UPPER_PKG) + #message("${UPPER_PKG} depends on : ${${PKG}_LIB_REQUIRED_DEP_PACKAGES}") + set(CPACK_COMPONENT_${UPPER_PKG}_DEPENDS ${${PKG}_LIB_REQUIRED_DEP_PACKAGES}) endif() + #message("${PKG} depends on : ${${PKG}_LIB_REQUIRED_DEP_PACKAGES}") endforeach() # K.4) Resetting the name to avoid overwriting registry keys when installing diff --git a/cmake/tribits/core/package_arch/TribitsIncludeDirectories.cmake b/cmake/tribits/core/package_arch/TribitsIncludeDirectories.cmake index e288094953e2..3f90fc873d69 100644 --- a/cmake/tribits/core/package_arch/TribitsIncludeDirectories.cmake +++ b/cmake/tribits/core/package_arch/TribitsIncludeDirectories.cmake @@ -38,19 +38,18 @@ # @HEADER include(CMakeParseArguments) -include(TribitsDeprecatedHelpers) # @MACRO: tribits_include_directories() # -# This function overrides the standard behavior of the built-in CMake -# ``include_directories()`` command for special behavior for installation -# testing. +# This function is to override the standard behavior of the built-in CMake +# ``include_directories()`` command. # # Usage:: # # tribits_include_directories( -# [REQUIRED_DURING_INSTALLATION_TESTING] ... ) +# [REQUIRED_DURING_INSTALLATION_TESTING] ... +# ) # # If specified, ``REQUIRED_DURING_INSTALLATION_TESTING`` can appear anywhere # in the argument list. @@ -62,10 +61,10 @@ include(TribitsDeprecatedHelpers) # Testing`_). Normally we want the include directories to be handled as cmake # usually does. However during TriBITS installation testing we do not want # most of the include directories to be used as the majority of the files -# should come from the installation we are building against. The exception is -# when there are test only headers that are needed. For that case -# ``REQUIRED_DURING_INSTALLATION_TESTING`` must be passed in to ensure the -# include paths are added for installation testing. +# should come from the installation we are building against. There is an +# exception to this and that is when there are test only headers that are +# needed. For that case ``REQUIRED_DURING_INSTALLATION_TESTING`` must be +# passed in to ensure the include paths are added for installation testing. # macro(tribits_include_directories) @@ -81,32 +80,16 @@ macro(tribits_include_directories) ${ARGN} ) - if(NOT ${PROJECT_NAME}_ENABLE_INSTALLATION_TESTING - OR PARSE_REQUIRED_DURING_INSTALLATION_TESTING - ) - if (TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE) - include_directories(${PARSE_UNPARSED_ARGUMENTS}) - else() - _include_directories(${PARSE_UNPARSED_ARGUMENTS}) - endif() + if(NOT ${PROJECT_NAME}_ENABLE_INSTALLATION_TESTING OR PARSE_REQUIRED_DURING_INSTALLATION_TESTING) + _include_directories(${PARSE_UNPARSED_ARGUMENTS}) endif() endmacro() -if (NOT TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE) - # Deprecated. Use tribits_include_directories() instead! -# -# To hide this macro from even being defined, set -# ``TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE=TRUE``. -# macro(include_directories) - tribits_deprecated_command(include_directories - MESSAGE "Use tribits_include_directories() instead." - ) - - cmake_parse_arguments( + cmake_parse_arguments( #prefix PARSE #options @@ -118,11 +101,12 @@ macro(include_directories) ${ARGN} ) - if(NOT ${PROJECT_NAME}_ENABLE_INSTALLATION_TESTING - OR PARSE_REQUIRED_DURING_INSTALLATION_TESTING - ) +# if (PARSE_REQUIRED_DURING_INSTALLATION_TESTING) +# message(WARNING "Warning: the override include_directories() is deprecated," +# " use tribits_include_directories() instead!") +# endif() + + if(NOT ${PROJECT_NAME}_ENABLE_INSTALLATION_TESTING OR PARSE_REQUIRED_DURING_INSTALLATION_TESTING) _include_directories(${PARSE_UNPARSED_ARGUMENTS}) endif() endmacro() - -endif (NOT TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE) diff --git a/cmake/tribits/core/package_arch/TribitsListHelpers.cmake b/cmake/tribits/core/package_arch/TribitsListHelpers.cmake index 69ade415d655..92184a2520e6 100644 --- a/cmake/tribits/core/package_arch/TribitsListHelpers.cmake +++ b/cmake/tribits/core/package_arch/TribitsListHelpers.cmake @@ -39,7 +39,6 @@ include(TribitsHostType) -include(TribitsDeprecatedHelpers) # @@ -121,8 +120,8 @@ endmacro() macro( package_disable_on_platforms PACKAGE_NAME_IN_ ) - tribits_deprecated_command(package_disable_on_platforms - MESSAGE "Use tribits_disable_package_on_platforms() instead!") + message(WARNING "package_disable_on_platforms() is deprecated!" + " Use tribits_disable_package_on_platforms() instead!") tribits_disable_package_on_platforms(${PACKAGE_NAME_IN_} ${ARGN}) endmacro() @@ -137,19 +136,19 @@ function(tribits_update_ps_pt_ss_st THING_TYPE THING_NAME TESTGROUP_VAR) if (TESTGROUP_IN STREQUAL PS) if (${PROJECT_NAME}_VERBOSE_CONFIGURE) - tribits_deprecated("${THING_TYPE} ${THING_NAME} TESTGROUP 'PS' is deprecated." + message("-- " "WARNING: ${THING_TYPE} ${THING_NAME} TESTGROUP 'PS' is deprecated." " Use 'PT' instead!") endif() set(TESTGROUP_OUT PT) elseif (TESTGROUP_IN STREQUAL SS) if (${PROJECT_NAME}_VERBOSE_CONFIGURE) - tribits_deprecated("${THING_TYPE} ${THING_NAME} TESTGROUP 'SS' is deprecated." + message("-- " "WARNING: ${THING_TYPE} ${THING_NAME} TESTGROUP 'SS' is deprecated." " Use 'ST' instead!") endif() set(TESTGROUP_OUT ST) elseif (TESTGROUP_IN STREQUAL TS) if (${PROJECT_NAME}_VERBOSE_CONFIGURE) - tribits_deprecated("${THING_TYPE} ${THING_NAME} TESTGROUP 'TS' is deprecated." + message("-- " "WARNING: ${THING_TYPE} ${THING_NAME} TESTGROUP 'TS' is deprecated." " Use 'TT' instead!") endif() set(TESTGROUP_OUT TT) diff --git a/cmake/tribits/core/package_arch/TribitsPackageDependencies.cmake b/cmake/tribits/core/package_arch/TribitsPackageDependencies.cmake index 0f4a956dd783..416b03d7fddf 100644 --- a/cmake/tribits/core/package_arch/TribitsPackageDependencies.cmake +++ b/cmake/tribits/core/package_arch/TribitsPackageDependencies.cmake @@ -123,14 +123,13 @@ endmacro() # Takes the list ``_LIB_DEFINED_DEPENDENCIES`` and sets the # default entries of the non-cache var # ``_LIB_ENABLED_DEPENDENCIES``. However, if -# ``${_LIB_ENABLED_DEPENDENCIES`` is non-empty when this -# macro is called, then it will not be changed. That allows the user to -# override the list of enabled TPL dependencies in the cache. This also sets -# the non-cache vars ``_ENABLE_=ON`` for -# each enabled package listed in -# ``_LIB_ENABLED_DEPENDENCIES`` and to ``OFF`` for each -# ```` listed in -# ``_LIB_DEFINED_DEPENDENCIES`` but not in +# ``${_LIB_DEFINED_DEPENDENCIES}`` is non-empty when this macro +# is called, then it will not be changed. That allows the user to override +# the list of enabled TPL dependencies in the cache. This also sets the +# non-cache vars ``_ENABLE_=ON`` for each +# enabled package listed in ``_LIB_ENABLED_DEPENDENCIES`` and +# to ``OFF`` for each ```` listed in +# ``_LIB_ENABLED_DEPENDENCIES`` but not in # ``_LIB_ENABLED_DEPENDENCIES``. # macro(tribits_extpkg_setup_enabled_dependencies externalPkgName) @@ -150,7 +149,7 @@ macro(tribits_extpkg_setup_enabled_dependencies externalPkgName) endif() if ("${${externalPkgName}_LIB_ENABLED_DEPENDENCIES}" STREQUAL "") - # Only set of not already set as a cache var, for example, by the user + # Only set of not already set as a cache var, for example set(${externalPkgName}_LIB_ENABLED_DEPENDENCIES ${libEnabledDependencies}) endif() diff --git a/cmake/tribits/core/package_arch/TribitsPackageMacros.cmake b/cmake/tribits/core/package_arch/TribitsPackageMacros.cmake index a0c53f5129fe..8a0475f6746e 100644 --- a/cmake/tribits/core/package_arch/TribitsPackageMacros.cmake +++ b/cmake/tribits/core/package_arch/TribitsPackageMacros.cmake @@ -545,7 +545,10 @@ endmacro() # up example directories any way one would like. # # Currently, all it does macro does is to call ``add_subdirectory()`` if -# `${PACKAGE_NAME}_ENABLE_EXAMPLES`_ ``= TRUE``. +# ``${PACKAGE_NAME}_ENABLE_EXAMPLES`` or +# ``${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES`` are true. However, this macro may +# be extended in the future in order to modify behavior related to adding +# tests and examples in a uniform way. # macro(tribits_add_example_directories) diff --git a/cmake/tribits/core/package_arch/TribitsPkgExportCacheVars.cmake b/cmake/tribits/core/package_arch/TribitsPkgExportCacheVars.cmake index 9380cebe1dd9..6fb85e0ef8de 100644 --- a/cmake/tribits/core/package_arch/TribitsPkgExportCacheVars.cmake +++ b/cmake/tribits/core/package_arch/TribitsPkgExportCacheVars.cmake @@ -122,7 +122,7 @@ function(tribits_pkg_append_set_commands_for_exported_vars packageName endforeach() endif() foreach(exportedCacheVar IN LISTS ${packageName}_PKG_VARS_TO_EXPORT) - #tribits_assert_cache_and_local_vars_same_value(${exportedCacheVar}) + tribits_assert_cache_and_local_vars_same_value(${exportedCacheVar}) string(APPEND configFileStr "set(${exportedCacheVar} \"${${exportedCacheVar}}\")\n") endforeach() diff --git a/cmake/tribits/core/package_arch/TribitsPrintDependencyInfo.cmake b/cmake/tribits/core/package_arch/TribitsPrintDependencyInfo.cmake index 2b96e2f74175..143610266c51 100644 --- a/cmake/tribits/core/package_arch/TribitsPrintDependencyInfo.cmake +++ b/cmake/tribits/core/package_arch/TribitsPrintDependencyInfo.cmake @@ -114,7 +114,7 @@ function(tribits_dump_package_dependencies_info) if (${PROJECT_NAME}_DUMP_PACKAGE_DEPENDENCIES) message("") - foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_PACKAGES}) + foreach(TRIBITS_PACKAGE ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) tribits_print_package_dependencies(${TRIBITS_PACKAGE}) message("") endforeach() @@ -123,9 +123,6 @@ function(tribits_dump_package_dependencies_info) endfunction() -# Optionally print out a global project list var with spaces and -# unconditionally print out the number of items in that list -# function(tribits_print_project_list_var_and_num listVarSuffix) message("") if (${PROJECT_NAME}_DUMP_PACKAGE_DEPENDENCIES) @@ -135,101 +132,4 @@ function(tribits_print_project_list_var_and_num listVarSuffix) endfunction() -# Print out dependencies for a package -# -function(tribits_print_package_dependencies packageName) - - set(printedVar "") - - # Print deps vars - - if (printedVar) - message("") - endif() - - tribits_print_nonempty_package_deps_list(${packageName} LIB DEFINED printedVar) - tribits_print_nonempty_package_deps_list(${packageName} TEST DEFINED printedVar) - - if (${PROJECT_NAME}_DUMP_FORWARD_PACKAGE_DEPENDENCIES) - tribits_print_nonempty_package_forward_defined_deps_list(${packageName} LIB - printedVar) - tribits_print_nonempty_package_forward_defined_deps_list(${packageName} TEST - printedVar) - endif() - - if (NOT printedVar) - message("-- ${packageName}: No defined dependencies!") - endif() - -endfunction() - - -# Print out a dependency list including if each item is optional or required -# ('R' or 'O') -# -# Usage:: -# -# tribits_print_nonempty_package_deps_list( -# ) -# -# which prints out the list:: -# -# __DEFINED_DEPENDENCIES -# -# if it is non-empty. -# -function(tribits_print_nonempty_package_deps_list packageName - libOrTest definedOrEnabled printedListOut - ) - set(depsListName ${packageName}_${libOrTest}_${definedOrEnabled}_DEPENDENCIES) - if (NOT "${${depsListName}}" STREQUAL "") - set(lineStr "-- ${depsListName}:") - foreach (depPkg IN LISTS ${depsListName}) - string(APPEND lineStr " ${depPkg}") - if (${packageName}_${libOrTest}_DEP_REQUIRED_${depPkg}) - string(APPEND lineStr "[R]") - else() - string(APPEND lineStr "[O]") - endif() - endforeach() - message("${lineStr}") - set(${printedListOut} TRUE PARENT_SCOPE) - endif() -endfunction() - - -# Print out a forward dependency list including if each item is optional or -# required ('R' or 'O') -# -# Usage:: -# -# tribits_print_nonempty_package_forward_defined_deps_list( -# ) -# -# which prints out the list:: -# -# _FORWARD__DEFINED_DEPENDENCIES -# -# if it is non-empty. -# -function(tribits_print_nonempty_package_forward_defined_deps_list packageName - libOrTest printedListOut - ) - set(fwdDepsListName ${packageName}_FORWARD_${libOrTest}_DEFINED_DEPENDENCIES) - if (NOT "${${fwdDepsListName}}" STREQUAL "") - set(lineStr "-- ${fwdDepsListName}:") - foreach (fwdDepPkg IN LISTS ${fwdDepsListName}) - string(APPEND lineStr " ${fwdDepPkg}") - if (${fwdDepPkg}_${libOrTest}_DEP_REQUIRED_${packageName}) - string(APPEND lineStr "[R]") - else() - string(APPEND lineStr "[O]") - endif() - endforeach() - message("${lineStr}") - set(${printedListOut} TRUE PARENT_SCOPE) - endif() -endfunction() - - # LocalWords: TRIBITS diff --git a/cmake/tribits/core/package_arch/TribitsPrintEnabledPackagesLists.cmake b/cmake/tribits/core/package_arch/TribitsPrintEnabledPackagesLists.cmake index b49d96372bfc..547c9a9f60e9 100644 --- a/cmake/tribits/core/package_arch/TribitsPrintEnabledPackagesLists.cmake +++ b/cmake/tribits/core/package_arch/TribitsPrintEnabledPackagesLists.cmake @@ -37,8 +37,6 @@ # ************************************************************************ # @HEADER -include(TribitsGetEnabledSublists) - # @FUNCTION: tribits_print_enables_before_adjust_package_enables() # @@ -109,20 +107,20 @@ function(tribits_print_internal_package_list_enable_status DOCSTRING ENABLED_FLAG INCLUDE_EMPTY ) if (ENABLED_FLAG AND NOT INCLUDE_EMPTY) - tribits_get_sublist_enabled( - ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES + tribits_get_enabled_list( + ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${PROJECT_NAME} internalPackagesEnableStatusList "") elseif (ENABLED_FLAG AND INCLUDE_EMPTY) - tribits_get_sublist_nondisabled( + tribits_get_nondisabled_list( ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${PROJECT_NAME} internalPackagesEnableStatusList "") elseif (NOT ENABLED_FLAG AND NOT INCLUDE_EMPTY) - tribits_get_sublist_disabled( - ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES + tribits_get_disabled_list( + ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${PROJECT_NAME} internalPackagesEnableStatusList "") else() # NOT ENABLED_FLAG AND INCLUDE_EMPTY - tribits_get_sublist_nonenabled( - ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES + tribits_get_nonenabled_list( + ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${PROJECT_NAME} internalPackagesEnableStatusList "") endif() tribits_print_prefix_string_and_list("${DOCSTRING}" @@ -134,16 +132,16 @@ endfunction() # function(tribits_print_tpl_list_enable_status DOCSTRING ENABLED_FLAG INCLUDE_EMPTY) if (ENABLED_FLAG AND NOT INCLUDE_EMPTY) - tribits_get_sublist_enabled( ${PROJECT_NAME}_DEFINED_TPLS + tribits_get_enabled_list( ${PROJECT_NAME}_DEFINED_TPLS TPL tplsEnableStatusList "") elseif (ENABLED_FLAG AND INCLUDE_EMPTY) - tribits_get_sublist_nondisabled( ${PROJECT_NAME}_DEFINED_TPLS + tribits_get_nondisabled_list( ${PROJECT_NAME}_DEFINED_TPLS TPL tplsEnableStatusList "") elseif (NOT ENABLED_FLAG AND NOT INCLUDE_EMPTY) - tribits_get_sublist_disabled( ${PROJECT_NAME}_DEFINED_TPLS + tribits_get_disabled_list( ${PROJECT_NAME}_DEFINED_TPLS TPL tplsEnableStatusList "") else() # NOT ENABLED_FLAG AND INCLUDE_EMPTY - tribits_get_sublist_nonenabled( ${PROJECT_NAME}_DEFINED_TPLS + tribits_get_nonenabled_list( ${PROJECT_NAME}_DEFINED_TPLS TPL tplsEnableStatusList "") endif() tribits_print_prefix_string_and_list("${DOCSTRING}" "${tplsEnableStatusList}") @@ -157,15 +155,16 @@ function(tribits_print_packages_list_enable_status_from_var PACKAGES_LIST_VAR DOCSTRING ENABLED_FLAG INCLUDE_EMPTY ) if (ENABLED_FLAG AND NOT INCLUDE_EMPTY) - tribits_get_sublist_enabled(${PACKAGES_LIST_VAR} + tribits_get_enabled_list(${PACKAGES_LIST_VAR} ${PROJECT_NAME} enableStatusList "") elseif (ENABLED_FLAG AND INCLUDE_EMPTY) - tribits_get_sublist_nondisabled(${PACKAGES_LIST_VAR} enableStatusList "") + tribits_get_nondisabled_list(${PACKAGES_LIST_VAR} ${PROJECT_NAME} + enableStatusList "") elseif (NOT ENABLED_FLAG AND NOT INCLUDE_EMPTY) - tribits_get_sublist_disabled(${PACKAGES_LIST_VAR} + tribits_get_disabled_list(${PACKAGES_LIST_VAR} ${PROJECT_NAME} enableStatusList "") else() # NOT ENABLED_FLAG AND INCLUDE_EMPTY - tribits_get_sublist_nonenabled(${PACKAGES_LIST_VAR} + tribits_get_nonenabled_list(${PACKAGES_LIST_VAR} ${PROJECT_NAME} enableStatusList "") endif() tribits_print_prefix_string_and_list("${DOCSTRING}" "${enableStatusList}") diff --git a/cmake/tribits/core/package_arch/TribitsProcessEnabledTpl.cmake b/cmake/tribits/core/package_arch/TribitsProcessEnabledTpl.cmake index f6925f2081ff..dcdde4ce6349 100644 --- a/cmake/tribits/core/package_arch/TribitsProcessEnabledTpl.cmake +++ b/cmake/tribits/core/package_arch/TribitsProcessEnabledTpl.cmake @@ -57,9 +57,9 @@ function(tribits_process_enabled_tpl TPL_NAME) # Setup the processing string set(PROCESSING_MSG_STRING "Processing enabled external package/TPL: ${TPL_NAME} (") - if (${TPL_NAME}_ENABLING_PKG) + if (TPL_${TPL_NAME}_ENABLING_PKG) string(APPEND PROCESSING_MSG_STRING - "enabled by ${${TPL_NAME}_ENABLING_PKG}," ) + "enabled by ${TPL_${TPL_NAME}_ENABLING_PKG}," ) else() string(APPEND PROCESSING_MSG_STRING "enabled explicitly," ) @@ -121,14 +121,14 @@ function(tribits_process_enabled_tpl TPL_NAME) " which is pointed to in the file:\n" " ${${TPL_NAME}_TPLS_LIST_FILE}\n" ) - if (${TPL_NAME}_ENABLING_PKG) + if (TPL_${TPL_NAME}_ENABLING_PKG) message( "TIP: One way to get past the configure failure for the\n" "TPL '${TPL_NAME}' is to simply disable it with:\n" " -DTPL_ENABLE_${TPL_NAME}=OFF\n" "which will disable it and will recursively disable all of the\n" "downstream packages that have required dependencies on it, including\n" - "the package '${${TPL_NAME}_ENABLING_PKG}' which triggered its enable.\n" + "the package '${TPL_${TPL_NAME}_ENABLING_PKG}' which triggered its enable.\n" "When you reconfigure, just grep the cmake stdout for '${TPL_NAME}'\n" "and then follow the disables that occur as a result to see what impact\n" "this TPL disable has on the configuration of ${PROJECT_NAME}.\n" diff --git a/cmake/tribits/core/package_arch/TribitsProcessPackagesAndDirsLists.cmake b/cmake/tribits/core/package_arch/TribitsProcessPackagesAndDirsLists.cmake index d045fdedfaaa..35a5d46b4864 100644 --- a/cmake/tribits/core/package_arch/TribitsProcessPackagesAndDirsLists.cmake +++ b/cmake/tribits/core/package_arch/TribitsProcessPackagesAndDirsLists.cmake @@ -334,32 +334,29 @@ function(tribits_is_primary_meta_project_package PACKAGE_NAME_IN endfunction() -# Function that determines if it is okay to allow an implicit enable of an -# upstream package given the disable of a downstream package that depends on -# it. +# Function that determines if it is okay to allow an implicit package enable +# based on its classification. # -function(tribits_implicit_package_enable_is_allowed upstreamPackageName - packageName implictPackageEnableAllowedOut +function(tribits_implicit_package_enable_is_allowed UPSTREAM_PACKAGE_NAME_IN + PACKAGE_NAME_IN IMPLICIT_PACKAGE_ENABLE_ALLOWED_OUT ) - if (${packageName}_PACKAGE_BUILD_STATUS STREQUAL "EXTERNAL") - set(implicitPackageEnableAllowed FALSE) - elseif (${packageName}_TESTGROUP STREQUAL "PT") - set(implicitPackageEnableAllowed TRUE) - elseif (${packageName}_TESTGROUP STREQUAL "ST" - AND ${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE + if (${PACKAGE_NAME_IN}_TESTGROUP STREQUAL PT) + set(IMPLICIT_PACKAGE_ENABLE_ALLOWED TRUE) + elseif (${PACKAGE_NAME_IN}_TESTGROUP STREQUAL ST + AND ${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE ) - set(implicitPackageEnableAllowed TRUE) + set(IMPLICIT_PACKAGE_ENABLE_ALLOWED TRUE) else() - if (upstreamPackageName) - message("-- " "NOTE: Not Setting ${PROJECT_NAME}_ENABLE_${packageName}=ON" - " even though ${upstreamPackageName} has an optional dependence on" - " ${packageName} because ${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE=OFF" ) + if (UPSTREAM_PACKAGE_NAME_IN) + message("-- " "NOTE: Not Setting ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME_IN}=ON" + " even though ${UPSTREAM_PACKAGE_NAME_IN} has an optional dependence on" + " ${PACKAGE_NAME_IN} because ${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE=OFF" ) endif() - set(implicitPackageEnableAllowed FALSE) + set(IMPLICIT_PACKAGE_ENABLE_ALLOWED FALSE) endif() - set(${implictPackageEnableAllowedOut} "${implicitPackageEnableAllowed}" + set(${IMPLICIT_PACKAGE_ENABLE_ALLOWED_OUT} ${IMPLICIT_PACKAGE_ENABLE_ALLOWED} PARENT_SCOPE ) endfunction() @@ -381,6 +378,7 @@ endfunction() # * `${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES`_ # * `${PROJECT_NAME}_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES`_ # * ``${PROJECT_NAME}_LAST_DEFINED_INTERNAL_TOPLEVEL_PACKAGE_IDX`` +# * ``${PROJECT_NAME}_REVERSE_DEFINED_INTERNAL_TOPLEVEL_PACKAGES`` # # For each of the listed top-level (parent) packages ${PACKAGE_NAME}, it also # sets up constant variables defined in `TriBITS Package Top-Level Local @@ -388,15 +386,12 @@ endfunction() # # * `${PACKAGE_NAME}_SOURCE_DIR`_ # * `${PACKAGE_NAME}_REL_SOURCE_DIR`_ -# * `${PACKAGE_NAME}_PARENT_PACKAGE`_ (to empty "") -# * `${PACKAGE_NAME}_PARENT_REPOSITORY`_ (to empty "") # * `${PACKAGE_NAME}_TESTGROUP`_ -# * `${PACKAGE_NAME}_PACKAGE_BUILD_STATUS`_ (to ``INTERNAL``) # # and sets up some standard enable/disable vars with default values as defined -# in `TriBITS Package Cache Variables`_ like: +# in `TriBITS Package Cache Variables`_ like:: # -# * `${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}`_ +# ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME} # # NOTE: Set ``TRIBITS_PROCESS_PACKAGES_AND_DIRS_LISTS_VERBOSE=TRUE`` to see # really verbose debug output from this macro. @@ -546,12 +541,11 @@ macro(tribits_process_packages_and_dirs_lists REPOSITORY_NAME REPOSITORY_DIR) print_var(REPOSITORY_AND_PACKAGE_DIR) print_var(PACKAGE_ABS_DIR) print_var(PACKAGE_EXISTS) - print_var(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES) + print_var(${PROJECT_NAME}_ASSERT_MISSING_PACKAGES) print_var(${TRIBITS_PACKAGE}_ALLOW_MISSING_EXTERNAL_PACKAGE) endif() - if (${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES IN_LIST - ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST + if (${PROJECT_NAME}_ASSERT_MISSING_PACKAGES AND NOT PACKAGE_EXISTS AND NOT ${TRIBITS_PACKAGE}_ALLOW_MISSING_EXTERNAL_PACKAGE ) @@ -564,14 +558,15 @@ macro(tribits_process_packages_and_dirs_lists REPOSITORY_NAME REPOSITORY_DIR) if (PACKAGE_EXISTS OR ${PROJECT_NAME}_IGNORE_PACKAGE_EXISTS_CHECK) list(APPEND ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES ${TRIBITS_PACKAGE}) + tribits_insert_standard_package_options(${TRIBITS_PACKAGE} + ${PACKAGE_TESTGROUP}) + set(${TRIBITS_PACKAGE}_PACKAGE_BUILD_STATUS INTERNAL) set(${TRIBITS_PACKAGE}_SOURCE_DIR "${PROJECT_SOURCE_DIR}/${REPOSITORY_AND_PACKAGE_DIR}") set(${TRIBITS_PACKAGE}_REL_SOURCE_DIR "${REPOSITORY_AND_PACKAGE_DIR}") set(${TRIBITS_PACKAGE}_PARENT_PACKAGE "") set(${TRIBITS_PACKAGE}_PARENT_REPOSITORY ${REPOSITORY_NAME}) - tribits_insert_standard_package_options(${TRIBITS_PACKAGE} ${PACKAGE_TESTGROUP}) - set(${TRIBITS_PACKAGE}_PACKAGE_BUILD_STATUS INTERNAL) else() if (${PROJECT_NAME}_VERBOSE_CONFIGURE) message( @@ -585,14 +580,10 @@ macro(tribits_process_packages_and_dirs_lists REPOSITORY_NAME REPOSITORY_DIR) # gets set to TRUE for some unit tests. Otherwise, in every legitimate # usage of this macro it is always FALSE. - if (TRIBITS_PROCESS_PACKAGES_AND_DIRS_LISTS_VERBOSE - OR ${PROJECT_NAME}_VERBOSE_CONFIGURE - ) + if (TRIBITS_PROCESS_PACKAGES_AND_DIRS_LISTS_VERBOSE) print_var(${TRIBITS_PACKAGE}_SOURCE_DIR) - print_var(${TRIBITS_PACKAGE}_REL_SOURCE_DIR) print_var(${TRIBITS_PACKAGE}_PARENT_PACKAGE) print_var(${TRIBITS_PACKAGE}_PARENT_REPOSITORY) - print_var(${TRIBITS_PACKAGE}_PACKAGE_BUILD_STATUS) endif() if (TRIBITS_PROCESS_PACKAGES_AND_DIRS_LISTS_VERBOSE) @@ -608,6 +599,12 @@ macro(tribits_process_packages_and_dirs_lists REPOSITORY_NAME REPOSITORY_DIR) math(EXPR ${PROJECT_NAME}_LAST_DEFINED_INTERNAL_TOPLEVEL_PACKAGE_IDX "${${PROJECT_NAME}_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES}-1") + # Create a reverse list for later use + + set(${PROJECT_NAME}_REVERSE_DEFINED_INTERNAL_TOPLEVEL_PACKAGES + ${${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES}) + list(REVERSE ${PROJECT_NAME}_REVERSE_DEFINED_INTERNAL_TOPLEVEL_PACKAGES) + else() set(${REPOSITORY_NAME}_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES 0) diff --git a/cmake/tribits/core/package_arch/TribitsProcessTplsLists.cmake b/cmake/tribits/core/package_arch/TribitsProcessTplsLists.cmake index 611dcf3f73b2..0a9c2ea486bd 100644 --- a/cmake/tribits/core/package_arch/TribitsProcessTplsLists.cmake +++ b/cmake/tribits/core/package_arch/TribitsProcessTplsLists.cmake @@ -138,7 +138,6 @@ endmacro() # * `${TPL_NAME}_TESTGROUP`_ # * `${TPL_NAME}_DEPENDENCIES_FILE`_ # * `${TPL_NAME}_TPLS_LIST_FILE`_ -# * `${TPL_NAME}_PACKAGE_BUILD_STATUS`_ (to ``EXTERNAL``) # # See `Function call tree for constructing package dependency graph`_ # @@ -217,6 +216,10 @@ macro(tribits_process_tpls_lists REPOSITORY_NAME REPOSITORY_DIR) list(APPEND ${PROJECT_NAME}_DEFINED_TPLS ${TPL_NAME}) endif() + # Set ${TPL_NAME}_PACKAGE_BUILD_STATUS + + set(${TPL_NAME}_PACKAGE_BUILD_STATUS EXTERNAL) + # Set ${TPL_NAME}_TESTGROUP if (TPL_TESTGROUP STREQUAL PT @@ -271,10 +274,6 @@ macro(tribits_process_tpls_lists REPOSITORY_NAME REPOSITORY_DIR) assert_defined(${REPOSITORY_NAME}_TPLS_FILE) set(${TPL_NAME}_TPLS_LIST_FILE ${${REPOSITORY_NAME}_TPLS_FILE}) - # Set ${TPL_NAME}_PACKAGE_BUILD_STATUS - - set(${TPL_NAME}_PACKAGE_BUILD_STATUS EXTERNAL) - # Print variables/properties for the TPL if (${PROJECT_NAME}_VERBOSE_CONFIGURE OR TRIBITS_PROCESS_TPLS_LISTS_VERBOSE) @@ -282,7 +281,6 @@ macro(tribits_process_tpls_lists REPOSITORY_NAME REPOSITORY_DIR) print_var(${TPL_NAME}_FINDMOD) print_var(${TPL_NAME}_DEPENDENCIES_FILE) print_var(${TPL_NAME}_TPLS_LIST_FILE) - print_var(${TPL_NAME}_PACKAGE_BUILD_STATUS) endif() # Set cache var TPL_ENABLE_${TPL_NAME} with default "" diff --git a/cmake/tribits/core/package_arch/TribitsProjectImpl.cmake b/cmake/tribits/core/package_arch/TribitsProjectImpl.cmake index 892cecc6b6a3..fc9e30109206 100644 --- a/cmake/tribits/core/package_arch/TribitsProjectImpl.cmake +++ b/cmake/tribits/core/package_arch/TribitsProjectImpl.cmake @@ -117,7 +117,7 @@ macro(tribits_project_impl) # Since the version header file is now configured the root build # dir needs to be on the include path - tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) # # B) Set up user options and global variables that will be used throughout diff --git a/cmake/tribits/core/package_arch/TribitsReadAllProjectDepsFilesCreateDepsGraph.cmake b/cmake/tribits/core/package_arch/TribitsReadAllProjectDepsFilesCreateDepsGraph.cmake index 2b71d8288589..261d815f3e05 100644 --- a/cmake/tribits/core/package_arch/TribitsReadAllProjectDepsFilesCreateDepsGraph.cmake +++ b/cmake/tribits/core/package_arch/TribitsReadAllProjectDepsFilesCreateDepsGraph.cmake @@ -64,6 +64,7 @@ include(TimingUtils) # # * `Lists of external and internal packages`_ # * `Variables defining the package dependencies graph`_ +# (`Legacy list variables defining the package dependencies graph`_) # * `TriBITS Package Top-Level Local Variables`_ # * `TriBITS Subpackage Top-Level Local Variables`_ # * `TriBITS Package Cache Variables`_ @@ -237,6 +238,14 @@ macro(tribits_read_defined_external_and_internal_toplevel_packages_lists) # ${PROJECT_NAME}_NUM_DEFINED_TPLS list(LENGTH ${PROJECT_NAME}_DEFINED_TPLS ${PROJECT_NAME}_NUM_DEFINED_TPLS) + # ${PROJECT_NAME}_REVERSE_DEFINED_TPLS (ToDo: Remove the need for this #63) + if (${PROJECT_NAME}_DEFINED_TPLS) + set(${PROJECT_NAME}_REVERSE_DEFINED_TPLS ${${PROJECT_NAME}_DEFINED_TPLS}) + list(REVERSE ${PROJECT_NAME}_REVERSE_DEFINED_TPLS) + else() + set(${PROJECT_NAME}_REVERSE_DEFINED_TPLS) + endif() + # ${PROJECT_NAME}_DEFINED_TOPLEVEL_PACKAGES set(${PROJECT_NAME}_DEFINED_TOPLEVEL_PACKAGES ${${PROJECT_NAME}_DEFINED_TPLS} diff --git a/cmake/tribits/core/package_arch/TribitsReadDepsFilesCreateDepsGraph.cmake b/cmake/tribits/core/package_arch/TribitsReadDepsFilesCreateDepsGraph.cmake index 9ec045e0099b..c55673ee927b 100644 --- a/cmake/tribits/core/package_arch/TribitsReadDepsFilesCreateDepsGraph.cmake +++ b/cmake/tribits/core/package_arch/TribitsReadDepsFilesCreateDepsGraph.cmake @@ -38,7 +38,6 @@ # @HEADER include(TribitsPackageDefineDependencies) -include(TribitsPackageDependencies) include(SetDefault) include(DualScopeSet) @@ -65,12 +64,12 @@ include(DualScopeSet) # # * `${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES`_ # -# as well creates the package dependency variables described in `Variables -# defining the package dependencies graph`_ that defines the directed acyclic -# dependency (DAG) package dependency graph (with navigation up and down the -# graph). +# as well creates the package dependency variables described in `Legacy list +# variables defining the package dependencies graph`_ that defines the +# directed acyclic dependency (DAG) package dependency graph (with navigation +# up and down the graph). # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # macro(tribits_read_deps_files_create_deps_graph) @@ -92,15 +91,20 @@ endmacro() # Process any dependency logic at the repo level by loading # `/cmake/RepositoryDependenciesSetup.cmake`_ files. # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # macro(tribits_process_all_repository_deps_setup_files) - foreach(TIBITS_REPO IN LISTS ${PROJECT_NAME}_ALL_REPOSITORIES) + foreach(TIBITS_REPO ${${PROJECT_NAME}_ALL_REPOSITORIES}) tribits_get_repo_name_dir(${TIBITS_REPO} REPO_NAME REPO_DIR) tribits_set_base_repo_dir(${PROJECT_SOURCE_DIR} ${REPO_DIR} BASE_REPO_DIR) tribits_get_repo_name(${TIBITS_REPO} REPOSITORY_NAME) + #print_var(TIBITS_REPO) + #print_var(REPO_NAME) + #print_var(REPO_DIR) + #print_var(REPOSITORY_NAME) set(REPO_DEPENDENCIES_SETUP_FILE "${BASE_REPO_DIR}/cmake/RepositoryDependenciesSetup.cmake") + #print_var(REPO_DEPENDENCIES_SETUP_FILE) if (EXISTS ${REPO_DEPENDENCIES_SETUP_FILE}) tribits_trace_file_processing(REPOSITORY INCLUDE "${REPO_DEPENDENCIES_SETUP_FILE}") @@ -124,7 +128,7 @@ endmacro() # Process any dependency logic at the project level by loading the # `/cmake/ProjectDependenciesSetup.cmake`_ file # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # macro(tribits_process_project_dependency_setup_file) set(PROJECT_DEPENDENCIES_SETUP_FILE @@ -166,26 +170,33 @@ endmacro() # # * `${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES`_ # -# as well creates the package dependency variables described in `Variables -# defining the package dependencies graph`_ that defines the directed acyclic -# dependency (DAG) package dependency graph (with navigation up and down the -# graph). +# as well creates the package dependency variables described in `Legacy list +# variables defining the package dependencies graph`_ that defines the +# directed acyclic dependency (DAG) package dependency graph (with navigation +# up and down the graph). # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # macro(tribits_read_all_package_deps_files_create_deps_graph) - foreach(tribitsExternalPkg IN LISTS ${PROJECT_NAME}_DEFINED_TPLS) + foreach(tribitsExternalPkg IN LISTS ${PROJECT_NAME}_DEFINED_TPLS) tribits_read_external_package_deps_files_add_to_graph(${tribitsExternalPkg}) endforeach() set(${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES "") # Packages and subpackages - foreach(TRIBITS_PACKAGE IN LISTS ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES) + foreach(TRIBITS_PACKAGE IN LISTS ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES) tribits_read_toplevel_package_deps_files_add_to_graph(${TRIBITS_PACKAGE} ${${TRIBITS_PACKAGE}_REL_SOURCE_DIR}) endforeach() + # Create a reverse packages list for later use + set(${PROJECT_NAME}_REVERSE_DEFINED_INTERNAL_PACKAGES + ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES}) + if (${PROJECT_NAME}_REVERSE_DEFINED_INTERNAL_PACKAGES) + list(REVERSE ${PROJECT_NAME}_REVERSE_DEFINED_INTERNAL_PACKAGES) + endif() + list(LENGTH ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${PROJECT_NAME}_NUM_DEFINED_INTERNAL_PACKAGES) print_var(${PROJECT_NAME}_NUM_DEFINED_INTERNAL_PACKAGES) @@ -207,13 +218,9 @@ endmacro() # # _LIB_DEFINED_DEPENDENCIES # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # macro(tribits_read_external_package_deps_files_add_to_graph tplName) - # Set up empty lists for forward dependencies - set(${tplName}_FORWARD_LIB_DEFINED_DEPENDENCIES "") - set(${tplName}_FORWARD_TEST_DEFINED_DEPENDENCIES "") - # Read in and process the external package/TPL dependency file if (IS_ABSOLUTE "${${tplName}_DEPENDENCIES_FILE}") set(absTplDepsFile "${${tplName}_DEPENDENCIES_FILE}") else() @@ -222,10 +229,6 @@ macro(tribits_read_external_package_deps_files_add_to_graph tplName) if (EXISTS "${absTplDepsFile}") tribits_trace_file_processing(TPL INCLUDE "${absTplDepsFile}") include(${absTplDepsFile}) - foreach(depPkg IN LISTS ${tplName}_LIB_DEFINED_DEPENDENCIES) - global_set(${tplName}_LIB_DEP_REQUIRED_${depPkg} TRUE) - endforeach() - tribits_append_forward_dep_packages(${tplName} LIB) endif() endmacro() @@ -239,8 +242,21 @@ endmacro() # Macro that reads in package dependencies for a top-level package from the # file `/cmake/Dependencies.cmake`_ and appends the forward # dependencies list vars for packages already read in for this package -# ```` (see `Variables defining the package dependencies -# graph`_). +# ````. +# +# Modifies the global variables:: +# +# ${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES +# ${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES +# ${PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES +# ${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES +# _FORWARD_LIB_REQUIRED_DEP_PACKAGES +# _FORWARD_LIB_OPTIONAL_DEP_PACKAGES +# _FORWARD_TEST_REQUIRED_DEP_PACKAGES +# _FORWARD_TEST_OPTIONAL_DEP_PACKAGES +# +# (where ```` are upstream dependencies of this package +# ``${PACKAGE_NAME}``). # # It also appends the list variable: # @@ -250,12 +266,11 @@ endmacro() # order and then this top-level package is appended and dependencies are # created for them. # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # macro(tribits_read_toplevel_package_deps_files_add_to_graph PACKAGE_NAME) - # A) Get ready to read in the contents of this package's Dependencies.cmake - # file + # A) Get ready to read in the contents of this this pakages's Dependencies.cmake file tribits_prep_to_read_dependencies(${PACKAGE_NAME}) @@ -294,7 +309,7 @@ macro(tribits_read_toplevel_package_deps_files_add_to_graph PACKAGE_NAME) # Append the subpackages to the dependencies list if this top-level package set(SUBPACKAGE_IDX 0) - foreach(TRIBITS_SUBPACKAGE IN LISTS ${PACKAGE_NAME}_SUBPACKAGES) + foreach(TRIBITS_SUBPACKAGE ${${PACKAGE_NAME}_SUBPACKAGES}) set(SUBPACKAGE_FULLNAME ${PACKAGE_NAME}${TRIBITS_SUBPACKAGE}) list(GET ${PACKAGE_NAME}_SUBPACKAGE_OPTREQ ${SUBPACKAGE_IDX} SUBPACKAGE_OPTREQ) list(APPEND LIB_${SUBPACKAGE_OPTREQ}_DEP_PACKAGES ${SUBPACKAGE_FULLNAME}) @@ -327,32 +342,49 @@ endmacro() # # It also sets to empty the forward dependency list vars: # -# * `${PACKAGE_NAME}_FORWARD_LIB_DEFINED_DEPENDENCIES`_ -# * `${PACKAGE_NAME}_FORWARD_TEST_DEFINED_DEPENDENCIES`_ +# * `${PACKAGE_NAME}_FORWARD_LIB_DEP_PACKAGES`_ +# * `${PACKAGE_NAME}_FORWARD_TEST_DEP_PACKAGES`_ +# +# for each of the forward/downstream in `Variables defining the package +# dependencies graph`_. +# +# See `Function call tree for constructing package dependency graph`_ +# +# **__Legacy variables:__** # -# for each of the forward/downstream package/dependency in `Variables defining -# the package dependencies graph`_. +# It also sets to empty the forward dependency list vars: +# +# _FORWARD_ # -# See `Function call tree for constructing package dependency graph`_. +# for each of the forward/downstream in `Legacy list variables defining the +# package dependencies graph`_. # macro(tribits_prep_to_read_dependencies PACKAGE_NAME_IN) # Initial vars that must be set in the Dependencies.cmake file + tribits_declare_undefined(LIB_REQUIRED_DEP_PACKAGES) tribits_declare_undefined(LIB_OPTIONAL_DEP_PACKAGES) tribits_declare_undefined(TEST_REQUIRED_DEP_PACKAGES) tribits_declare_undefined(TEST_OPTIONAL_DEP_PACKAGES) - tribits_declare_undefined(LIB_REQUIRED_DEP_TPLS) - tribits_declare_undefined(LIB_OPTIONAL_DEP_TPLS) - tribits_declare_undefined(TEST_REQUIRED_DEP_TPLS) - tribits_declare_undefined(TEST_OPTIONAL_DEP_TPLS) + tribits_declare_undefined(LIB_REQUIRED_DEP_TPLS "") + tribits_declare_undefined(LIB_OPTIONAL_DEP_TPLS "") + tribits_declare_undefined(TEST_REQUIRED_DEP_TPLS "") + tribits_declare_undefined(TEST_OPTIONAL_DEP_TPLS "") set(REGRESSION_EMAIL_LIST "") # Allow to be empty # Initialize other vars - set(${PACKAGE_NAME_IN}_FORWARD_LIB_DEFINED_DEPENDENCIES "") - set(${PACKAGE_NAME_IN}_FORWARD_TEST_DEFINED_DEPENDENCIES "") + + set(${PACKAGE_NAME_IN}_FORWARD_LIB_DEP_PACKAGES "") + set(${PACKAGE_NAME_IN}_FORWARD_TEST_DEP_PACKAGES "") + + # Legacy vars #63 + set(${PACKAGE_NAME_IN}_FORWARD_LIB_REQUIRED_DEP_PACKAGES "") + set(${PACKAGE_NAME_IN}_FORWARD_LIB_OPTIONAL_DEP_PACKAGES "") + set(${PACKAGE_NAME_IN}_FORWARD_TEST_REQUIRED_DEP_PACKAGES "") + set(${PACKAGE_NAME_IN}_FORWARD_TEST_OPTIONAL_DEP_PACKAGES "") endmacro() @@ -367,7 +399,7 @@ endmacro() # `tribits_package_define_dependencies()`_ in the file # `/cmake/Dependencies.cmake`_ have been set. # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # macro(tribits_assert_read_dependency_vars PACKAGE_NAME) @@ -392,7 +424,7 @@ endmacro() # # Saves off package dependency variables with variable suffix ``_``. # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # macro(tribits_save_off_dependency_vars POSTFIX) @@ -418,7 +450,7 @@ endmacro() # Read back the local package dependency vars from the saved-off vars with # suffix ``_``. # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # macro(tribits_read_back_dependencies_vars POSTFIX) @@ -441,56 +473,46 @@ endmacro() # # tribits_process_package_dependencies_lists() # -# Sets up the upstream/backward and downstream/forward package dependency list -# variables for ```` described in `Variables defining the package -# dependencies graph`_. Note that the downstream/forward dependencies of -# upstream packages for this package ```` are built up -# incrementally. (The forward dependency list vars are initialized to empty -# in `tribits_prep_to_read_dependencies()`_.) +# Sets up the upstream and downstream/forward package dependency list +# variables for ```` described in `Legacy list variables defining +# the package dependencies graph`_. Note that the downstream/forward +# dependencies of upstream packages on this package ```` are +# built up incrementally. # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # -macro(tribits_process_package_dependencies_lists packageName) - - # Initialize backward dep vars - set(${packageName}_LIB_DEFINED_DEPENDENCIES "") - set(${packageName}_TEST_DEFINED_DEPENDENCIES "") - - # Fill the backward dependency vars - tribits_set_dep_packages(${packageName} LIB REQUIRED PACKAGES) - tribits_set_dep_packages(${packageName} LIB OPTIONAL PACKAGES) - tribits_set_dep_packages(${packageName} LIB REQUIRED TPLS) - tribits_set_dep_packages(${packageName} LIB OPTIONAL TPLS) - tribits_set_dep_packages(${packageName} TEST REQUIRED PACKAGES) - tribits_set_dep_packages(${packageName} TEST OPTIONAL PACKAGES) - tribits_set_dep_packages(${packageName} TEST REQUIRED TPLS) - tribits_set_dep_packages(${packageName} TEST OPTIONAL TPLS) - - # Fill forward deps lists #63 - tribits_append_forward_dep_packages(${packageName} LIB) - tribits_append_forward_dep_packages(${packageName} TEST) +macro(tribits_process_package_dependencies_lists PACKAGE_NAME) + + tribits_set_dep_packages(${PACKAGE_NAME} LIB REQUIRED) + tribits_set_dep_packages(${PACKAGE_NAME} LIB OPTIONAL) + tribits_set_dep_packages(${PACKAGE_NAME} TEST REQUIRED) + tribits_set_dep_packages(${PACKAGE_NAME} TEST OPTIONAL) + + set(${PACKAGE_NAME}_LIB_REQUIRED_DEP_TPLS ${LIB_REQUIRED_DEP_TPLS}) + set(${PACKAGE_NAME}_LIB_OPTIONAL_DEP_TPLS ${LIB_OPTIONAL_DEP_TPLS}) + set(${PACKAGE_NAME}_TEST_REQUIRED_DEP_TPLS ${TEST_REQUIRED_DEP_TPLS}) + set(${PACKAGE_NAME}_TEST_OPTIONAL_DEP_TPLS ${TEST_OPTIONAL_DEP_TPLS}) + + tribits_append_forward_dep_packages(${PACKAGE_NAME} LIB_REQUIRED_DEP_PACKAGES) + tribits_append_forward_dep_packages(${PACKAGE_NAME} LIB_OPTIONAL_DEP_PACKAGES) + tribits_append_forward_dep_packages(${PACKAGE_NAME} TEST_REQUIRED_DEP_PACKAGES) + tribits_append_forward_dep_packages(${PACKAGE_NAME} TEST_OPTIONAL_DEP_PACKAGES) endmacro() -# @MACRO: tribits_set_dep_packages() -# -# Macro set up backward package dependency lists for a given package given the -# vars read in from the macro `tribits_package_define_dependencies()`_. +# @FUNCTION: tribits_set_dep_packages() # # Usage:: # -# tribits_set_dep_packages( ) -# -# where: -# -# * ````: ``LIB`` or ``TEST`` -# * ````: ``REQUIRED`` or ``OPTIONAL`` -# * ````: ``PACKAGES`` or ``TPLS`` +# tribits_set_dep_packages( LIB|TEST REQUIRED|OPTIONAL) # +# Function that helps to set up backward package dependency lists for a given +# package given the vars read in from the macro +# `tribits_package_define_dependencies()`_. # # Sets the upstream/backward dependency variables defined in the section -# `Variables defining the package dependencies graph`_. +# `Legacy list variables defining the package dependencies graph`_. # # This also handles the several types of issues: # @@ -501,149 +523,124 @@ endmacro() # `tribits_abort_on_missing_package()`_ or allow to be missing and disable # this package if this is a required dependency). # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # -macro(tribits_set_dep_packages packageName testOrLib requiredOrOptional pkgsOrTpls) +function(tribits_set_dep_packages PACKAGE_NAME LIB_OR_TEST REQUIRED_OR_OPTIONAL) + + if (TRIBITS_SET_DEP_PACKAGES_DEBUG_DUMP) + message("\nTRIBITS_SET_DEP_PACKAGES: ${PACKAGE_NAME} ${LIB_OR_TEST} ${REQUIRED_OR_OPTIONAL})") + endif() - set(inputListType ${testOrLib}_${requiredOrOptional}_DEP_${pkgsOrTpls}) - set(packageEnableVar ${PROJECT_NAME}_ENABLE_${packageName}) + set(LIST_TYPE ${LIB_OR_TEST}_${REQUIRED_OR_OPTIONAL}_DEP_PACKAGES) + set(PACKAGE_DEPS_LIST "") + set(PACKAGE_ENABLE_VAR ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}) - foreach(depPkg IN LISTS ${inputListType}) - if (${depPkg} STREQUAL ${packageName}) - tribits_abort_on_self_dep("${packageName}" "${inputListType}") + foreach(DEP_PKG ${${LIST_TYPE}}) + if (TRIBITS_SET_DEP_PACKAGES_DEBUG_DUMP) + print_var(DEP_PKG) + endif() + if (${DEP_PKG} STREQUAL ${PACKAGE_NAME}) + tribits_abort_on_self_dep("${PACKAGE_NAME}" "${LIST_TYPE}") + endif() + if (${DEP_PKG}_SOURCE_DIR) + set(DEP_PKG_DEFINED_AND_EXISTS TRUE) + else() + set(DEP_PKG_DEFINED_AND_EXISTS FALSE) + endif() + if (TRIBITS_SET_DEP_PACKAGES_DEBUG_DUMP) + print_var(DEP_PKG_DEFINED_AND_EXISTS) endif() - tribits_is_pkg_defined(${depPkg} ${pkgsOrTpls} depPkgIsDefined) - if (depPkgIsDefined) - list(APPEND ${packageName}_${testOrLib}_DEFINED_DEPENDENCIES ${depPkg}) - if ("${requiredOrOptional}" STREQUAL "REQUIRED") - global_set(${packageName}_${testOrLib}_DEP_REQUIRED_${depPkg} TRUE) - elseif ("${requiredOrOptional}" STREQUAL "OPTIONAL") - global_set(${packageName}_${testOrLib}_DEP_REQUIRED_${depPkg} FALSE) + if (DEP_PKG_DEFINED_AND_EXISTS) + list(APPEND PACKAGE_DEPS_LIST ${DEP_PKG}) + else() + if (${PROJECT_NAME}_ASSERT_MISSING_PACKAGES + AND NOT ${DEP_PKG}_ALLOW_MISSING_EXTERNAL_PACKAGE + ) + tribits_abort_on_missing_package( + "${DEP_PKG}" "${PACKAGE_NAME}" "${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES") else() - message(FATAL_ERROR - "Invalid value for requiredOrOptional='${requiredOrOptional}'!") + if (${DEP_PKG}_ALLOW_MISSING_EXTERNAL_PACKAGE) + if (${PROJECT_NAME}_WARN_ABOUT_MISSING_EXTERNAL_PACKAGES) + message_wrapper("NOTE: ${DEP_PKG} is being ignored since its directory" + " is missing and ${DEP_PKG}_ALLOW_MISSING_EXTERNAL_PACKAGE =" + " ${${DEP_PKG}_ALLOW_MISSING_EXTERNAL_PACKAGE}!") + endif() + if (REQUIRED_OR_OPTIONAL STREQUAL "REQUIRED") + message_wrapper("NOTE: Setting ${PACKAGE_ENABLE_VAR}=OFF because" + " package ${PACKAGE_NAME} has a required dependency on missing" + " package ${DEP_PKG}!") + dual_scope_set(${PACKAGE_ENABLE_VAR} OFF) + endif() + endif() + if (${PROJECT_NAME}_VERBOSE_CONFIGURE) + message( + "\n***" + "\n*** NOTE: The package ${DEP_PKG} which is a dependent package of" + " ${PACKAGE_NAME} being ignored because ${DEP_PKG} is missing!" + "\n***\n" ) + endif() + # Must set enable vars for missing package to off so that logic in + # existing downstream packages that key off of these vars will still + # work. + dual_scope_set(${PROJECT_NAME}_ENABLE_${DEP_PKG} OFF) + dual_scope_set(${PACKAGE_NAME}_ENABLE_${DEP_PKG} OFF) endif() - else() - tribits_set_dep_packages__handle_undefined_pkg(${packageName} ${depPkg} - ${requiredOrOptional} ${pkgsOrTpls} ${packageEnableVar}) endif() endforeach() -endmacro() + #print_var(PACKAGE_DEPS_LIST) + global_set(${PACKAGE_NAME}_${LIST_TYPE} ${PACKAGE_DEPS_LIST}) -# Determine if a (internal or external) package is defined or not -# -function(tribits_is_pkg_defined depPkg pkgsOrTpls depPkgIsDefinedOut) - set(depPkgIsDefined FALSE) - if (pkgsOrTpls STREQUAL "PACKAGES") - if (${depPkg}_SOURCE_DIR) - set(depPkgIsDefined TRUE) - endif() - elseif(pkgsOrTpls STREQUAL "TPLS") - if (${depPkg}_FINDMOD) - set(depPkgIsDefined TRUE) - endif() - else() - message(FATAL_ERROR "Invalid value for pkgsOrTpls = '${pkgsOrTpls}'") - endif() - set(${depPkgIsDefinedOut} ${depPkgIsDefined} PARENT_SCOPE) endfunction() -# Implementation macro for tribits_set_dep_packages() to deal with a package -# that is not defined by TriBITS. +# @FUNCTION: tribits_append_forward_dep_packages() # -# ToDo #63: This may need to be modified when dealing with TriBITS-compatible -# packages already installed out on the system. We may need a mode where we -# don't assert packages that are not defined but instead just assume they are -# TriBITS-compatible packages already installed. -# -macro(tribits_set_dep_packages__handle_undefined_pkg packageName depPkg - requiredOrOptional pkgsOrTpls packageEnableVar - ) - # Determine if it is allowed for this depPkg to not be defined - set(errorOutForUndefinedDepPkg TRUE) - if (${depPkg}_ALLOW_MISSING_EXTERNAL_PACKAGE) - set(errorOutForUndefinedDepPkg FALSE) - elseif (NOT ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES IN_LIST - ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST - ) - set(errorOutForUndefinedDepPkg FALSE) - endif() - # Produce error or deal with allowed undefined ${depPkg} - if (errorOutForUndefinedDepPkg) - tribits_abort_on_missing_package("${depPkg}" "${packageName}") - else() - if (${depPkg}_ALLOW_MISSING_EXTERNAL_PACKAGE) - if (${PROJECT_NAME}_WARN_ABOUT_MISSING_EXTERNAL_PACKAGES) - message_wrapper("NOTE: ${depPkg} is being ignored since its directory" - " is missing and ${depPkg}_ALLOW_MISSING_EXTERNAL_PACKAGE =" - " ${${depPkg}_ALLOW_MISSING_EXTERNAL_PACKAGE}!") - endif() - if ("${requiredOrOptional}" STREQUAL "REQUIRED") - message_wrapper("NOTE: Setting ${packageEnableVar}=OFF because" - " package ${packageName} has a required dependency on missing" - " package ${depPkg}!") - set(${packageEnableVar} OFF) - endif() - endif() - # Must set enable vars for missing package to off so that logic in - # existing downstream packages that key off of these vars will still - # work. - set(${PROJECT_NAME}_ENABLE_${depPkg} OFF) - set(${packageName}_ENABLE_${depPkg} OFF) - endif() -endmacro() - - -# @MACRO: tribits_append_forward_dep_packages() +# Usage: tribits_append_forward_dep_packages( ) # -# Appends forward/downstream package dependency lists for the upstream -# dependent package list provided. -# -# Usage:: -# -# tribits_append_forward_dep_packages( ) -# -# In particular, it appends the var:: +# Function that helps to set up forward package dependency lists for an +# upstream package given that a downstream package declared a dependency on +# it. In particular, it appends the var:: # # _FORWARD_ # -# for one of the vars listed in `Variables defining the package dependencies -# graph`_. +# for one of the vars listed in `Legacy list variables defining the package +# dependencies graph`_. # # This function is called multiple times to build up the forward package # dependencies for a given ```` by the downstream packages that # declare dependencies on it. # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # -macro(tribits_append_forward_dep_packages packageName libOrTest) +function(tribits_append_forward_dep_packages PACKAGE_NAME LIST_TYPE) - foreach(depPkg IN LISTS ${packageName}_${libOrTest}_DEFINED_DEPENDENCIES) - set(fwdDepPkgListName ${depPkg}_FORWARD_${libOrTest}_DEFINED_DEPENDENCIES) - if (DEFINED ${fwdDepPkgListName}) - list(APPEND ${fwdDepPkgListName} ${packageName}) - else() - if (${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES IN_LIST - ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST - ) - tribits_abort_on_missing_package(${depPkg} ${packageName}) + set(DEP_PKG_LIST_NAME "${PACKAGE_NAME}_${LIST_TYPE}") + + assert_defined(${PROJECT_NAME}_ASSERT_MISSING_PACKAGES) + foreach(DEP_PKG ${${DEP_PKG_LIST_NAME}}) + set(FWD_DEP_PKG_LIST_NAME "${DEP_PKG}_FORWARD_${LIST_TYPE}") + if (NOT DEFINED ${FWD_DEP_PKG_LIST_NAME}) + if (${PROJECT_NAME}_ASSERT_MISSING_PACKAGES) + tribits_abort_on_missing_package(${DEP_PKG} ${PACKAGE_NAME} ${DEP_PKG_LIST_NAME}) else() if (${PROJECT_NAME}_VERBOSE_CONFIGURE) message( "\n***" - "\n*** NOTE: The package ${depPkg} has forward dependent package" - " ${packageName}, but that dependency is being ignored because the package" - " ${depPkg} is missing!" + "\n*** NOTE: The package ${DEP_PKG} has forward dependent package" + " ${PACKAGE_NAME}, but that dependency is being ignored because the package" + " ${DEP_PKG} is missing!" "\n***\n" ) endif() endif() + else() + set(${FWD_DEP_PKG_LIST_NAME} ${${FWD_DEP_PKG_LIST_NAME}} ${PACKAGE_NAME} + PARENT_SCOPE) endif() endforeach() -endmacro() +endfunction() # @MACRO: tribits_set_package_regression_email_list() @@ -655,9 +652,9 @@ endmacro() # Macro that sets a pacakge's regression email address # ``${PACKAGE_NAME}_REGRESSION_EMAIL_LIST`` as described in ???. # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # -macro(tribits_set_package_regression_email_list PACKAGE_NAME) +macro(tribits_set_package_regression_email_list PACKAGE_NAME) # Lower-case package name To be used with auto email naming based on base email address string(TOLOWER "${PACKAGE_NAME}" LPACKAGE) @@ -666,6 +663,7 @@ macro(tribits_set_package_regression_email_list PACKAGE_NAME) endif() tribits_get_repo_name(${${PACKAGE_NAME}_PARENT_REPOSITORY} REPOSITORY_NAME) + #print_var(REPOSITORY_NAME) if(${REPOSITORY_NAME}_REPOSITORY_OVERRIDE_PACKAGE_EMAIL_LIST) set(${PACKAGE_NAME}_REGRESSION_EMAIL_LIST @@ -699,28 +697,25 @@ endmacro() # # Usage:: # -# tribits_abort_on_missing_package( ) +# tribits_abort_on_missing_package( ) # # Function that creates error message about missing/misspelled package. This # error message also suggests that the package might be defining an upstream # dependency on a downstream dependency (i.e. a circular dependency). # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # -function(tribits_abort_on_missing_package depPkg packageName) +function(tribits_abort_on_missing_package DEP_PKG PACKAGE_NAME DEP_PKG_LIST_NAME) multiline_set(ERRMSG - "Error, the package '${depPkg}' is listed as a dependency of the package" - " '${packageName}' but the package '${depPkg}' is either not defined or" - " is listed later in the package order." + "Error, the package '${DEP_PKG}' is listed as a dependency of the package" + " '${PACKAGE_NAME}' is in the list '${DEP_PKG_LIST_NAME}' but the package" + " '${DEP_PKG}' is either not defined or is listed later in the package order." " This may also be an attempt to create a circular dependency between" - " the packages '${depPkg}' and '${packageName}' (which is not allowed)." - " Check the spelling of '${depPkg}' or see how it is listed in" + " the packages '${DEP_PKG}' and '${PACKAGE_NAME}' (which is not allowed)." + " Check the spelling of '${DEP_PKG}' or see how it is listed in" " a call to tribits_repository_define_packages() in relation to" - " '${packageName}'." - " To ignore/disable the undefined package '${depPkg}', set the cache" - " variable ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES=IGNORE." - ) - message(${${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES} "${ERRMSG}") + " '${PACKAGE_NAME}'.") + message(FATAL_ERROR ${ERRMSG}) endfunction() @@ -733,7 +728,7 @@ endfunction() # Prints a fatal error message for an attempt for a self dependency # declaration and which list it comes from. # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # function(tribits_abort_on_self_dep PACKAGE_NAME DEP_PKG_LIST_NAME) multiline_set(ERRMSG @@ -752,15 +747,14 @@ endfunction() # # Usage:: # -# tribits_parse_subpackages_append_packages_add_options() +# tribits_parse_subpackages_append_packages_add_options() # # Macro that parses the read-in variable # ``SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS`` set by the macro # `tribits_package_define_dependencies()`_ , adds subpackages to the list of # defined packages, and defines user cache var options for those subpackages. # -# This sets the list variables for the parent package -# ````:: +# This sets the list variables for the parent package ````:: # # _SUBPACKAGES # _SUBPACKAGE_DIRS @@ -773,102 +767,108 @@ endfunction() # _PARENT_PACKAGE # _PARENT_REPOSITORY # -# And it appends each subpackage to the list variable: +# And it appends for each subpackage to variable: # # * `${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES`_ # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # -macro(tribits_parse_subpackages_append_packages_add_options parentPackageName) +macro(tribits_parse_subpackages_append_packages_add_options + PACKAGE_NAME + ) - # Fields in the list var SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS + # Structure of SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS set(SPDC_SP_NAME_OFFSET 0) set(SPDC_SP_DIR_OFFSET 1) set(SPDC_SP_CLASSIFICATION_OFFSET 2) set(SPDC_SP_OPTREQ_OFFSET 3) - set(SPDC_NUM_FIELDS 4) # Number of the above files + set(SPDC_NUM_FIELDS 4) - set(${parentPackageName}_SUBPACKAGES "") - set(${parentPackageName}_SUBPACKAGE_DIRS "") - set(${parentPackageName}_SUBPACKAGE_OPTREQ "") + set(${PACKAGE_NAME}_SUBPACKAGES "") + set(${PACKAGE_NAME}_SUBPACKAGE_DIRS "") + set(${PACKAGE_NAME}_SUBPACKAGE_OPTREQ "") if (SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS) - list(LENGTH SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS SPDC_TOTAL_LENGTH) - math(EXPR numSubpackages "${SPDC_TOTAL_LENGTH}/${SPDC_NUM_FIELDS}") - math(EXPR subpackagesLastIdx "${numSubpackages}-1") + list(LENGTH SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS SPDC_TOTAL_LENGTH) + math(EXPR NUM_SUBPACKAGES "${SPDC_TOTAL_LENGTH}/${SPDC_NUM_FIELDS}") + math(EXPR SUBPACKAGES_LAST_IDX "${NUM_SUBPACKAGES}-1") + + foreach(SUBPACKAGE_IDX RANGE ${SUBPACKAGES_LAST_IDX}) - foreach(SUBPACKAGE_IDX RANGE ${subpackagesLastIdx}) + #message("") + #print_var(SUBPACKAGE_IDX) - # subpkgName - math(EXPR subpkgNameIdx + # SUBPACKAGE_NAME + math(EXPR SUBPACKAGE_NAME_IDX "${SUBPACKAGE_IDX}*${SPDC_NUM_FIELDS}+${SPDC_SP_NAME_OFFSET}") - list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${subpkgNameIdx} subpkgName) + list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${SUBPACKAGE_NAME_IDX} + SUBPACKAGE_NAME ) - # subpkgFullname - set(subpkgFullname ${parentPackageName}${subpkgName}) + set(SUBPACKAGE_FULLNAME ${PACKAGE_NAME}${SUBPACKAGE_NAME}) - # subpkgDir - math(EXPR subpkgDirIdx + # SUBPACKAGE_DIR + math(EXPR SUBPACKAGE_DIR_IDX "${SUBPACKAGE_IDX}*${SPDC_NUM_FIELDS}+${SPDC_SP_DIR_OFFSET}") - list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${subpkgDirIdx} subpkgDir) + list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${SUBPACKAGE_DIR_IDX} + SUBPACKAGE_DIR ) - # subpkgClassification - math(EXPR subpkgClassificationIdx + # SUBPACKAGE_CLASSIFICATION + math(EXPR SUBPACKAGE_CLASSIFICATION_IDX "${SUBPACKAGE_IDX}*${SPDC_NUM_FIELDS}+${SPDC_SP_CLASSIFICATION_OFFSET}") - list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${subpkgClassificationIdx} - subpkgClassification ) + list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${SUBPACKAGE_CLASSIFICATION_IDX} + SUBPACKAGE_CLASSIFICATION ) # ToDo: Parse out TESTGROUP and MATURITYLEVEL (Trilinos #6042) - set(subpkgTestgroup ${subpkgClassification}) + set(SUBPACKAGE_TESTGROUP ${SUBPACKAGE_CLASSIFICATION}) - tribits_update_ps_pt_ss_st(Subpackage ${subpkgFullname} subpkgTestgroup) + tribits_update_ps_pt_ss_st(Subpackage ${SUBPACKAGE_FULLNAME} SUBPACKAGE_TESTGROUP) - # subpkgOptreq - math(EXPR subpkgOptreqIdx + # SUBPACKAGE_OPTREQ + math(EXPR SUBPACKAGE_OPTREQ_IDX "${SUBPACKAGE_IDX}*${SPDC_NUM_FIELDS}+${SPDC_SP_OPTREQ_OFFSET}") - list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${subpkgOptreqIdx} - subpkgOptreq ) + list(GET SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS ${SUBPACKAGE_OPTREQ_IDX} + SUBPACKAGE_OPTREQ ) # Determine if this subpackage exists - set(subpkgFullSrcDir - "${PROJECT_SOURCE_DIR}/${${parentPackageName}_REL_SOURCE_DIR}/${subpkgDir}") - if (EXISTS "${subpkgFullSrcDir}") - set(subpkgExists TRUE) + set(SUBPACKAGE_FULL_SOURCE_DIR + ${PROJECT_SOURCE_DIR}/${${PACKAGE_NAME}_REL_SOURCE_DIR}/${SUBPACKAGE_DIR}) + if (EXISTS ${SUBPACKAGE_FULL_SOURCE_DIR}) + set(SUBPACKAGE_EXISTS TRUE) else() - set(subpkgExists FALSE) + set(SUBPACKAGE_EXISTS FALSE) endif() - if (NOT subpkgExists AND ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES IN_LIST - ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST - ) - message(SEND_ERROR "ERROR: Subpackage dir '${subpkgFullSrcDir}' is missing!") + if (NOT SUBPACKAGE_EXISTS AND ${PROJECT_NAME}_ASSERT_MISSING_PACKAGES) + message(SEND_ERROR "ERROR: Subpackage dir '${SUBPACKAGE_FULL_SOURCE_DIR}'" + " is missing!") endif() # Append to lists and global variables - if (subpkgExists) + if (SUBPACKAGE_EXISTS) - list(APPEND ${parentPackageName}_SUBPACKAGES ${subpkgName}) - list(APPEND ${parentPackageName}_SUBPACKAGE_DIRS ${subpkgDir}) - list(APPEND ${parentPackageName}_SUBPACKAGE_OPTREQ ${subpkgOptreq}) - list(APPEND ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${subpkgFullname}) - set(${subpkgFullname}_SOURCE_DIR "${subpkgFullSrcDir}") - set(${subpkgFullname}_REL_SOURCE_DIR - "${${parentPackageName}_REL_SOURCE_DIR}/${subpkgDir}") - set(${subpkgFullname}_PARENT_PACKAGE ${parentPackageName}) - set(${subpkgFullname}_PARENT_REPOSITORY - ${${parentPackageName}_PARENT_REPOSITORY}) + list(APPEND ${PACKAGE_NAME}_SUBPACKAGES ${SUBPACKAGE_NAME}) + list(APPEND ${PACKAGE_NAME}_SUBPACKAGE_DIRS ${SUBPACKAGE_DIR}) + list(APPEND ${PACKAGE_NAME}_SUBPACKAGE_OPTREQ ${SUBPACKAGE_OPTREQ}) + list(APPEND ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES ${SUBPACKAGE_FULLNAME}) + set(${SUBPACKAGE_FULLNAME}_SOURCE_DIR "${SUBPACKAGE_FULL_SOURCE_DIR}") + set(${SUBPACKAGE_FULLNAME}_REL_SOURCE_DIR + "${${PACKAGE_NAME}_REL_SOURCE_DIR}/${SUBPACKAGE_DIR}") + set(${SUBPACKAGE_FULLNAME}_PARENT_PACKAGE ${PACKAGE_NAME}) + set(${SUBPACKAGE_FULLNAME}_PARENT_REPOSITORY + ${${PACKAGE_NAME}_PARENT_REPOSITORY}) if (${PROJECT_NAME}_VERBOSE_CONFIGURE) - print_var(${subpkgFullname}_PARENT_PACKAGE) - print_var(${subpkgFullname}_PARENT_REPOSITORY) + print_var(${SUBPACKAGE_FULLNAME}_PARENT_PACKAGE) + print_var(${SUBPACKAGE_FULLNAME}_PARENT_REPOSITORY) endif() - set(${subpkgFullname}_PACKAGE_BUILD_STATUS INTERNAL) + set(${SUBPACKAGE_FULLNAME}_PACKAGE_BUILD_STATUS INTERNAL) # Set up the input options for this subpackage - tribits_insert_standard_package_options(${subpkgFullname} ${subpkgTestgroup}) + tribits_insert_standard_package_options(${SUBPACKAGE_FULLNAME} + ${SUBPACKAGE_TESTGROUP}) endif() @@ -876,6 +876,9 @@ macro(tribits_parse_subpackages_append_packages_add_options parentPackageName) endif() + #print_var(${PACKAGE_NAME}_SUBPACKAGES) + #print_var(${PACKAGE_NAME}_SUBPACKAGE_OPTREQ) + endmacro() @@ -888,12 +891,16 @@ endmacro() # Read in subpackages dependencies files and add to dependencies graph # variables. # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # macro(tribits_read_package_subpackage_deps_files_add_to_graph PACKAGE_NAME) + #message("TRIBITS_READ_PACKAGE_SUBPACKAGE_DEPS_FILES_ADD_TO_GRAPH: ${PACKAGE_NAME}") + + #print_var(${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES) + set(SUBPACKAGE_IDX 0) - foreach(TRIBITS_SUBPACKAGE IN LISTS ${PACKAGE_NAME}_SUBPACKAGES) + foreach(TRIBITS_SUBPACKAGE ${${PACKAGE_NAME}_SUBPACKAGES}) list(GET ${PACKAGE_NAME}_SUBPACKAGE_DIRS ${SUBPACKAGE_IDX} SUBPACKAGE_DIR) tribits_read_subpackage_deps_file_add_to_graph(${TRIBITS_PACKAGE} ${TRIBITS_SUBPACKAGE} ${SUBPACKAGE_DIR}) @@ -914,12 +921,14 @@ endmacro() # `//cmake/Dependencies.cmake`_ and sets up the # dependency structure for it. # -# See `Function call tree for constructing package dependency graph`_. +# See `Function call tree for constructing package dependency graph`_ # macro(tribits_read_subpackage_deps_file_add_to_graph PACKAGE_NAME SUBPACKAGE_NAME SUBPACKAGE_DIR ) + #message("TRIBITS_READ_SUBPACKAGE_DEPS_FILE_ADD_TO_GRAPH: ${PACKAGE_NAME} ${SUBPACKAGE_NAME} ${SUBPACKAGE_DIR}") + set(SUBPACKAGE_FULLNAME ${PACKAGE_NAME}${SUBPACKAGE_NAME}) # @@ -949,9 +958,7 @@ macro(tribits_read_subpackage_deps_file_add_to_graph PACKAGE_NAME set(SUBPACKAGE_EXISTS FALSE) endif() - if (SUBPACKAGE_EXISTS OR ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES IN_LIST - ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST - ) + if (SUBPACKAGE_EXISTS OR ${PROJECT_NAME}_ASSERT_MISSING_PACKAGES) tribits_trace_file_processing(PACKAGE INCLUDE "${SUBPAKCAGE_DEPENDENCIES_FILE}") include(${SUBPAKCAGE_DEPENDENCIES_FILE}) diff --git a/cmake/tribits/core/package_arch/TribitsReportInvalidTribitsUsage.cmake b/cmake/tribits/core/package_arch/TribitsReportInvalidTribitsUsage.cmake index 0a40deaa928e..442a4928fbcd 100644 --- a/cmake/tribits/core/package_arch/TribitsReportInvalidTribitsUsage.cmake +++ b/cmake/tribits/core/package_arch/TribitsReportInvalidTribitsUsage.cmake @@ -53,7 +53,6 @@ include(MessageWrapper) # * FATAL_ERROR: Calls message(FATAL_ERROR "") # * SEND_ERROR: Calls message(SEND_ERROR "") # * WARNING: Calls message(WARNING "") -# * NOTICE: Calls message(NOTICE "") # * IGNORE: Does not call message() at all and is silent # # If '${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE}' is empty on call, then @@ -61,14 +60,24 @@ include(MessageWrapper) # function(tribits_report_invalid_tribits_usage) if ("${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE}" STREQUAL "") - set(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE FATAL_ERROR) + set(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE FATAL_ERROR) endif() - set(printErrMsgMode ${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE}) - set(ignoreValues "IGNORE" "OFF") - if(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE IN_LIST ignoreValues) - set(printErrMsgMode "") + set(PRINT_ERR_MSG) + if (${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE STREQUAL "FATAL_ERROR") + set(PRINT_ERR_MSG FATAL_ERROR) + elseif (${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE STREQUAL "SEND_ERROR") + set(PRINT_ERR_MSG SEND_ERROR) + elseif (${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE STREQUAL "WARNING") + set(PRINT_ERR_MSG WARNING) + elseif (${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE STREQUAL "IGNORE") + set(PRINT_ERR_MSG) + else() + message_wrapper(FATAL_ERROR "Error, invalid value for" + " ${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE =" + " '${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE}'!" + " Value values include 'FATAL_ERROR', 'SEND_ERROR', 'WARNING', and 'IGNORE'!") endif() - if (printErrMsgMode) - message_wrapper(${printErrMsgMode} ${ARGN}) + if (PRINT_ERR_MSG) + message_wrapper(${PRINT_ERR_MSG} ${ARGN}) endif() endfunction() diff --git a/cmake/tribits/core/package_arch/TribitsSetAndIncDirs.cmake b/cmake/tribits/core/package_arch/TribitsSetAndIncDirs.cmake deleted file mode 100644 index 55991e4fdb63..000000000000 --- a/cmake/tribits/core/package_arch/TribitsSetAndIncDirs.cmake +++ /dev/null @@ -1,66 +0,0 @@ -# @HEADER -# ************************************************************************ -# -# TriBITS: Tribal Build, Integrate, and Test System -# Copyright 2013 Sandia Corporation -# -# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -# the U.S. Government retains certain rights in this software. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the Corporation nor the names of the -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# ************************************************************************ -# @HEADER - - -# @MACRO: tribits_set_and_inc_dirs() -# -# Set a variable to an include directory and call -# `tribits_include_directories()`_ (removes boiler-plate code). -# -# Usage: -# -# tribits_set_and_inc_dirs( ) -# -# On output, this sets ```` to ```` in the local scope -# and calls ``tribits_include_directories()``. -# -macro(tribits_set_and_inc_dirs dirVarName includeDir) - set(${dirVarName} ${includeDir}) - tribits_include_directories(${${dirVarName}}) -endmacro() - - -# Deprecated! Use tribits_set_and_inc_dirs() instead! -# -macro(set_and_inc_dirs DIR_VAR_NAME INCLUDE_DIR) - tribits_deprecated_command(set_and_inc_dirs - MESSAGE "Use tribits_set_and_inc_dirs() instead." ) - set(${DIR_VAR_NAME} ${INCLUDE_DIR}) - tribits_include_directories(${${DIR_VAR_NAME}}) -endmacro() diff --git a/cmake/tribits/core/package_arch/TribitsSetUpEnabledOnlyDependencies.cmake b/cmake/tribits/core/package_arch/TribitsSetUpEnabledOnlyDependencies.cmake deleted file mode 100644 index 9e5900114bc0..000000000000 --- a/cmake/tribits/core/package_arch/TribitsSetUpEnabledOnlyDependencies.cmake +++ /dev/null @@ -1,237 +0,0 @@ -# @HEADER -# ************************************************************************ -# -# TriBITS: Tribal Build, Integrate, and Test System -# Copyright 2013 Sandia Corporation -# -# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -# the U.S. Government retains certain rights in this software. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the Corporation nor the names of the -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# ************************************************************************ -# @HEADER - -include(TribitsDeprecatedHelpers) - - -# Function that creates enable-only dependency data-structures -# -# For each enabled package ``, this function sets up the global list -# var:: -# -# _FULL_ENABLED_DEP_PACKAGES -# -# If ``${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES`` is -# set, then ``_FULL_ENABLED_DEP_PACKAGES`` will only be sets for -# those packages. Otherwise, ``_FULL_ENABLED_DEP_PACKAGES`` will be -# set for all packages listed in `${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES`_. -# -# NOTE: The modern TriBITS implementation does not need this full list of -# dependencies for each package. Only the function -# `tribits_find_most_recent_file_timestamp()` needs this. (Therefore, this -# could not be striped out of TriBITS because there are still some projects -# that use this function.) -# -function(tribits_set_up_enabled_only_dependencies) - - set(GENERATE_EXPORT_DEPENDENCIES ${${PROJECT_NAME}_GENERATE_EXPORT_FILE_DEPENDENCIES}) - if ("${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES}" STREQUAL "" - AND NOT - "${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES}" STREQUAL "" - ) - tribits_deprecated( - "The cache var" - " ${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES" - "='${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES}'" - " is deprecated! Please instead set" - " ${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES" - "='${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES}'") - set(${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES - ${${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_SE_PACKAGES} ) - endif() - - # Determine lastExportTribitsPackage if not to generate any of these full - # dependency lists - set(lastExportTribitsPackage "") - if (GENERATE_EXPORT_DEPENDENCIES - AND ${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES - ) - # Find the last enabled package for which an export file is requested. - set(LAST_PKG_IDX -1) - set(LAST_PKG) - foreach(tribitsPkg IN LISTS - ${PROJECT_NAME}_GENERATE_EXPORT_FILES_FOR_ONLY_LISTED_PACKAGES - ) - set(PKG_IDX ${${tribitsPkg}_PKG_IDX}) - if (NOT "${PKG_IDX}" STREQUAL "") - # The listed package is enabled so we will consider it - if (PKG_IDX GREATER ${LAST_PKG_IDX}) - set(LAST_PKG_IDX ${PKG_IDX}) - set(LAST_PKG ${tribitsPkg}) - endif() - endif() - endforeach() - if (LAST_PKG) - # At least one listed package was enabled - set(lastExportTribitsPackage ${LAST_PKG}) - else() - # None of the listed packages were enabled so don't bother generating - # any export dependencies - set(GENERATE_EXPORT_DEPENDENCIES FALSE) - endif() - - endif() - - if (GENERATE_EXPORT_DEPENDENCIES) - - if (lastExportTribitsPackage) - message("\nSetting up export dependencies up through ${lastExportTribitsPackage} ...\n") - else() - message("\nSetting up export dependencies for all enabled packages ...\n") - endif() - - foreach(tribitsPackage IN LISTS ${PROJECT_NAME}_ENABLED_INTERNAL_PACKAGES) - tribits_package_set_full_enabled_dep_packages(${tribitsPackage}) - if (${PROJECT_NAME}_DUMP_PACKAGE_DEPENDENCIES) - set(printedVar FALSE) - print_nonempty_var_with_spaces(${tribitsPackage}_FULL_ENABLED_DEP_PACKAGES - printedVar) - if (NOT printedVar) - message("-- ${tribitsPackage}: No library dependencies!") - endif() - endif() - if ("${lastExportTribitsPackage}" STREQUAL "${tribitsPackage}") - break() - endif() - endforeach() - - endif() - -endfunction() - - -# Function that sets up the full package dependencies for the given *internal* -# enabled package ``${packageName}``, including all of its indirect upstream -# *internal* package dependencies. -# -# After running, this function sets the internal cache var: -# -# * ``${packageName}_FULL_ENABLED_DEP_PACKAGES`` -# -# NOTE: This function must be called for all of the upstream internal packages -# before calling it for this package. -# -# NOTE: The complexity of this function is O(^2) due to the -# sorting algorithm. That is why it would be good to get rid of this function -# at some point (or refactor it to have a better complexity). -# -function(tribits_package_set_full_enabled_dep_packages packageName) - - tribits_package_build_unsorted_full_enabled_dep_packages(${packageName} - packageFullDepsList) - - tribits_package_sort_full_enabled_dep_packages(packageFullDepsList - orderedPackageFullDepsList) - - global_set(${packageName}_FULL_ENABLED_DEP_PACKAGES ${orderedPackageFullDepsList}) - -endfunction() - - -# Helper function that builds the full list of internal upstream dep packages -# (with no duplicates) for a given internal package. -# -function(tribits_package_build_unsorted_full_enabled_dep_packages packageName - packageFullDepsListOut - ) - - set(packageFullDepsList "") - foreach(depPkg IN LISTS ${packageName}_LIB_DEFINED_DEPENDENCIES) - if ((${depPkg}_PACKAGE_BUILD_STATUS STREQUAL "INTERNAL") - AND ((${packageName}_LIB_DEP_REQUIRED AND ${PROJECT_NAME}_ENABLE_${depPkg}) - OR ((NOT ${packageName}_LIB_DEP_REQUIRED) AND ${packageName}_ENABLE_${depPkg})) - ) - list(APPEND packageFullDepsList ${depPkg}) - endif() - endforeach() - - if(packageFullDepsList) - list(REMOVE_DUPLICATES packageFullDepsList) - - foreach(DEP_PACKAGE IN LISTS packageFullDepsList) - list(APPEND packageFullDepsList ${${DEP_PACKAGE}_FULL_ENABLED_DEP_PACKAGES}) - endforeach() - - list(REMOVE_DUPLICATES packageFullDepsList) - endif() - - set(${packageFullDepsListOut} ${packageFullDepsList} PARENT_SCOPE) - -endfunction() - - -# Helper function to sort the full set of upstream dep packages for a given -# internal package. -# -function(tribits_package_sort_full_enabled_dep_packages packageFullDepsListName - orderedPackageFullDepsListOut - ) - - set(orderedPackageFullDepsList "") - - foreach(depPkg IN LISTS ${packageFullDepsListName}) - - set(depPkgIdx ${${depPkg}_PKG_IDX}) - - set(sortedIndex 0) - set(insertedDepPkg FALSE) - - foreach(sortedPackage IN LISTS orderedPackageFullDepsList) - - set(sortedPackageIdx ${${sortedPackage}_PKG_IDX}) - - if (${depPkgIdx} GREATER ${sortedPackageIdx}) - list(INSERT orderedPackageFullDepsList ${sortedIndex} ${depPkg}) - set(insertedDepPkg TRUE) - break() - endif() - - math(EXPR sortedIndex ${sortedIndex}+1) - - endforeach() - - if(NOT insertedDepPkg) - list(APPEND orderedPackageFullDepsList ${depPkg}) - endif() - - endforeach() - - set(${orderedPackageFullDepsListOut} ${orderedPackageFullDepsList} PARENT_SCOPE) - -endfunction() diff --git a/cmake/tribits/core/package_arch/TribitsSystemDataStructuresMacrosFunctions.rst b/cmake/tribits/core/package_arch/TribitsSystemDataStructuresMacrosFunctions.rst index f4661403fabd..3e5a4e3718b1 100644 --- a/cmake/tribits/core/package_arch/TribitsSystemDataStructuresMacrosFunctions.rst +++ b/cmake/tribits/core/package_arch/TribitsSystemDataStructuresMacrosFunctions.rst @@ -295,9 +295,14 @@ the dependencies for each external package/TPL and internal package: The list of all **defined direct** required and optional upstream external package/TPL and internal package dependencies, regardless if they are - enabled or not. To determine if a given direct upstream package - ```` in this list is enabled or not for this package - ``${PACKAGE_NAME}``, check the value of + enabled or not. (Note, this is currently the concatenation of the lists + `${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES`_, + `${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES`_, + ``${PACKAGE_NAME}_LIB_REQUIRED_DEP_TPLS``, and + ``${PACKAGE_NAME}_LIB_OPTIONAL_DEP_TPLS``. With the completion of #63, + the ``XXX_TPLS`` lists will be removed.) To determine if a given direct + upstream package ```` in this list is enabled or not for this + package ``${PACKAGE_NAME}``, check the value of ``${PACKAGE_NAME}_ENABLE_``. NOTE: The variables ``${PACKAGE_NAME}_ENABLE_`` will be set even for required upstream packages to allow for uniform loops involving required and optional @@ -333,8 +338,13 @@ the dependencies for each external package/TPL and internal package: This list of all **define direct** extra package test required and optional upstream external package/TPL and internal package dependencies. - This list is set regardless if the package ``${PACKAGE_NAME}`` is enabled - or not. + (Currently, this is a concatenation of the lists + `${PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES`_, + `${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES`_, + ``${PACKAGE_NAME}_TEST_REQUIRED_DEP_TPLS``, and + ``${PACKAGE_NAME}_TEST_OPTIONAL_DEP_TPLS``. With the completion of #63, + the ``XXX_TPLS`` lists will be removed.) This list is set regardless if + the package ``${PACKAGE_NAME}`` is enabled or not. .. _${PACKAGE_NAME}_TEST_ENABLED_DEPENDENCIES: @@ -380,17 +390,17 @@ Given the above upstream dependency list variables, the following derived list variables are then constructed which provide navigation from a package to its downstream/forward dependent packages: - .. _${PACKAGE_NAME}_FORWARD_LIB_DEFINED_DEPENDENCIES: + .. _${PACKAGE_NAME}_FORWARD_LIB_DEP_PACKAGES: - ``${PACKAGE_NAME}_FORWARD_LIB_DEFINED_DEPENDENCIES`` + ``${PACKAGE_NAME}_FORWARD_LIB_DEP_PACKAGES`` For a given package ``${PACKAGE_NAME}``, lists the names of all of the forward packages ```` that list this package in their ``_LIB_DEFINED_PACKAGES`` variables. - .. _${PACKAGE_NAME}_FORWARD_TEST_DEFINED_DEPENDENCIES: + .. _${PACKAGE_NAME}_FORWARD_TEST_DEP_PACKAGES: - ``${PACKAGE_NAME}_FORWARD_TEST_DEFINED_DEPENDENCIES`` + ``${PACKAGE_NAME}_FORWARD_TEST_DEP_PACKAGES`` For a given package ``${PACKAGE_NAME}``, lists the names of all of the forward packages ```` that list this package in their @@ -442,7 +452,6 @@ or:: -D _ROOT= .. _${PACKAGE_NAME}_PACKAGE_BUILD_STATUS: -.. _${TPL_NAME}_PACKAGE_BUILD_STATUS: The final status of whether a package is treated as an internal package or an external package is provided by the variable:: @@ -513,6 +522,86 @@ information about a given internal package: variable defined for them. +Legacy list variables defining the package dependencies graph ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +The following top-level non-cache variables are defined after reading in each +top-level package and subpackage ``Dependencies.cmake`` files and they are +used to define the basic dependencies that exist between packages in a project +to support the enable and disable logic described in section `Package +Dependencies and Enable/Disable Logic`_. These variables taken together +constitute a bidirectional acyclic graph (DAG) data-structure for package +dependencies. + +The following lists variables define the **direct** dependencies from a +package ``${PACKAGE_NAME}`` to its upstream packages which are directly set in +a package's `/cmake/Dependencies.cmake`_ file. (These lists +should **not** contain any *indirect* dependencies as the dependency system +already handles these automatically.) + + .. _${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES: + + ``${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES`` + + List of *direct* package dependencies that are required for the libraries + and non-test executables built by ``${PACKAGE_NAME}``. + + .. _${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES: + + ``${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES`` + + List of *direct* package dependencies that are only optional for the + libraries and non-test executables built by ``${PACKAGE_NAME}``. + + .. _${PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES: + + ``${PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES`` + + List of *direct* package dependencies that are required for the + tests/examples built by ``${PACKAGE_NAME}``. This list should **not** + contain any of the packages already listed in + ``${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES``. + + .. _${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES: + + ``${PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES``` + + List of *direct* package dependencies that are optional for the + tests/examples built by ``${PACKAGE_NAME}``. This list should **not** + contain any of the packages listed in + ``${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES``, + ``${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES``, or + ``${PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES``. + +Given the above upstream dependency list variables, the following derived list +variables are then constructed which provide navigation from a package to its +downstream/forward dependent packages: + + ``${PACKAGE_NAME}_FORWARD_LIB_REQUIRED_DEP_PACKAGES`` + + For a given package ``${PACKAGE_NAME}``, lists the names of all of the + forward packages ``${FORWARD_PACKAGE_NAME}`` that list this package in + their ``${FORWARD_PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES`` variables. + + ``${PACKAGE_NAME}_FORWARD_LIB_OPTIONAL_DEP_PACKAGES`` + + For a given package ``${PACKAGE_NAME}``, lists the names of all of the + forward packages ``${FORWARD_PACKAGE_NAME}`` that list this package in + their ``${FORWARD_PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES`` variables. + + ``${PACKAGE_NAME}_FORWARD_TEST_REQUIRED_DEP_PACKAGES`` + + For a given package ``${PACKAGE_NAME}``, lists the names of all of the + forward packages ``${FORWARD_PACKAGE_NAME}`` that list this package in + their ``${FORWARD_PACKAGE_NAME}_TEST_REQUIRED_DEP_PACKAGES`` variables. + + ``${PACKAGE_NAME}_FORWARD_TEST_OPTIONAL_DEP_PACKAGES`` + + For a given package ``${PACKAGE_NAME}``, lists the names of all of the + forward packages ``${FORWARD_PACKAGE_NAME}`` that list this package in + their ``${FORWARD_PACKAGE_NAME}_TEST_OPTIONAL_DEP_PACKAGES`` variables. + + Function call tree for constructing package dependency graph ------------------------------------------------------------ diff --git a/cmake/tribits/core/package_arch/TribitsTestCategories.cmake b/cmake/tribits/core/package_arch/TribitsTestCategories.cmake index acd55cee153d..c0058c9c7cd8 100644 --- a/cmake/tribits/core/package_arch/TribitsTestCategories.cmake +++ b/cmake/tribits/core/package_arch/TribitsTestCategories.cmake @@ -40,7 +40,6 @@ include(FindListElement) include(MessageWrapper) include(Join) -include(TribitsDeprecatedHelpers) # Define the valid categories that will be recognized in the CATEGORIES keyword @@ -98,7 +97,7 @@ function(tribits_filter_and_assert_categories CATEGORIES_VAR_INOUT) set(CATEGORIES_OUT) foreach(CATEGORY ${${CATEGORIES_VAR_INOUT}}) if (CATEGORY STREQUAL "WEEKLY") - tribits_deprecated("The test category 'WEEKLY' is deprecated" + message_wrapper(WARNING "Warning: The test category 'WEEKLY' is deprecated" " and is replaced with 'HEAVY'. Please change to use 'HEAVY' instead.") list(APPEND CATEGORIES_OUT "HEAVY") else() diff --git a/cmake/tribits/core/package_arch/TribitsTplDeclareLibraries.cmake b/cmake/tribits/core/package_arch/TribitsTplDeclareLibraries.cmake index aa808d8e8fc8..16e8bae9e60e 100644 --- a/cmake/tribits/core/package_arch/TribitsTplDeclareLibraries.cmake +++ b/cmake/tribits/core/package_arch/TribitsTplDeclareLibraries.cmake @@ -38,12 +38,11 @@ # @HEADER include(TribitsTplFindIncludeDirsAndLibraries) -include(TribitsDeprecatedHelpers) function(tribits_tpl_declare_libraries TPL_NAME) - tribits_deprecated_command(tribits_tpl_declare_libraries - MESSAGE - "Use tribits_tpl_find_include_dirs_and_libraries() instead." + message(WARNING + "WARNING: tribits_tpl_declare_libraries() is deprecated, instead use" + " tribits_tpl_find_include_dirs_and_libraries()!" " Make this change in the file:\n" " ${${TPL_NAME}_FINDMOD}\n" "which is pointed to by the file:\n" diff --git a/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake b/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake index 7ef8f2666bd4..1f31b6ec0c01 100644 --- a/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake +++ b/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake @@ -178,11 +178,125 @@ function(tribits_write_flexible_package_client_export_files) print_var(EXPORT_FILE_VAR_PREFIX) endif() + # + # B) Get the set of upstream packages for this package that are enabled, + # libraries, library dirs, and include dirs + # + + set(FULL_PACKAGE_SET "") + set(FULL_LIBRARY_SET "") + + + if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) + print_var(${PACKAGE_NAME}_FULL_ENABLED_DEP_PACKAGES) + endif() + + foreach(TRIBITS_PACKAGE ${${PACKAGE_NAME}_FULL_ENABLED_DEP_PACKAGES}) + + if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) + print_var(TRIBITS_PACKAGE) + if (${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE}) + print_var(${TRIBITS_PACKAGE}_HAS_NATIVE_LIBRARIES_TO_INSTALL) + endif() + endif() + + set(APPEND_THE_PACKAGE TRUE) + set(APPEND_THE_PACKAGE_LIBS TRUE) + + if (NOT ${TRIBITS_PACKAGE}_HAS_NATIVE_LIBRARIES_TO_INSTALL) + set(APPEND_THE_PACKAGE_LIBS FALSE) + endif() + + if (APPEND_THE_PACKAGE) + list(APPEND FULL_PACKAGE_SET ${TRIBITS_PACKAGE}) + if (APPEND_THE_PACKAGE_LIBS) + append_set(FULL_LIBRARY_SET ${${TRIBITS_PACKAGE}_LIBRARIES}) + else() + if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) + message("-- " "Skipping adding the package libs!") + endif() + endif() + else() + if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) + message("-- " "Skipping adding the package!") + endif() + endif() + + if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) + print_var(FULL_PACKAGE_SET) + print_var(FULL_LIBRARY_SET) + endif() + + endforeach() + + # Must prepend the current package and its libraries itself so that we get + # its TPLs libraries. However, if the current package has no native + # libraries (yet), then there is no point in listing the package or its + # TPLs. Why would a package list TPLs (with actual libraries) if itself + # does not have libraries to export? Note, this does not affect internal + # tests and examples which could have TPLs but no native libraries. + if (${PACKAGE_NAME}_LIBRARIES AND ${PACKAGE_NAME}_HAS_NATIVE_LIBRARIES_TO_INSTALL) + prepend_set(FULL_PACKAGE_SET ${PACKAGE_NAME}) + prepend_set(FULL_LIBRARY_SET ${${PACKAGE_NAME}_LIBRARIES}) + endif() + + if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) + message("-- " "*** Final sets of packages, libs, include dirs, and lib dirs:") + print_var(FULL_PACKAGE_SET) + print_var(FULL_LIBRARY_SET) + endif() + + # + # C) Get the set of TPLs for this package that are enabled + # + + # C.1) Get the set of enabled TPLs + + set(FULL_TPL_SET "") + foreach(TRIBITS_PACKAGE ${FULL_PACKAGE_SET}) + list(APPEND FULL_TPL_SET ${${TRIBITS_PACKAGE}_LIB_REQUIRED_DEP_TPLS}) + set(OPTIONAL_TPLS ${${TRIBITS_PACKAGE}_LIB_OPTIONAL_DEP_TPLS}) + foreach(TPL ${OPTIONAL_TPLS}) + # Only add if support for the optional TPL is enabled in this + # package. Don't just check if the TPL is enabled! + if(${TRIBITS_PACKAGE}_ENABLE_${TPL}) + list(APPEND FULL_TPL_SET ${TPL}) + endif() + endforeach() + endforeach() + if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) + print_var(FULL_TPL_SET) + endif() + + # C.2) Sort the TPLs according to the master TPL list + + #We will use the complete list of supported tpls for the project + #to help us create a properly ordered list of tpls. + if (FULL_TPL_SET) + set(ORDERED_FULL_TPL_SET ${FULL_TPL_SET}) + tribits_sort_list_according_to_master_list("${${PROJECT_NAME}_REVERSE_DEFINED_TPLS}" + ORDERED_FULL_TPL_SET) + endif() + + if (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP) + print_var(ORDERED_FULL_TPL_SET) + endif() + + # + # D) Get the libraries, library dirs, and the include dirs for the + # upstream enabled TPLs + # + + set(${PACKAGE_NAME}_TPL_LIBRARIES "") + foreach(TPL ${ORDERED_FULL_TPL_SET}) + list(APPEND ${PACKAGE_NAME}_TPL_LIBRARIES ${TPL}::all_libs) + endforeach() + # Generate a note discouraging editing of the Config.cmake file set(DISCOURAGE_EDITING "Do not edit: This file was generated automatically by CMake.") # - # B) Deal with the library rpath issues with shared libs + # E) Deal with the library rpath issues with shared libs # # Write the specification of the rpath if necessary. This is only needed if @@ -195,14 +309,14 @@ function(tribits_write_flexible_package_client_export_files) endif() # - # C) Create the contents of the Config.cmake file for the build tree + # F) Create the contents of the Config.cmake file for the build tree # tribits_generate_package_config_file_for_build_tree(${PACKAGE_NAME} EXPORT_FILE_VAR_PREFIX ${EXPORT_FILE_VAR_PREFIX}) # - # D) Create Config_install.cmake file for the install tree + # G) Create Config_install.cmake file for the install tree # tribits_generate_package_config_file_for_install_tree(${PACKAGE_NAME} @@ -673,6 +787,28 @@ function(tribits_write_project_client_export_files) # Custom code in configuration file. set(PROJECT_CONFIG_CODE "") + # # Export targets from the build tree. + # if(FULL_LIBRARY_SET) + # list(SORT FULL_LIBRARY_SET) + # list(REMOVE_DUPLICATES FULL_LIBRARY_SET) + # set(FULL_LIBRARY_TARGET_SET) + # foreach(LIB_ELE ${FULL_LIBRARY_SET}) + # if (TARGET ${LIB_ELE}) + # list(APPEND FULL_LIBRARY_TARGET_SET ${LIB_ELE}) + # endif() + # endforeach() + # export(TARGETS ${FULL_LIBRARY_TARGET_SET} FILE + # "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake") + # # Import the targets in applications. + # set(PROJECT_CONFIG_CODE "${PROJECT_CONFIG_CODE} + ## Import ${PROJECT_NAME} targets + #if(NOT ${PROJECT_NAME}_TARGETS_IMPORTED) + # set(${PROJECT_NAME}_TARGETS_IMPORTED 1) + # include(\"${PROJECT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake\") + #endif() + #") + # endif() + # Appending the logic to include each package's config file. set(LOAD_CODE "# Load configurations from enabled packages") foreach(TRIBITS_PACKAGE ${FULL_PACKAGE_SET}) @@ -780,6 +916,7 @@ include(\"${${TRIBITS_PACKAGE}_BINARY_DIR}/${TRIBITS_PACKAGE}Config.cmake\")") endfunction() + macro(tribits_set_compiler_var_for_config_file LANG FOR_DIR) if (NOT "${CMAKE_${LANG}_COMPILER_FOR_CONFIG_FILE_${FOR_DIR}}" STREQUAL "") set(CMAKE_${LANG}_COMPILER_FOR_CONFIG_FILE diff --git a/cmake/tribits/core/utils/AppendStringVar.cmake b/cmake/tribits/core/utils/AppendStringVar.cmake index dbd0c1fb5d1b..9b4e553a1494 100644 --- a/cmake/tribits/core/utils/AppendStringVar.cmake +++ b/cmake/tribits/core/utils/AppendStringVar.cmake @@ -39,7 +39,6 @@ include(ConcatStrings) include(PrintVar) -include(TribitsDeprecatedHelpers) # @FUNCTION: append_string_var() @@ -61,8 +60,6 @@ include(TribitsDeprecatedHelpers) # string(APPEND "" "" ...) # function(append_string_var STRING_VAR_OUT) - tribits_deprecated_command(append_string_var - MESSAGE "Use string(APPEND) instead.") #message("APPEND_STRING_VAR: ${STRING_VAR_OUT} {${ARGN}}") concat_strings( STRING_VAR "${${STRING_VAR_OUT}}" ${ARGN} ) #print_var( STRING_VAR ) diff --git a/cmake/tribits/core/utils/CMakeOverrides.cmake b/cmake/tribits/core/utils/CMakeOverrides.cmake new file mode 100644 index 000000000000..1c95ecfdb703 --- /dev/null +++ b/cmake/tribits/core/utils/CMakeOverrides.cmake @@ -0,0 +1,117 @@ +# @HEADER +# ************************************************************************ +# +# TriBITS: Tribal Build, Integrate, and Test System +# Copyright 2013 Sandia Corporation +# +# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +# the U.S. Government retains certain rights in this software. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# 3. Neither the name of the Corporation nor the names of the +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# ************************************************************************ +# @HEADER + +include(CMakeParseArguments) + +# +# FUNCTION: tribits_include_directories() +# + +# This function is to override the standard behavior of include_directories +# for a TriBITS package. + +# Usage:: +# +# tribits_include_directories( +# [REQUIRED_DURING_INSTALLATION_TESTING] ... +# ) +# +# If specified, ``REQUIRED_DURING_INSTALLATION_TESTING`` can appear anywhere +# in the argument list. +# +# This function allows overriding the default behavior for installation +# testing, to ensure that include directories will not be inadvertently added +# to the build lines for tests during installation testing. Normally we want +# the include directories to be handled as cmake usually does. However during +# TriBITS installation testing we do not want most of the include directories +# to be used as the majority of the files should come from the installation we +# are building against. There is an exception to this and that is when there +# are test only headers that are needed. For that case we allow people to set +# ``REQUIRED_DURING_INSTALLATION_TESTING`` to tell us that this include +# directory does need to be set for instaltion testing. +# +function(tribits_include_directories) + cmake_parse_arguments( + #prefix + PARSE + #Options + "REQUIRED_DURING_INSTALLATION_TESTING" + #one_value_keywords + "" + #multi_value_keywords + "" + ${ARGN} + ) + + tribits_check_for_unparsed_arguments() + + if(NOT ${PROJECT_NAME}_ENABLE_INSTALLATION_TESTING OR PARSE_REQUIRED_DURING_INSTALLATION_TESTING) + _include_directories(${PARSE_DEFAULT_ARGS}) + endif() +endfunction() + +#This function is to override the standard behavior of include_directories. +# We are overriding the default behavior for installation testing, this allows +#us to ensure that include directories will not be inadvertently added to the +#build lines for tests during installation testing. Normally we want the include +#directories to be handled as cmake usually does.However during installation +#testing we do not want most of the include directories to be used as the majority +#of the files should come from the installation we are building against. There is +#an exception to this and that is when there are test only headers that are needed. +#For that case we allow people to set "REQUIRED_DURING_INSTALLATION_TESTING" to +#tell us that this include directory does need to be set for instaltion testing. +function(include_directories) + cmake_parse_arguments( + #prefix + PARSE + #Options + "REQUIRED_DURING_INSTALLATION_TESTING" + #one_value_keywords + "" + #multi_value_keywords + "" + ${ARGN} + ) + + tribits_check_for_unparsed_arguments() + + if(NOT ${PROJECT_NAME}_ENABLE_INSTALLATION_TESTING OR PARSE_REQUIRED_DURING_INSTALLATION_TESTING) + _include_directories(${PARSE_DEFAULT_ARGS}) + endif() +endfunction() diff --git a/cmake/tribits/core/utils/ParseVariableArguments.cmake b/cmake/tribits/core/utils/ParseVariableArguments.cmake index da2e58ad2099..92e1b060fd15 100644 --- a/cmake/tribits/core/utils/ParseVariableArguments.cmake +++ b/cmake/tribits/core/utils/ParseVariableArguments.cmake @@ -37,12 +37,14 @@ # ************************************************************************ # @HEADER -include(TribitsDeprecatedHelpers) - +# Set up to use cmake_parse_arguments() function! +include(CMakeParseArguments) +# NOTE: For CMake versions 3.5.0 and above, this module is empty so the +# natively implemented function cmake_parse_arguments() will get used! macro(parse_arguments_deprecated_warning) - tribits_deprecated_command(parse_arguments - MESSAGE "Use cmake_parse_arguments() instead.") + message(DEPRECATION "parse_arguments() is deprecated and should not be used." + " Instead use cmake_parse_arguments()") endmacro() parse_arguments_deprecated_warning() diff --git a/cmake/tribits/core/utils/TribitsCreateReverseList.cmake b/cmake/tribits/core/utils/SetAndIncDirs.cmake similarity index 80% rename from cmake/tribits/core/utils/TribitsCreateReverseList.cmake rename to cmake/tribits/core/utils/SetAndIncDirs.cmake index 2f84d8c4781d..80d4f688c40b 100644 --- a/cmake/tribits/core/utils/TribitsCreateReverseList.cmake +++ b/cmake/tribits/core/utils/SetAndIncDirs.cmake @@ -38,15 +38,19 @@ # @HEADER -# @MACRO: tribits_create_reverse_list() +# @MACRO: set_and_inc_dirs() # -# Create a reverse list var in one shot. +# Set a variable to an include directory and call ``include_directories()`` +# (removes boiler-plate code). # -# Usage:: +# Usage: # -# tribits_create_reverse_list( ) +# set_and_inc_dirs( ) # -macro(tribits_create_reverse_list oldListName newListName) - set(${newListName} ${${oldListName}}) - list(REVERSE ${newListName}) +# On output, this sets ```` to ```` in the local scope +# and calls ``include_directories()``. +# +macro(set_and_inc_dirs DIR_VAR_NAME INCLUDE_DIR) + set(${DIR_VAR_NAME} ${INCLUDE_DIR}) + include_directories(${${DIR_VAR_NAME}}) endmacro() diff --git a/cmake/tribits/core/utils/TribitsAddEnumCacheVar.cmake b/cmake/tribits/core/utils/TribitsAddEnumCacheVar.cmake deleted file mode 100644 index 2ee30b7ed9d4..000000000000 --- a/cmake/tribits/core/utils/TribitsAddEnumCacheVar.cmake +++ /dev/null @@ -1,89 +0,0 @@ -# @HEADER -# ************************************************************************ -# -# TriBITS: Tribal Build, Integrate, and Test System -# Copyright 2013 Sandia Corporation -# -# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -# the U.S. Government retains certain rights in this software. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the Corporation nor the names of the -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# ************************************************************************ -# @HEADER - -include(TribitsParseArgumentsHelpers) - - -# @FUNCTION: tribits_add_enum_cache_var() -# -# Set up a string cache variable that must match a fixed set of values -# (i.e. an enum) and assert that it matches those values. -# -# Usage:: -# -# tribits_add_enum_cache_var( -# DEFAULT_VAL -# DOC_STRING "" -# ALLOWED_STRINGS_LIST "" "" ... -# [IS_ADVANCED] -# ) -# -# On output, ```` will be set to the list of paths -# -function(tribits_add_enum_cache_var cacheVarName defaultVal docString - isAdvanced allowedStringsListName - ) - # Parse input arguments - set(argOneValArgKeywords DEFAULT_VAL DOC_STRING) - set(argMultiValArgKeywords ALLOWED_STRINGS_LIST) - cmake_parse_arguments(PARSE_ARGV 1 PREFIX - "IS_ADVANCED" # options - "" # one_value_keywords - "${argOneValArgKeywords};${argMultiValArgKeywords}" # multi_value_keywords - ) - tribits_check_for_unparsed_arguments(PREFIX) - tribits_assert_parse_arg_one_value(PREFIX ${argOneValArgKeywords}) - tribits_assert_parse_arg_one_or_more_values(PREFIX ${argMultiValArgKeywords}) - # Human readable list of allowed values: '', '', ... - string(REPLACE ";" "', '" validStringValuesListStr "'${PREFIX_ALLOWED_STRINGS_LIST}'") - # Set cache var - set(${cacheVarName} ${PREFIX_DEFAULT_VAL} CACHE STRING - "${PREFIX_DOC_STRING}. Valid values: ${validStringValuesListStr} (default '${PREFIX_DEFAULT_VAL}')") - if (PREFIX_IS_ADVANCED) - mark_as_advanced(${cacheVarName}) - endif() - set_property(CACHE ${cacheVarName} PROPERTY STRINGS - ${PREFIX_ALLOWED_STRINGS_LIST} ) - # Assert in list of allowed strings - if (NOT ${cacheVarName} IN_LIST PREFIX_ALLOWED_STRINGS_LIST) - message(FATAL_ERROR "Error, the cache var ${cacheVarName} with value" - " '${${cacheVarName}}' is not in the list of allowed values:" - " ${validStringValuesListStr} (default '${PREFIX_DEFAULT_VAL}')" ) - endif() -endfunction() diff --git a/cmake/tribits/core/utils/TribitsDeprecatedHelpers.cmake b/cmake/tribits/core/utils/TribitsDeprecatedHelpers.cmake deleted file mode 100644 index 0ae57138e050..000000000000 --- a/cmake/tribits/core/utils/TribitsDeprecatedHelpers.cmake +++ /dev/null @@ -1,121 +0,0 @@ -# @HEADER -# ************************************************************************ -# -# TriBITS: Tribal Build, Integrate, and Test System -# Copyright 2013 Sandia Corporation -# -# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -# the U.S. Government retains certain rights in this software. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the Corporation nor the names of the -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# ************************************************************************ -# @HEADER - -include(MessageWrapper) -include(TribitsParseArgumentsHelpers) - - -set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_CALL_MESSAGE - DEPRECATION AUTHOR_WARNING SEND_ERROR FATAL_ERROR ) -set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_DONT_CALL_MESSAGE - IGNORE ) -set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_ALL_VALID_VALUES - ${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_CALL_MESSAGE} - ${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_DONT_CALL_MESSAGE} ) - - -# @FUNCTION: tribits_deprecated() -# -# Notify the user that some TriBITS functionality is deprecated. -# -# Usage:: -# -# tribits_deprecated() -# -# Depending on the value of the cache variable -# `TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE`_, this can do one of several -# things: -# -# - ``DEPRECATION`` or empty string (or variable not defined): Issue a CMake -# ``DEPRECATION`` message and continue. -# - ``AUTHOR_WARNING``: Issue a CMake ``AUTHOR_WARNING`` message and continue. -# - ``SEND_ERROR``: Issue a CMake ``SEND_ERROR`` message and continue. -# - ``FATAL_ERROR``: Issue a CMake ``FATAL_ERROR`` message and exit. -# - ``IGNORE``: Issue no message and continue. -# -function(tribits_deprecated) - cmake_parse_arguments(PARSE_ARGV 0 FWD "" "" "") - - if ("${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}" STREQUAL "") - set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE DEPRECATION) - endif() - - if ("${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}" IN_LIST TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_VALUES_THAT_CALL_MESSAGE) - message_wrapper("${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}" - ${FWD_UNPARSED_ARGUMENTS} - "\n\nNOTE: To Make these warnings go away, set -D" - " TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE=IGNORE (see the build reference guide).") - elseif (NOT "${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}" IN_LIST - TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_ALL_VALID_VALUES - ) - message_wrapper(FATAL_ERROR "Invalid value for" - " TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE=" - "'${TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE}'") - endif() -endfunction() - - -# @FUNCTION: tribits_deprecated_command() -# -# Notify the user that a TriBITS function or macro is deprecated. This should -# be the first command called at the top of any deprecated function or macro. -# -# Usage:: -# -# tribits_deprecated_command( -# [MESSAGE ] -# ) -# -function(tribits_deprecated_command name) - # Parse input arguments - set(argMultiValArgKeywords MESSAGE) - cmake_parse_arguments(PARSE_ARGV 1 PREFIX - "" # options - "" # one_value_keywords - "${argMultiValArgKeywords}" # multi_value_keywords - ) - tribits_check_for_unparsed_arguments(PREFIX) - - set(deprecationMessage "TriBITS command '${name}' is deprecated.") - if (NOT "${PREFIX_MESSAGE}" STREQUAL "") - string(APPEND deprecationMessage "\n\n${PREFIX_MESSAGE}") - endif() - - tribits_deprecated("${deprecationMessage}") -endfunction() diff --git a/cmake/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake b/cmake/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake index 837ddf05e5f8..c6135cb88c70 100644 --- a/cmake/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake +++ b/cmake/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake @@ -249,8 +249,8 @@ macro(tribits_setup_packages) # Second, the extra repos do not even exist in the "driver" source # tree. - set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES OFF) - set(${PROJECT_NAME}_OUTPUT_DEPENDENCY_FILES FALSE) + set(${PROJECT_NAME}_ASSERT_MISSING_PACKAGES FALSE) + set(${PROJECT_NAME}_OUTPUT_DEPENDENCY_FILES FALSE) if (CTEST_GENERATE_OUTER_DEPS_XML_OUTPUT_FILE) set(${PROJECT_NAME}_DEPS_XML_OUTPUT_FILE "${PROJECT_BINARY_DIR}/${${PROJECT_NAME}_PACKAGE_DEPS_XML_FILE_NAME}") diff --git a/cmake/tribits/doc/build_ref/TribitsBuildReferenceBody.rst b/cmake/tribits/doc/build_ref/TribitsBuildReferenceBody.rst index 07f0570a2b6f..9abf82ed5cd2 100644 --- a/cmake/tribits/doc/build_ref/TribitsBuildReferenceBody.rst +++ b/cmake/tribits/doc/build_ref/TribitsBuildReferenceBody.rst @@ -427,12 +427,18 @@ To find this output, look for the line:: and the dependencies are listed below this for each package in the form:: - -- _LIB_DEFINED_DEPENDENCIES: [O] <[PKG1>[R] ... - -- _TEST_DEFINED_DEPENDENCIES: [R] <[PKG8>[R] ... - + -- _LIB_REQUIRED_DEP_TPLS: ... + -- _LIB_OPTIONAL_DEP_TPLS: ... + -- _LIB_REQUIRED_DEP_PACKAGES: <[PKG1> ... + -- _LIB_OPTIONAL_DEP_PACKAGES: ... + -- _TEST_REQUIRED_DEP_TPLS: ... + -- _TEST_OPTIONAL_DEP_TPLS: ... + -- _TEST_REQUIRED_DEP_PACKAGES: <[PKG5> ... + -- _TEST_OPTIONAL_DEP_PACKAGES: ... + (Dependencies that don't exist are left out of the output. For example, if -there are no extra test dependencies, then ``_TEST_DEFINED_DEPENDENCIES`` -will not be printed.) +there are no ``_LIB_OPTIONAL_DEP_PACKAGES`` dependencies, then that line +is not printed.) To also see the direct forward/downstream dependencies for each package, also include:: @@ -453,8 +459,8 @@ Enable a set of packages .. __ENABLE_TESTS: -To enable a package ```` (and optionally also its tests and -examples), configure with:: +To enable an package ```` (and optionally also its tests +and examples), configure with:: -D _ENABLE_=ON \ -D _ENABLE_ALL_OPTIONAL_PACKAGES=ON \ @@ -465,19 +471,15 @@ as all packages that ```` can use. All of the package's optional "can use" upstream dependent packages are enabled with ``-D_ENABLE_ALL_OPTIONAL_PACKAGES=ON``. However, ``-D_ENABLE_TESTS=ON`` will only enable tests and examples for -```` (and any other packages explicitly enabled). +```` (or any other packages specifically enabled). -If a TriBITS package ```` has subpackages (e.g. subpackages -````, ````, ...), then enabling the package is equivalent to enabling -all of the required **and optional** subpackagses:: +If a TriBITS package ```` has subpackages (e.g. ````, +````, etc.), then enabling the package is equivalent to setting:: -D _ENABLE_=ON \ -D _ENABLE_=ON \ ... -(In this case, the parent package's optional subpackages are enabled -regardless the value of ``_ENABLE_ALL_OPTIONAL_PACKAGES``.) - However, a TriBITS subpackage will only be enabled if it is not already disabled either explicitly or implicitly. @@ -492,6 +494,9 @@ statement in an input ```*.cmake`` options files. However, setting ``-DXXX_ENABLE_YYY=TRUE`` and ``-DXXX_ENABLE_YYY=FALSE`` is allowed and will be interpreted correctly.. +NOTE: Setting ``_ENABLE_TESTS=ON`` also causes +``_ENABLE_EXAMPLES=ON`` to be set by default as well. + Enable or disable tests for specific packages +++++++++++++++++++++++++++++++++++++++++++++ @@ -512,8 +517,7 @@ packages. If one wants to enable a package along with the enable of other packages, but not the test suite for that package, then one can use a "exclude-list" -appraoch to disable the tests for that package by configuring with, for -example:: +appraoch to disable the tests for that package by configuring with:: -D _ENABLE_=ON \ -D _ENABLE_=ON \ @@ -523,12 +527,12 @@ example:: The above will enable the package test suites for ```` and ```` but **not** for ```` (or any other -packages that might get implicitly enabled). One might use this approch if -one wants to build and install package ```` but does not -want to build and run the test suite for that package. +packages that might get implicitly enabled). One might use this if one wants +to build and install package ```` but does not want to +build and run the test suite for that package. Alternatively, one can use an "include-list" appraoch to enable packages and -only enable tests for specific packages, for example, configuring with:: +only enable tests for specific packages. For example, configuring with:: -D _ENABLE_=ON \ -D _ENABLE_TESTS=ON \ @@ -554,7 +558,7 @@ Enable to test all effects of changing a given package(s) .. __ENABLE_ALL_FORWARD_DEP_PACKAGES: -To enable a package ```` to test it and all of its +To enable an package ```` to test it and all of its down-stream packages, configure with:: -D _ENABLE_=ON \ @@ -564,9 +568,8 @@ down-stream packages, configure with:: The above set of arguments will result in package ```` and all packages that depend on ```` to be enabled and have all of their tests turned on. Tests will not be enabled in packages that do not -depend (at least implicitly) on ```` in this case. This -speeds up and robustifies testing for changes in specific packages (like in -per-merge testing in a continuous integration process). +depend on ```` in this case. This speeds up and robustifies +pre-push testing. NOTE: setting ``_ENABLE_ALL_FORWARD_DEP_PACKAGES=ON`` also automatically sets and overrides `_ENABLE_ALL_OPTIONAL_PACKAGES`_ to @@ -577,7 +580,7 @@ packages for testing purposes unless you are enabling all optional packages.) Enable all packages (and optionally all tests) ++++++++++++++++++++++++++++++++++++++++++++++ -To enable all defined packages, add the configure option:: +To enable all defined packages and subpackages add the configure option:: -D _ENABLE_ALL_PACKAGES=ON \ @@ -586,12 +589,13 @@ packages, add the configure option:: -D _ENABLE_TESTS=ON \ -Specific packages can be disabled (i.e. "exclude-listed") by adding +Specific packages can be disabled (i.e. "black-listed") by adding ``_ENABLE_=OFF``. This will also disable all packages that depend on ````. Note, all examples are also enabled by default when setting -``_ENABLE_TESTS=ON``. +``_ENABLE_TESTS=ON`` (and so examples are considered a subset of the +tests). By default, setting ``_ENABLE_ALL_PACKAGES=ON`` only enables primary tested (PT) packages and code. To have this also enable all secondary tested @@ -609,58 +613,50 @@ details. Disable a package and all its dependencies ++++++++++++++++++++++++++++++++++++++++++ -To disable a package and all of the packages that depend on it, add the -configure option:: +To disable an package and all of the packages that depend on it, add the +configure options:: -D _ENABLE_=OFF For example:: - -D _ENABLE_=ON \ + -D _ENABLE_=ON \ -D _ENABLE_ALL_OPTIONAL_PACKAGES=ON \ - -D _ENABLE_=OFF \ + -D _ENABLE_=ON \ -will enable ```` and all of the packages that it depends on -except for ```` and all of its forward dependencies. +will enable ```` and all of the packages that it depends on except +for ```` and all of its forward dependencies. -If a TriBITS package ```` has subpackages (e.g. a parent -package with subpackages ````, ````, ...), then disabling the parent -package is equivalent to disabling all of the required and optional -subpackages:: +If a TriBITS package ```` has subpackages (e.g. ````, +````, etc.), then disabling the package is equivalent to setting:: -D _ENABLE_=OFF \ -D _ENABLE_=OFF \ ... -The disable of the subpackages in this case will override any enables. - -.. __DISABLE_ENABLED_FORWARD_DEP_PACKAGES: +The disable of the subpackage is this case will override any enables. If a disabled package is a required dependency of some explicitly enabled -downstream package, then the configure will error out if:: - - -D _DISABLE_ENABLED_FORWARD_DEP_PACKAGES=OFF \ - -is set. Otherwise, if ``_DISABLE_ENABLED_FORWARD_DEP_PACKAGES=ON``, -a ``NOTE`` will be printed and the downstream package will be disabled and -configuration will continue. +downstream package, then the configure will error out if +``_DISABLE_ENABLED_FORWARD_DEP_PACKAGES=OFF``. Otherwise, a WARNING +will be printed and the downstream package will be disabled and configuration +will continue. Remove all package enables in the cache +++++++++++++++++++++++++++++++++++++++ To wipe the set of package enables in the ``CMakeCache.txt`` file so they can -be reset again from scratch, re-configure with:: +be reset again from scratch, configure with:: - $ cmake -D _UNENABLE_ENABLED_PACKAGES=TRUE . + $ ./-do-confiugre -D _UNENABLE_ENABLED_PACKAGES=TRUE This option will set to empty '' all package enables, leaving all other cache variables as they are. You can then reconfigure with a new set of package enables for a different set of packages. This allows you to avoid more -expensive configure time checks (like the standard CMake compiler checks) and -to preserve other cache variables that you have set and don't want to loose. -For example, one would want to do this to avoid more expensive compiler and -TPL checks. +expensive configure time checks and to preserve other cache variables that you +have set and don't want to loose. For example, one would want to do this to +avoid compiler and TPL checks. Selecting compiler and linker options @@ -1599,70 +1595,27 @@ NOTE: Newer versions of CMake may automatically determine when these options need to be turned on so watch for that in looking at the build lines. -External Packages/Third-Party Library (TPL) support ---------------------------------------------------- - -A set of external packages/third-party libraries (TPL) can be enabled and -disabled and the locations of those can be specified at configure time (if -they are not found in the default path). - - Enabling support for an optional Third-Party Library (TPL) -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +---------------------------------------------------------- -To enable a given external packages/TPL, set:: +To enable a given TPL, set:: -D TPL_ENABLE_=ON where ```` = ``BLAS``, ``LAPACK`` ``Boost``, ``Netcdf``, etc. -(Requires TPLs for enabled package will automatically be enabled.) The full list of TPLs that is defined and can be enabled is shown by doing a configure with CMake and then grepping the configure output for ``Final set of -.* TPLs``. The set of TPL names listed in ``'Final set of enabled external -packages/TPLs'`` and ``'Final set of non-enabled external packages/TPLs'`` -gives the full list of TPLs that can be enabled (or disabled). - -Optional package-specific support for a TPL can be turned off by setting:: - - -D _ENABLE_=OFF - -This gives the user full control over what TPLs are supported by which package -independent of whether the TPL is enabled or not. - -Support for an optional TPL can also be turned on implicitly by setting:: - - -D _ENABLE_=ON - -where ```` is a TriBITS package that has an optional -dependency on ````. That will result in setting -``TPL_ENABLE_=ON`` internally (but not set in the cache) if -``TPL_ENABLE_=OFF`` is not already set. - - -Specifying the location of the parts of an enabled external package/TPL -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -Once an external package/TPL is enabled, the parts of that TPL must be found. -For many external packages/TPLs, this will be done automatically by searching -the environment paths. - -Some external packages/TPLs are specified with a call to -``find_package()`` (see CMake documentation for -``find_package()``). Many other external packages/TPLs use a legacy TriBITS -system that locates the parts using the CMake commands ``find_file()`` and -``find_library()`` as described below. - -Every defined external package/TPL uses a specification provided in a -``FindTPL.cmake`` module file. This file describes how the package -is found in a way that provides modern CMake IMPORTED targets (including the -``::all_libs`` target) that is used by the downstream packages. +.* TPLs``. The set of TPL names listed in ``'Final set of enabled external packages/TPLs'`` and +``'Final set of non-enabled external packages/TPLs'`` gives the full list of TPLs that can be +enabled (or disabled). Some TPLs require only libraries (e.g. Fortran libraries like BLAS or LAPACK), some TPL require only include directories, and some TPLs require both. -For ``FindTPL.cmake`` files using the legacy TriBITS TPL system, a -TPL is fully specified through the following cache variables: +Each TPL specification is defined in a ``FindTPL.cmake`` module file. +The job of each of these of these module files is to set the CMake cache +variables: * ``TPL__INCLUDE_DIRS:PATH``: List of paths to header files for the TPL (if the TPL supplies header files). @@ -1670,8 +1623,8 @@ TPL is fully specified through the following cache variables: * ``TPL__LIBRARIES:PATH``: List of (absolute) paths to libraries, ordered as they will be on the link line (of the TPL supplies libraries). -These variables are the only variables are used to create IMPORTED CMake -targets for the TPL. One can set these two variables as CMake cache +These variables are the only variables that are actually used in the CMake +build system. Therefore, one can set these two variables as CMake cache variables, for ``SomeTPL`` for example, with:: -D TPL_SomeTPL_INCLUDE_DIRS="${LIB_BASE}/include/a;${LIB_BASE}/include/b" \ @@ -1681,7 +1634,7 @@ Using this approach, one can be guaranteed that these libraries and these include directories and will used in the compile and link lines for the packages that depend on this TPL ``SomeTPL``. -**NOTE:** When specifying ``TPL__INCLUDE_DIRS`` and/or +**WARNING:** When specifying ``TPL__INCLUDE_DIRS`` and/or ``TPL__LIBRARIES``, the build system will use these without question. It will **not** check for the existence of these directories or files so make sure that these files and directories exist before these are used in the @@ -1689,31 +1642,29 @@ compiles and links. (This can actually be a feature in rare cases the libraries and header files don't actually get created until after the configure step is complete but before the build step.) -**NOTE:** It is generally *not recommended* to specify the TPLs libraries as -just a set of link options as, for example:: +**WARNING:** It is **not recommended** to specify the TPLs libraries as just a set +of link options as, for example:: TPL_SomeTPL_LIBRARIES="-L/some/dir;-llib1;-llib2;..." -But this is supported as long as this link line contains only link library -directories and library names. (Link options that are not order-sensitive are -also supported like ``-mkl``.) +This is not compatible with proper CMake usage and it not guaranteed to be +supported for all use cases or all platforms. (CMake really wants to have +full library paths when linking.) When the variables ``TPL__INCLUDE_DIRS`` and ``TPL__LIBRARIES`` are not specified, then most ``FindTPL.cmake`` modules use a default find operation. Some will -call ``find_package()`` internally by default and some may -implement the default find in some other way. To know for sure, see the -documentation for the specific external package/TPL (e.g. looking in the -``FindTPL.cmake`` file to be sure). NOTE: if a given -``FindTPL.cmake`` will use ``find_package()`` by -default, this can be disabled by configuring with:: +call ``find_package()`` internally by default and some may implement +the default find in some other way. To know for sure, see the documentation +for the specific TPL (e.g. looking in the ``FindTPL.cmake`` file to +be sure). NOTE: if a given ``FindTPL.cmake`` would use +``find_package()`` by default, this can be disabled by configuring +with:: -D_ALLOW_PACKAGE_PREFIND=OFF -(Not all ``FindTPL.cmake`` files support this option.) - -Many ``FindTPL.cmake`` files, use the legacy TriBITS TPL system for -finding include directories and/or libraries based on the function +Most TPLs, however, use a standard system for finding include directories +and/or libraries based on the function `tribits_tpl_find_include_dirs_and_libraries()`_. These simple standard ``FindTPL.cmake`` modules specify a set of header files and/or libraries that must be found. The directories where these header files and @@ -1733,9 +1684,9 @@ library files are looked for are specified using the CMake cache variables: files will be searched for using ``find_library()``, for each library, in order. -Most of these ``FindTPL.cmake`` modules will define a default set of -libraries to look for and therefore ``_LIBRARY_NAMES`` can typically -be left off. +Most ``FindTPL.cmake`` modules will define a default set of libraries +to look for and therefore ``_LIBRARY_NAMES`` can typically be left +off. Therefore, to find the same set of libraries for ``SimpleTPL`` shown above, one would specify:: @@ -1747,14 +1698,30 @@ override that using:: -D SomeTPL_LIBRARY_NAMES="lib1;lib2" -Therefore, this is in fact the preferred way to specify the libraries for -these legacy TriBITS TPLs. +Therefore, this is in fact the preferred way to specify the libraries for a +TPL. In order to allow a TPL that normally requires one or more libraries to ignore the libraries, one can set ``_LIBRARY_NAMES`` to empty, for example:: -D _LIBRARY_NAMES="" +Optional package-specific support for a TPL can be turned off by setting:: + + -D _ENABLE_=OFF + +This gives the user full control over what TPLs are supported by which package +independent of whether the TPL is enabled or not. + +Support for an optional TPL can also be turned on implicitly by setting:: + + -D _ENABLE_=ON + +where ```` is a TriBITS package that has an optional +dependency on ````. That will result in setting +``TPL_ENABLE_=ON`` internally (but not set in the cache) if +``TPL_ENABLE_=OFF`` is not already set. + If all the parts of a TPL are not found on an initial configure, the configure will error out with a helpful error message. In that case, one can change the variables ``_INCLUDE_DIRS``, ``_LIBRARY_NAMES``, and/or @@ -1764,6 +1731,14 @@ a complete configure from scratch which saves time. Or, one can avoid the find operations by directly setting ``TPL__INCLUDE_DIRS`` and ``TPL__LIBRARIES`` as described above. +**WARNING:** The cmake cache variable ``TPL__LIBRARY_DIRS`` does +**not** control where libraries are found. Instead, this variable is set +during the find processes and is not actually used in the CMake build system +at all. + +In summary, this gives the user complete and direct control in specifying +exactly what is used in the build process. + **TPL Example 1: Standard BLAS Library** Suppose one wants to find the standard BLAS library ``blas`` in the @@ -1867,7 +1842,7 @@ libraries in the right order by configuring with:: Adjusting upstream dependencies for a Third-Party Library (TPL) -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +--------------------------------------------------------------- Some TPLs have dependencies on one or more upstream TPLs. These dependencies must be specified correctly for the compile and links to work correctly. The @@ -1882,38 +1857,34 @@ the upstream TPLs are enabled), set:: A dependency on an upstream TPL ```` will be set if the an upstream TPL ```` is actually enabled. -If any of the specified dependent TPLs ```` are listed after -```` in the ``TPLsList.cmake`` file (or are not listed at all), then -a configure-time error will occur. +If any of the specified TPLs are listed after ```` in the +``TPLsList.cmake`` file or are not enabled, then a configure-time error will +occur. To take complete control over what dependencies an TPL has, set:: -D _LIB_ENABLED_DEPENDENCIES=";;..." If the upstream TPLs listed here are not defined upstream and enabled TPLs, -then a configure-time error will occur. +then an error will occur. Disabling support for a Third-Party Library (TPL) -+++++++++++++++++++++++++++++++++++++++++++++++++ +-------------------------------------------------- Disabling a TPL explicitly can be done using:: -D TPL_ENABLE_=OFF -This will result in the disabling of any direct or indirect downstream -packages that have a required dependency on ```` as described in -`Disable a package and all its dependencies`_. - NOTE: If a disabled TPL is a required dependency of some explicitly enabled downstream package, then the configure will error out if -`_DISABLE_ENABLED_FORWARD_DEP_PACKAGES`_ ``= OFF``. Otherwise, a -NOTE will be printed and the downstream package will be disabled and -configuration will continue. +_DISABLE_ENABLED_FORWARD_DEP_PACKAGES=OFF. Otherwise, a WARNING will +be printed and the downstream package will be disabled and configuration will +continue. Disabling tentatively enabled TPLs -++++++++++++++++++++++++++++++++++ +---------------------------------- To disable a tentatively enabled TPL, set:: @@ -1937,7 +1908,7 @@ also want to explicitly disable the TPL as shown above. Require all TPL libraries be found -++++++++++++++++++++++++++++++++++ +---------------------------------- By default, some TPLs don't require that all of the libraries listed in ``_LIBRARY_NAMES`` be found. To change this behavior so that all @@ -1949,7 +1920,7 @@ This makes the configure process catch more mistakes with the env. Disable warnings from TPL header files -++++++++++++++++++++++++++++++++++++++ +-------------------------------------- To disable warnings coming from included TPL header files for C and C++ code, set:: @@ -1968,8 +1939,9 @@ project is pulling in module files from TPLs. xSDK Configuration Options -------------------------- -The configure of will adhere to the `xSDK Community Package -Policies`_ simply by setting the CMake cache variable:: +The configure of will adhere to the xSDK configuration standard +(todo: put in reference to final document) simply by setting the CMake cache +variable:: -D USE_XSDK_DEFAULTS=TRUE @@ -2089,26 +2061,6 @@ This will override the global behavior set by ````. -Adjusting CMake DEPRECATION warnings ------------------------------------- - -By default, deprecated TriBITS features being used in the project's CMake -files will result in CMake deprecation warning messages (issued by calling -``message(DEPRECATION ...)`` internally). The handling of these deprecation -warnings can be changed by setting the CMake cache variable -``TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE``. For example, to remove all -deprecation warnings, set:: - - -D TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE=IGNORE - -Other valid values include: - -* ``DEPRECATION``: Issue a CMake ``DEPRECATION`` message and continue (default). -* ``AUTHOR_WARNING``: Issue a CMake ``AUTHOR_WARNING`` message and continue. -* ``SEND_ERROR``: Issue a CMake ``SEND_ERROR`` message and continue. -* ``FATAL_ERROR``: Issue a CMake ``FATAL_ERROR`` message and exit. - - Disabling deprecated code ------------------------- @@ -2935,19 +2887,13 @@ package directories. In development mode, the failure to find a package directory is usually a programming error (i.e. a miss-spelled package directory name). But in a tarball release of the project, package directories may be purposefully missing (see `Creating a tarball of the source tree`_) and -must be ignored. - -When building from a reduced source tarball created from the +must be ignored. When building from a reduced source tarball created from the development sources, set:: - -D _ASSERT_DEFINED_DEPENDENCIES=OFF - -or to ``IGNORE``. (valid values include ``FATAL_ERROR``, ``SEND_ERROR``, -``WARNING``, ``NOTICE``, ``IGNORE`` and ``OFF``) + -D _ASSERT_MISSING_PACKAGES=OFF Setting this ``OFF`` will cause the TriBITS CMake configure to simply ignore -any undefined packages and turn off all dependencies on these missing -packages. +any missing packages and turn off all dependencies on these missing packages. Another type of checking is for optional inserted/external packages (e.g. packages who's source can optionally be included and is flagged with @@ -2958,29 +2904,27 @@ printed by configuring with:: -D _WARN_ABOUT_MISSING_EXTERNAL_PACKAGES=TRUE -These warnings starting with 'NOTE' (not starting with 'WARNING' that would -otherwise trigger warnings in CDash) about missing inserted/external packages -will print regardless of the setting for -``_ASSERT_DEFINED_DEPENDENCIES``. +These warnings (starting with 'NOTE', not 'WARNING' that would otherwise +trigger warnings in CDash) about missing inserted/external packages will print +regardless of the setting for ``_ASSERT_MISSING_PACKAGES``. Finally, ``_ENABLE_DEVELOPMENT_MODE=ON`` results in a number of checks for invalid usage of TriBITS in the project's ``CMakeLists.txt`` files -and will, by default, abort configure with a fatal error on the first failed -check. This is appropriate for development mode when a project is clean of all -such invalid usage patterns but there are times when it makes sense to report -these check failures in different ways (such as when upgrading TriBITS in a -project that has some invalid usage patterns that just happen work but may be +and will abort configure with a fatal error on the first check failure. This +is appropriate for development mode when a project is clean of all such +invalid usage patterns but there are times when it makes sense to report these +check failures in different ways (such as when upgrading TriBITS in a project +that has some invalid usage patterns that just happen work but may be disallowed in future versions of TriBITS). To change how these invalid usage checks are handled, set:: -D _ASSERT_CORRECT_TRIBITS_USAGE= -where ```` can be ``FATAL_ERROR``, ``SEND_ERROR``, ``WARNING``, -``IGNORE`` or ``OFF`` (where ``IGNORE`` or ``OFF`` avoids any error reporting -or warnings). +where ```` can be 'FATAL_ERROR', 'SEND_ERROR', 'WARNING', or +'IGNORE'. For ``_ENABLE_DEVELOPMENT_MODE=OFF``, the default for -``_ASSERT_CORRECT_TRIBITS_USAGE`` is set to ``IGNORE``. +``_ASSERT_CORRECT_TRIBITS_USAGE`` is actually set to ``IGNORE``. Building (Makefile generator) @@ -4104,10 +4048,10 @@ generators on your system). NOTE: When configuring from an untarred source tree that has missing packages, one must configure with:: - -D _ASSERT_DEFINED_DEPENDENCIES=OFF + -D _ASSERT_MISSING_PACKAGES=OFF Otherwise, TriBITS will error out complaining about missing packages. (Note -that ``_ASSERT_DEFINED_DEPENDENCIES`` will default to ```OFF``` in +that ``_ASSERT_MISSING_PACKAGES`` will default to ```OFF``` in release mode, i.e. ``_ENABLE_DEVELOPMENT_MODE==OFF``.) @@ -4358,6 +4302,4 @@ dashboard``. .. _TriBITS TribitsExampleApp Tests: https://github.com/TriBITSPub/TriBITS/blob/master/test/core/ExamplesUnitTests/TribitsExampleApp_Tests.cmake -.. _xSDK Community Package Policies: https://doi.org/10.6084/m9.figshare.4495136 - .. LocalWords: templated instantiation Makefiles CMake diff --git a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableAllPackages.txt b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableAllPackages.txt index da111da02420..07c2c9d87e59 100644 --- a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableAllPackages.txt +++ b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableAllPackages.txt @@ -8,13 +8,10 @@ Enabling all packages that are not currently disabled because of \ -- Setting Trilinos_ENABLE_ThyraEpetra=ON -- Setting Trilinos_ENABLE_Thyra=ON -Enabling all required (and optional since Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES=ON) upstream packages for current set of enabled packages -(Trilinos_ENABLE_SECONDARY_TESTED_CODE=OFF) ... +Enabling all remaining required TPLs for current set of enabled packages ... --- NOTE: Not Setting Trilinos_ENABLE_ThyraGoodStuff=ON even though Thyra has an optional dependence on ThyraGoodStuff because Trilinos_ENABLE_SECONDARY_TESTED_CODE=OFF --- NOTE: Not Setting Trilinos_ENABLE_ThyraEpetraExt=ON even though Thyra has an optional dependence on ThyraEpetraExt because Trilinos_ENABLE_SECONDARY_TESTED_CODE=OFF --- Setting TPL_ENABLE_BLAS=ON because Epetra has a required dependence on BLAS --- Setting TPL_ENABLE_LAPACK=ON because Epetra has a required dependence on LAPACK +-- Setting TPL_ENABLE_BLAS=ON because it is required by the enabled package Teuchos +-- Setting TPL_ENABLE_LAPACK=ON because it is required by the enabled package Teuchos Final set of enabled top-level packages: Teuchos RTOp Epetra Thyra 4 Final set of enabled packages: Teuchos RTOp Epetra ThyraCoreLibs ThyraEpetra Thyra 6 diff --git a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyraEpetra_EnableTests.txt b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyraEpetra_EnableTests.txt index 0d3f79b5ccd8..9ad431f62a25 100644 --- a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyraEpetra_EnableTests.txt +++ b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyraEpetra_EnableTests.txt @@ -21,8 +21,11 @@ Enabling all required (and optional since Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES= -- Setting Trilinos_ENABLE_ThyraCoreLibs=ON because ThyraEpetra has a required dependence on ThyraCoreLibs -- Setting Trilinos_ENABLE_Teuchos=ON because ThyraCoreLibs has a required dependence on Teuchos -- Setting Trilinos_ENABLE_RTOp=ON because ThyraCoreLibs has a required dependence on RTOp --- Setting TPL_ENABLE_BLAS=ON because Epetra has a required dependence on BLAS --- Setting TPL_ENABLE_LAPACK=ON because Epetra has a required dependence on LAPACK + +Enabling all remaining required TPLs for current set of enabled packages ... + +-- Setting TPL_ENABLE_BLAS=ON because it is required by the enabled package Teuchos +-- Setting TPL_ENABLE_LAPACK=ON because it is required by the enabled package Teuchos Enabling the shell of non-enabled parent packages (mostly for show) that have at least one subpackage enabled ... diff --git a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests.txt b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests.txt index c66d07690338..46e1cdc7ae5c 100644 --- a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests.txt +++ b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests.txt @@ -40,14 +40,17 @@ Enabling all required (and optional since Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES= -- Setting Trilinos_ENABLE_Epetra=ON because ThyraEpetra has a required dependence on Epetra -- Setting Trilinos_ENABLE_Teuchos=ON because ThyraCoreLibs has a required dependence on Teuchos -- Setting Trilinos_ENABLE_RTOp=ON because ThyraCoreLibs has a required dependence on RTOp --- Setting TPL_ENABLE_BLAS=ON because Epetra has a required dependence on BLAS --- Setting TPL_ENABLE_LAPACK=ON because Epetra has a required dependence on LAPACK Enabling all optional intra-package enables _ENABLE_ that are not currently disabled if both sets of packages are enabled ... -- Setting Thyra_ENABLE_ThyraEpetra=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraEpetra=ON +Enabling all remaining required TPLs for current set of enabled packages ... + +-- Setting TPL_ENABLE_BLAS=ON because it is required by the enabled package Teuchos +-- Setting TPL_ENABLE_LAPACK=ON because it is required by the enabled package Teuchos + Final set of enabled top-level packages: Teuchos RTOp Epetra Thyra 4 Final set of enabled packages: Teuchos RTOp Epetra ThyraCoreLibs ThyraEpetra Thyra 6 Final set of non-enabled top-level packages: Triutils EpetraExt 2 diff --git a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST.txt b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST.txt index 3aa2f7a337f0..00efe417fd24 100644 --- a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST.txt +++ b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST.txt @@ -40,38 +40,27 @@ Enabling all required (and optional since Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES= -- Setting Trilinos_ENABLE_Teuchos=ON because ThyraCoreLibs has a required dependence on Teuchos -- Setting Trilinos_ENABLE_RTOp=ON because ThyraCoreLibs has a required dependence on RTOp -- Setting Trilinos_ENABLE_Triutils=ON because EpetraExt has an optional dependence on Triutils --- Setting TPL_ENABLE_BLAS=ON because Epetra has a required dependence on BLAS --- Setting TPL_ENABLE_LAPACK=ON because Epetra has a required dependence on LAPACK Enabling all optional intra-package enables _ENABLE_ that are \ not currently disabled if both sets of packages are enabled ... --- Setting Teuchos_ENABLE_BLAS=ON since Trilinos_ENABLE_Teuchos=ON AND TPL_ENABLE_BLAS=ON --- Setting Teuchos_ENABLE_LAPACK=ON since Trilinos_ENABLE_Teuchos=ON AND TPL_ENABLE_LAPACK=ON --- Setting Teuchos_ENABLE_Boost=ON since Trilinos_ENABLE_Teuchos=ON AND TPL_ENABLE_Boost=ON --- NOT setting Teuchos_ENABLE_MPI=ON since MPI is NOT enabled at this point! --- Setting RTOp_ENABLE_Teuchos=ON since Trilinos_ENABLE_RTOp=ON AND Trilinos_ENABLE_Teuchos=ON --- Setting Epetra_ENABLE_BLAS=ON since Trilinos_ENABLE_Epetra=ON AND TPL_ENABLE_BLAS=ON --- Setting Epetra_ENABLE_LAPACK=ON since Trilinos_ENABLE_Epetra=ON AND TPL_ENABLE_LAPACK=ON --- NOT setting Epetra_ENABLE_MPI=ON since MPI is NOT enabled at this point! --- Setting Triutils_ENABLE_Epetra=ON since Trilinos_ENABLE_Triutils=ON AND Trilinos_ENABLE_Epetra=ON --- Setting EpetraExt_ENABLE_Teuchos=ON since Trilinos_ENABLE_EpetraExt=ON AND Trilinos_ENABLE_Teuchos=ON --- Setting EpetraExt_ENABLE_Epetra=ON since Trilinos_ENABLE_EpetraExt=ON AND Trilinos_ENABLE_Epetra=ON --- Setting EpetraExt_ENABLE_Triutils=ON since Trilinos_ENABLE_EpetraExt=ON AND Trilinos_ENABLE_Triutils=ON --- NOT setting EpetraExt_ENABLE_UMFPACK=ON since UMFPACK is NOT enabled at this point! --- NOT setting EpetraExt_ENABLE_AMD=ON since AMD is NOT enabled at this point! --- NOT setting EpetraExt_ENABLE_PETSC=ON since PETSC is NOT enabled at this point! --- Setting ThyraCoreLibs_ENABLE_Teuchos=ON since Trilinos_ENABLE_ThyraCoreLibs=ON AND Trilinos_ENABLE_Teuchos=ON --- Setting ThyraCoreLibs_ENABLE_RTOp=ON since Trilinos_ENABLE_ThyraCoreLibs=ON AND Trilinos_ENABLE_RTOp=ON --- Setting ThyraGoodStuff_ENABLE_ThyraCoreLibs=ON since Trilinos_ENABLE_ThyraGoodStuff=ON AND Trilinos_ENABLE_ThyraCoreLibs=ON --- Setting ThyraEpetra_ENABLE_Epetra=ON since Trilinos_ENABLE_ThyraEpetra=ON AND Trilinos_ENABLE_Epetra=ON --- Setting ThyraEpetra_ENABLE_ThyraCoreLibs=ON since Trilinos_ENABLE_ThyraEpetra=ON AND Trilinos_ENABLE_ThyraCoreLibs=ON --- Setting ThyraEpetraExt_ENABLE_ThyraEpetra=ON since Trilinos_ENABLE_ThyraEpetraExt=ON AND Trilinos_ENABLE_ThyraEpetra=ON --- Setting ThyraEpetraExt_ENABLE_EpetraExt=ON since Trilinos_ENABLE_ThyraEpetraExt=ON AND Trilinos_ENABLE_EpetraExt=ON --- Setting Thyra_ENABLE_ThyraCoreLibs=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraCoreLibs=ON --- Setting Thyra_ENABLE_ThyraGoodStuff=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraGoodStuff=ON --- Setting Thyra_ENABLE_ThyraEpetra=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraEpetra=ON --- Setting Thyra_ENABLE_ThyraEpetraExt=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraEpetraExt=ON +-- Setting EpetraExt_ENABLE_Triutils=ON since Trilinos_ENABLE_EpetraExt=ON \ + AND Trilinos_ENABLE_Triutils=ON +-- Setting Thyra_ENABLE_ThyraGoodStuff=ON since Trilinos_ENABLE_Thyra=ON \ + AND Trilinos_ENABLE_ThyraGoodStuff=ON +-- Setting Thyra_ENABLE_ThyraEpetra=ON since Trilinos_ENABLE_Thyra=ON \ + AND Trilinos_ENABLE_ThyraEpetra=ON +-- Setting Thyra_ENABLE_ThyraEpetraExt=ON since Trilinos_ENABLE_Thyra=ON \ + AND Trilinos_ENABLE_ThyraEpetraExt=ON + +Enabling all remaining required TPLs for current set of enabled packages ... + +-- Setting TPL_ENABLE_BLAS=ON because it is required by the enabled package Teuchos +-- Setting TPL_ENABLE_LAPACK=ON because it is required by the enabled package Teuchos + +Enabling all optional package TPL support _ENABLE_ not currently disabled for enabled TPLs ... + +-- Setting Teuchos_ENABLE_Boost=ON since TPL_ENABLE_Boost=ON Final set of enabled top-level packages: Teuchos RTOp Epetra Triutils EpetraExt Thyra 6 Final set of enabled packages: Teuchos RTOp Epetra Triutils EpetraExt ThyraCoreLibs \ diff --git a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST_RequiredOnly.txt b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST_RequiredOnly.txt index 268535389cf3..3647d4d81d82 100644 --- a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST_RequiredOnly.txt +++ b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/EnableThyra_EnableTests_EnableBoost_ST_RequiredOnly.txt @@ -47,37 +47,25 @@ Enabling all required upstream packages for current set of \ dependence on Teuchos -- Setting Trilinos_ENABLE_RTOp=ON because ThyraCoreLibs has a required \ dependence on RTOp --- Setting TPL_ENABLE_BLAS=ON because Epetra has a required dependence on BLAS --- Setting TPL_ENABLE_LAPACK=ON because Epetra has a required dependence on LAPACK Enabling all optional intra-package enables _ENABLE_ \ that are not currently disabled if both sets of packages are enabled ... --- Setting Teuchos_ENABLE_BLAS=ON since Trilinos_ENABLE_Teuchos=ON AND TPL_ENABLE_BLAS=ON --- Setting Teuchos_ENABLE_LAPACK=ON since Trilinos_ENABLE_Teuchos=ON AND TPL_ENABLE_LAPACK=ON --- Setting Teuchos_ENABLE_Boost=ON since Trilinos_ENABLE_Teuchos=ON AND TPL_ENABLE_Boost=ON --- NOT setting Teuchos_ENABLE_MPI=ON since MPI is NOT enabled at this point! --- Setting RTOp_ENABLE_Teuchos=ON since Trilinos_ENABLE_RTOp=ON AND Trilinos_ENABLE_Teuchos=ON --- Setting Epetra_ENABLE_BLAS=ON since Trilinos_ENABLE_Epetra=ON AND TPL_ENABLE_BLAS=ON --- Setting Epetra_ENABLE_LAPACK=ON since Trilinos_ENABLE_Epetra=ON AND TPL_ENABLE_LAPACK=ON --- NOT setting Epetra_ENABLE_MPI=ON since MPI is NOT enabled at this point! --- Setting EpetraExt_ENABLE_Teuchos=ON since Trilinos_ENABLE_EpetraExt=ON AND Trilinos_ENABLE_Teuchos=ON --- Setting EpetraExt_ENABLE_Epetra=ON since Trilinos_ENABLE_EpetraExt=ON AND Trilinos_ENABLE_Epetra=ON --- NOT setting EpetraExt_ENABLE_Triutils=ON since Triutils is NOT enabled at this point! --- NOT setting EpetraExt_ENABLE_UMFPACK=ON since UMFPACK is NOT enabled at this point! --- NOT setting EpetraExt_ENABLE_AMD=ON since AMD is NOT enabled at this point! --- NOT setting EpetraExt_ENABLE_PETSC=ON since PETSC is NOT enabled at this point! --- Setting ThyraCoreLibs_ENABLE_Teuchos=ON since Trilinos_ENABLE_ThyraCoreLibs=ON AND Trilinos_ENABLE_Teuchos=ON --- Setting ThyraCoreLibs_ENABLE_RTOp=ON since Trilinos_ENABLE_ThyraCoreLibs=ON AND Trilinos_ENABLE_RTOp=ON --- Setting ThyraGoodStuff_ENABLE_ThyraCoreLibs=ON since Trilinos_ENABLE_ThyraGoodStuff=ON AND Trilinos_ENABLE_ThyraCoreLibs=ON --- Setting ThyraEpetra_ENABLE_Epetra=ON since Trilinos_ENABLE_ThyraEpetra=ON AND Trilinos_ENABLE_Epetra=ON --- Setting ThyraEpetra_ENABLE_ThyraCoreLibs=ON since Trilinos_ENABLE_ThyraEpetra=ON AND Trilinos_ENABLE_ThyraCoreLibs=ON --- Setting ThyraEpetraExt_ENABLE_ThyraEpetra=ON since Trilinos_ENABLE_ThyraEpetraExt=ON AND Trilinos_ENABLE_ThyraEpetra=ON --- Setting ThyraEpetraExt_ENABLE_EpetraExt=ON since Trilinos_ENABLE_ThyraEpetraExt=ON AND Trilinos_ENABLE_EpetraExt=ON --- Setting Thyra_ENABLE_ThyraCoreLibs=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraCoreLibs=ON --- Setting Thyra_ENABLE_ThyraGoodStuff=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraGoodStuff=ON --- Setting Thyra_ENABLE_ThyraEpetra=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraEpetra=ON --- Setting Thyra_ENABLE_ThyraEpetraExt=ON since Trilinos_ENABLE_Thyra=ON AND Trilinos_ENABLE_ThyraEpetraExt=ON +-- Setting Thyra_ENABLE_ThyraGoodStuff=ON since Trilinos_ENABLE_Thyra=ON \ + AND Trilinos_ENABLE_ThyraGoodStuff=ON +-- Setting Thyra_ENABLE_ThyraEpetra=ON since Trilinos_ENABLE_Thyra=ON \ + AND Trilinos_ENABLE_ThyraEpetra=ON +-- Setting Thyra_ENABLE_ThyraEpetraExt=ON since Trilinos_ENABLE_Thyra=ON \ + AND Trilinos_ENABLE_ThyraEpetraExt=ON + +Enabling all remaining required TPLs for current set of enabled packages ... + +-- Setting TPL_ENABLE_BLAS=ON because it is required by the enabled package Teuchos +-- Setting TPL_ENABLE_LAPACK=ON because it is required by the enabled package Teuchos + +Enabling all optional package TPL support _ENABLE_ not currently disabled for enabled TPLs ... + +-- Setting Teuchos_ENABLE_Boost=ON since TPL_ENABLE_Boost=ON Final set of enabled top-level packages: Teuchos RTOp Epetra EpetraExt Thyra 5 Final set of enabled packages: Teuchos RTOp Epetra EpetraExt ThyraCoreLibs ThyraGoodStuff ThyraEpetra ThyraEpetraExt Thyra 9 diff --git a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/ExpectedDependencies.txt b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/ExpectedDependencies.txt index 51dbaaa44879..3d636a3b981a 100644 --- a/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/ExpectedDependencies.txt +++ b/cmake/tribits/doc/guides/ReducedMockTrilinosOutput/ExpectedDependencies.txt @@ -15,96 +15,73 @@ Package dependencies information: -- Trilinos_DEFINED_PACKAGES: MPI BLAS LAPACK Boost UMFPACK AMD PETSC Teuchos RTOp Epetra Triutils EpetraExt ThyraCoreLibs ThyraGoodStuff ThyraCrazyStuff ThyraEpetra ThyraEpetraExt Thyra -- Trilinos_NUM_DEFINED_PACKAGES='18' --- MPI_FORWARD_LIB_DEFINED_DEPENDENCIES: Teuchos[O] Epetra[O] +-- Teuchos_LIB_REQUIRED_DEP_TPLS: BLAS LAPACK +-- Teuchos_LIB_OPTIONAL_DEP_TPLS: Boost MPI --- BLAS_FORWARD_LIB_DEFINED_DEPENDENCIES: LAPACK[R] Teuchos[R] Epetra[R] +-- RTOp_LIB_REQUIRED_DEP_PACKAGES: Teuchos --- LAPACK_LIB_DEFINED_DEPENDENCIES: BLAS[R] --- LAPACK_FORWARD_LIB_DEFINED_DEPENDENCIES: Teuchos[R] Epetra[R] +-- Epetra_LIB_REQUIRED_DEP_TPLS: BLAS LAPACK +-- Epetra_LIB_OPTIONAL_DEP_TPLS: MPI --- Boost_FORWARD_LIB_DEFINED_DEPENDENCIES: Teuchos[O] +-- Triutils_LIB_REQUIRED_DEP_PACKAGES: Epetra --- UMFPACK_FORWARD_LIB_DEFINED_DEPENDENCIES: EpetraExt[O] +-- EpetraExt_LIB_REQUIRED_DEP_PACKAGES: Teuchos Epetra +-- EpetraExt_LIB_OPTIONAL_DEP_PACKAGES: Triutils +-- EpetraExt_LIB_OPTIONAL_DEP_TPLS: UMFPACK AMD PETSC --- AMD_FORWARD_LIB_DEFINED_DEPENDENCIES: EpetraExt[O] +-- ThyraCoreLibs_LIB_REQUIRED_DEP_PACKAGES: Teuchos RTOp --- PETSC_FORWARD_LIB_DEFINED_DEPENDENCIES: EpetraExt[O] +-- ThyraGoodStuff_LIB_REQUIRED_DEP_PACKAGES: ThyraCoreLibs --- Teuchos_LIB_DEFINED_DEPENDENCIES: BLAS[R] LAPACK[R] Boost[O] MPI[O] --- Teuchos_FORWARD_LIB_DEFINED_DEPENDENCIES: RTOp[R] EpetraExt[R] ThyraCoreLibs[R] +-- ThyraCrazyStuff_LIB_REQUIRED_DEP_PACKAGES: ThyraGoodStuff --- RTOp_LIB_DEFINED_DEPENDENCIES: Teuchos[R] --- RTOp_FORWARD_LIB_DEFINED_DEPENDENCIES: ThyraCoreLibs[R] +-- ThyraEpetra_LIB_REQUIRED_DEP_PACKAGES: Epetra ThyraCoreLibs --- Epetra_LIB_DEFINED_DEPENDENCIES: BLAS[R] LAPACK[R] MPI[O] --- Epetra_FORWARD_LIB_DEFINED_DEPENDENCIES: Triutils[R] EpetraExt[R] ThyraEpetra[R] +-- ThyraEpetraExt_LIB_REQUIRED_DEP_PACKAGES: ThyraEpetra EpetraExt --- Triutils_LIB_DEFINED_DEPENDENCIES: Epetra[R] --- Triutils_FORWARD_LIB_DEFINED_DEPENDENCIES: EpetraExt[O] +-- Thyra_LIB_REQUIRED_DEP_PACKAGES: ThyraCoreLibs +-- Thyra_LIB_OPTIONAL_DEP_PACKAGES: ThyraGoodStuff ThyraCrazyStuff ThyraEpetra ThyraEpetraExt --- EpetraExt_LIB_DEFINED_DEPENDENCIES: Teuchos[R] Epetra[R] Triutils[O] UMFPACK[O] AMD[O] PETSC[O] --- EpetraExt_FORWARD_LIB_DEFINED_DEPENDENCIES: ThyraEpetraExt[R] +Dumping direct dependencies for each package ... --- ThyraCoreLibs_LIB_DEFINED_DEPENDENCIES: Teuchos[R] RTOp[R] --- ThyraCoreLibs_FORWARD_LIB_DEFINED_DEPENDENCIES: ThyraGoodStuff[R] ThyraEpetra[R] Thyra[R] +-- MPI_LIB_DEFINED_DEPENDENCIES: --- ThyraGoodStuff_LIB_DEFINED_DEPENDENCIES: ThyraCoreLibs[R] --- ThyraGoodStuff_FORWARD_LIB_DEFINED_DEPENDENCIES: ThyraCrazyStuff[R] Thyra[O] +-- BLAS_LIB_DEFINED_DEPENDENCIES: --- ThyraCrazyStuff_LIB_DEFINED_DEPENDENCIES: ThyraGoodStuff[R] --- ThyraCrazyStuff_FORWARD_LIB_DEFINED_DEPENDENCIES: Thyra[O] +-- LAPACK_LIB_DEFINED_DEPENDENCIES: --- ThyraEpetra_LIB_DEFINED_DEPENDENCIES: Epetra[R] ThyraCoreLibs[R] --- ThyraEpetra_FORWARD_LIB_DEFINED_DEPENDENCIES: ThyraEpetraExt[R] Thyra[O] +-- Boost_LIB_DEFINED_DEPENDENCIES: --- ThyraEpetraExt_LIB_DEFINED_DEPENDENCIES: ThyraEpetra[R] EpetraExt[R] --- ThyraEpetraExt_FORWARD_LIB_DEFINED_DEPENDENCIES: Thyra[O] +-- UMFPACK_LIB_DEFINED_DEPENDENCIES: --- Thyra_LIB_DEFINED_DEPENDENCIES: ThyraCoreLibs[R] ThyraGoodStuff[O] ThyraCrazyStuff[O] ThyraEpetra[O] ThyraEpetraExt[O] +-- AMD_LIB_DEFINED_DEPENDENCIES: -Dumping direct enabled dependencies for each package ... +-- PETSC_LIB_DEFINED_DEPENDENCIES: --- MPI: No enabled dependencies! +-- Teuchos_LIB_ENABLED_DEPENDENCIES: BLAS LAPACK +-- Teuchos_LIB_DEFINED_DEPENDENCIES: BLAS LAPACK Boost MPI --- BLAS: No enabled dependencies! +-- RTOp_LIB_ENABLED_DEPENDENCIES: Teuchos +-- RTOp_LIB_DEFINED_DEPENDENCIES: Teuchos --- LAPACK_LIB_ENABLED_DEPENDENCIES: BLAS[R] +-- Epetra_LIB_ENABLED_DEPENDENCIES: BLAS LAPACK +-- Epetra_LIB_DEFINED_DEPENDENCIES: BLAS LAPACK MPI --- Boost: No enabled dependencies! +-- Triutils_LIB_DEFINED_DEPENDENCIES: Epetra --- UMFPACK: No enabled dependencies! +-- EpetraExt_LIB_DEFINED_DEPENDENCIES: Teuchos Epetra Triutils UMFPACK AMD PETSC --- AMD: No enabled dependencies! +-- ThyraCoreLibs_LIB_ENABLED_DEPENDENCIES: Teuchos RTOp +-- ThyraCoreLibs_LIB_DEFINED_DEPENDENCIES: Teuchos RTOp --- PETSC: No enabled dependencies! +-- ThyraGoodStuff_LIB_DEFINED_DEPENDENCIES: ThyraCoreLibs --- Teuchos_LIB_ENABLED_DEPENDENCIES: BLAS[R] LAPACK[R] +-- ThyraCrazyStuff_LIB_DEFINED_DEPENDENCIES: ThyraGoodStuff --- RTOp_LIB_ENABLED_DEPENDENCIES: Teuchos[R] +-- ThyraEpetra_LIB_ENABLED_DEPENDENCIES: Epetra ThyraCoreLibs +-- ThyraEpetra_LIB_DEFINED_DEPENDENCIES: Epetra ThyraCoreLibs --- Epetra_LIB_ENABLED_DEPENDENCIES: BLAS[R] LAPACK[R] +-- ThyraEpetraExt_LIB_DEFINED_DEPENDENCIES: ThyraEpetra EpetraExt --- Triutils: No enabled dependencies! - --- EpetraExt: No enabled dependencies! - --- ThyraCoreLibs_LIB_ENABLED_DEPENDENCIES: Teuchos[R] RTOp[R] - --- ThyraGoodStuff: No enabled dependencies! - --- ThyraCrazyStuff: No enabled dependencies! - --- ThyraEpetra_LIB_ENABLED_DEPENDENCIES: Epetra[R] ThyraCoreLibs[R] - --- ThyraEpetraExt: No enabled dependencies! - --- Thyra_LIB_ENABLED_DEPENDENCIES: ThyraCoreLibs[R] ThyraEpetra[O] - -Setting up export dependencies for all enabled packages ... - --- Teuchos: No library dependencies! --- RTOp_FULL_ENABLED_DEP_PACKAGES: Teuchos --- Epetra: No library dependencies! --- ThyraCoreLibs_FULL_ENABLED_DEP_PACKAGES: RTOp Teuchos --- ThyraEpetra_FULL_ENABLED_DEP_PACKAGES: ThyraCoreLibs Epetra RTOp Teuchos --- Thyra_FULL_ENABLED_DEP_PACKAGES: ThyraEpetra ThyraCoreLibs Epetra RTOp Teuchos +-- Thyra_LIB_ENABLED_DEPENDENCIES: ThyraCoreLibs ThyraEpetra +-- Thyra_LIB_DEFINED_DEPENDENCIES: ThyraCoreLibs ThyraGoodStuff ThyraCrazyStuff ThyraEpetra ThyraEpetraExt diff --git a/cmake/tribits/doc/guides/TribitsCoreDetailedReference.rst b/cmake/tribits/doc/guides/TribitsCoreDetailedReference.rst index 2cc0fb95e97d..50a99b926381 100644 --- a/cmake/tribits/doc/guides/TribitsCoreDetailedReference.rst +++ b/cmake/tribits/doc/guides/TribitsCoreDetailedReference.rst @@ -61,7 +61,6 @@ The global project-level TriBITS options for which defaults can be provided by a given TriBITS project are: * `${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE`_ -* `${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES`_ * `${PROJECT_NAME}_C_Standard`_ * `${PROJECT_NAME}_CHECK_FOR_UNPARSED_ARGUMENTS`_ * `${PROJECT_NAME}_CONFIGURE_OPTIONS_FILE_APPEND`_ @@ -98,7 +97,6 @@ a given TriBITS project are: * `CMAKE_INSTALL_RPATH_USE_LINK_PATH`_ * `MPI_EXEC_MAX_NUMPROCS`_ * `PythonInterp_FIND_VERSION`_ -* `TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE`_ These options are described below. @@ -122,25 +120,6 @@ These options are described below. in the project's base `/ProjectName.cmake`_ file. - -.. _${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES: - -**${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES** - - To set ``${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES`` a different default, - set:: - - set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_DEFAULT ) - - in the project's base `/ProjectName.cmake`_ file, where - ```` can be ``FATAL_ERROR``, ``SEND_ERROR``, ``WARNING``, - ``NOTICE`` or ``IGNORE`` - - Otherwise, the default is ``WARNING`` when - ``${PROJECT_NAME}_ENABLE_DEVELOPMENT_MODE`` is ``ON`` and if ``IGNORE`` if - ``${PROJECT_NAME}_ENABLE_DEVELOPMENT_MODE`` is ``OFF``. - - .. _${PROJECT_NAME}_C_Standard: **${PROJECT_NAME}_C_Standard** @@ -370,12 +349,11 @@ These options are described below. to ``OFF`` when creating a release (see `Project and Repository Versioning and Release Mode`_). When ``${PROJECT_NAME}_ENABLE_DEVELOPMENT_MODE`` is ``ON``, several other variables are given defaults appropriate for - development mode. For example, - ``${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES`` is set to ``FATAL_ERROR`` by - default in development mode but is set to ``IGNORE`` by default in release - mode. In addition, strong compiler warnings are enabled by default in - development mode but are disabled by default in release mode. This variable - also affects the behavior of `tribits_set_st_for_dev_mode()`_. + development mode. For example, ``${PROJECT_NAME}_ASSERT_MISSING_PACKAGES`` + is set to ``ON`` by default in development mode but is set to ``OFF`` by + default in release mode. In addition, strong compiler warnings are enabled + by default in development mode but are disabled by default in release mode. + This variable also affects the behavior of `tribits_set_st_for_dev_mode()`_. .. _${PROJECT_NAME}_ENABLE_Fortran: @@ -863,19 +841,6 @@ These options are described below. -D PythonInterp_FIND_VERSION="3.6.2" -.. _TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE: - -**TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE** - - Determines how the function `tribits_deprecated()`_ behaves. To change the - default behavor, such as call ``message(FATAL_ERROR ...)``, set:: - - set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_DEFAULT FATAL_ERROR) - - in the project's `/ProjectName.cmake`_ file, or - `/CMakeLists.txt`_ file, or on the individual package basis in - its `/CMakeLists.txt`_ file. - TriBITS Macros and Functions ---------------------------- diff --git a/cmake/tribits/doc/guides/TribitsGuidesBody.rst b/cmake/tribits/doc/guides/TribitsGuidesBody.rst index 876566808da4..f6ab1b1b733f 100644 --- a/cmake/tribits/doc/guides/TribitsGuidesBody.rst +++ b/cmake/tribits/doc/guides/TribitsGuidesBody.rst @@ -1780,8 +1780,6 @@ defined: the package is in relation to other packages. NOTE: This variable is **only** defined if the package is actually enabled! - .. _${PACKAGE_NAME}_PARENT_REPOSITORY: - ``${PACKAGE_NAME}_PARENT_REPOSITORY`` The name of the package's parent repository. This can be used by a @@ -2163,8 +2161,8 @@ version will be used all of the downstream packages that uses it. Also, by defining a TriBITS TPL, automatic enable/disable logic will be applied as described in `Package Dependencies and Enable/Disable Logic`_. For example, if an external package/TPL is explicitly disabled, all of the downstream -packages that depend on it will be automatically disabled as well (see -`Package disable triggers auto-disables of downstream dependencies`_). +packages that depend on it will be automatically disabled as well (see `TPL +disable triggers auto-disables of downstream dependencies`_). .. _Globally unique TriBITS TPL names: @@ -3363,20 +3361,21 @@ system are: 6) `EX TPLs given default unset enable/disable state`_ 7) `Required TPLs are auto-enabled for enabled packages`_ 8) `Optional TPLs only enabled explicitly by the user`_ -9) `Disables trump enables where there is a conflict`_ -10) `Enable/disable of parent package is enable/disable for subpackages`_ -11) `Enable/disable of parent package tests/examples is enable/disable for subpackages tests/examples`_ -12) `Subpackage enable does not auto-enable the parent package`_ -13) `Support for optional package/TPL is enabled by default`_ -14) `Support for optional package can be explicitly disabled`_ -15) `Explicit enable of optional package/TPL support auto-enables package/TPL`_ -16) `ST packages only auto-enabled if ST code is enabled`_ -17) `_ENABLE_ALL_FORWARD_DEP_PACKAGES enables downstream packages/tests`_ -18) `_ENABLE_ALL_PACKAGES enables all PT (cond. ST) packages`_ -19) `_ENABLE_TESTS only enables explicitly enabled package tests`_ -20) `If no packages are enabled, nothing will get built`_ -21) `TriBITS prints all enables and disables to stdout`_ -22) `TriBITS auto-enables/disables done using non-cache local variables`_ +9) `TPL disable triggers auto-disables of downstream dependencies`_ +10) `Disables trump enables where there is a conflict`_ +11) `Enable/disable of parent package is enable/disable for subpackages`_ +12) `Enable/disable of parent package tests/examples is enable/disable for subpackages tests/examples`_ +13) `Subpackage enable does not auto-enable the parent package`_ +14) `Support for optional package/TPL is enabled by default`_ +15) `Support for optional package can be explicitly disabled`_ +16) `Explicit enable of optional package/TPL support auto-enables package/TPL`_ +17) `ST packages only auto-enabled if ST code is enabled`_ +18) `_ENABLE_ALL_FORWARD_DEP_PACKAGES enables downstream packages/tests`_ +19) `_ENABLE_ALL_PACKAGES enables all PT (cond. ST) packages`_ +20) `_ENABLE_TESTS only enables explicitly enabled package tests`_ +21) `If no packages are enabled, nothing will get built`_ +22) `TriBITS prints all enables and disables to stdout`_ +23) `TriBITS auto-enables/disables done using non-cache local variables`_ In more detail, these rules/behaviors are: @@ -3444,16 +3443,15 @@ In more detail, these rules/behaviors are: .. _Package disable triggers auto-disables of downstream dependencies: -4) **Package disable triggers auto-disables of downstream dependencies**: Any - package ```` can be explicitly **disabled** by the user by - setting the cache variable ``${PROJECT_NAME}_ENABLE_=OFF`` - (or ``TPL_ENABLE_=OFF`` for an external package/TPL) - (e.g. ``Trilinos_ENABLE_Teuchos=OFF``, ``TPL_ENABLE_BLAS=OFF``). When an - package is explicitly disabled, it will result in the disable of all - dependent `downstream`_ external packages/TPLs and internal packages that - have required dependency on it. It will also disable optional support for - the disabled packages in downstream packages that list it as an optional - dependency. For an example, see `Explicit disable of a package`_. +4) **Package disable triggers auto-disables of downstream dependencies**: + Any package ```` can be explicitly **disabled** by the + user by setting the cache variable + ``${PROJECT_NAME}_ENABLE_=OFF`` + (e.g. ``Trilinos_ENABLE_Teuchos=OFF``). When an package is explicitly + disabled, it will result in the disable of all `downstream`_ packages + that have required dependency on it. It will also disable optional support + for the disabled packages in downstream packages that list it as an + optional dependency. For an example, see `Explicit disable of a package`_. .. _PT/ST TPLs given default unset enable/disable state: @@ -3507,9 +3505,24 @@ In more detail, these rules/behaviors are: ``TPL_ENABLE_Boost=ON``. For an example, see `Explicit enable of a package, its tests, an optional TPL, with ST enabled`_. +.. _TPL disable triggers auto-disables of downstream dependencies: + +9) **TPL disable triggers auto-disables of downstream dependencies**: Any TPLs + that are explicitly disabled (i.e. ``TPL_ENABLE_=OFF``) will + result in the disable of all `downstream`_ dependent packages that have a + required dependency on the TPL. For example, if the user sets + ``TPL_ENABLE_LAPACK=OFF``, then this will result in the disable of packages + ``Teuchos`` and ``Epetra``, and all of the required packages downstream + from them. Also, the explicitly disabled TPL will result in the disable of + optional support in all downstream packages. For example, if the user sets + ``TPL_ENABLE_MPI=OFF``, then TriBITS will automatically set + ``Teuchos_ENABLE_MPI=OFF`` and ``Epetra_ENABLE_MPI=OFF``. For examples, + see `Explicit disable of an optional TPL`_ and `Explicit disable of a + required TPL`_. + .. _Disables trump enables where there is a conflict: -9) **Disables trump enables where there is a conflict** and TriBITS will +10) **Disables trump enables where there is a conflict** and TriBITS will never override a disable in order to satisfy some dependency. For example, if the user sets ``Trilinos_ENABLE_Teuchos=OFF`` and ``Trilinos_ENABLE_RTOp=ON``, then TriBITS will **not** override the @@ -3540,7 +3553,7 @@ In more detail, these rules/behaviors are: .. _Enable/disable of parent package is enable/disable for subpackages: -10) **Enable/disable of parent package is enable/disable for subpackages**: An +11) **Enable/disable of parent package is enable/disable for subpackages**: An explicit enable/disable of a top-level parent package with subpackages with ``${PROJECT_NAME}_ENABLE_=(ON|OFF)`` is equivalent to the explicit enable/disable of all of the parent package's subpackages. @@ -3563,7 +3576,7 @@ In more detail, these rules/behaviors are: .. _Enable/disable of parent package tests/examples is enable/disable for subpackages tests/examples: -11) **Enable/disable of parent package tests/examples is enable/disable for +12) **Enable/disable of parent package tests/examples is enable/disable for subpackages tests/examples**: Setting ``_ENABLE_TESTS=[ON|OFF]`` is equivalent to setting the default for ``_ENABLE_TESTS=[ON|OFF]`` for each @@ -3577,7 +3590,7 @@ In more detail, these rules/behaviors are: .. _Subpackage enable does not auto-enable the parent package: -12) **Subpackage enable does not auto-enable the parent package**: Enabling an +13) **Subpackage enable does not auto-enable the parent package**: Enabling an package that is a subpackage does **not** automatically enable the parent package (except for at the very end, mostly just for show). For example, enabling the package ``ThyraEpetra`` does not result in enable @@ -3600,7 +3613,7 @@ In more detail, these rules/behaviors are: .. _Support for optional package/TPL is enabled by default: -13) **Support for optional package/TPL is enabled by default**: For an package +14) **Support for optional package/TPL is enabled by default**: For an package ```` with an optional dependency on an `upstream`_ package or TPL ````, TriBITS will automatically set the intra-enable variable @@ -3617,7 +3630,7 @@ In more detail, these rules/behaviors are: .. _Support for optional package can be explicitly disabled: -14) **Support for optional package can be explicitly disabled:** Even +15) **Support for optional package can be explicitly disabled:** Even though TriBITS will automatically set ``_ENABLE_=ON`` by default if ```` and ```` are both @@ -3637,7 +3650,7 @@ In more detail, these rules/behaviors are: .. _Explicit enable of optional package/TPL support auto-enables package/TPL: -15) **Explicit enable of optional package/TPL support auto-enables +16) **Explicit enable of optional package/TPL support auto-enables package/TPL**: If the user explicitly enables the TriBITS package ```` and explicitly sets ``_ENABLE_=ON`` on input, @@ -3657,7 +3670,7 @@ In more detail, these rules/behaviors are: .. _ST packages only auto-enabled if ST code is enabled: -16) **ST packages only auto-enabled if ST code is enabled**: TriBITS will +17) **ST packages only auto-enabled if ST code is enabled**: TriBITS will only enable an optional ``ST`` package when ``${PROJECT_NAME}_ENABLE_ALL_OPTIONAL_PACKAGES=ON`` if ``${PROJECT_NAME}_SECONDARY_TESTED_CODE=ON`` is also set. Otherwise, when @@ -3676,7 +3689,7 @@ In more detail, these rules/behaviors are: .. __ENABLE_ALL_FORWARD_DEP_PACKAGES enables downstream packages/tests: -17) **_ENABLE_ALL_FORWARD_DEP_PACKAGES enables downstream packages/tests**: +18) **_ENABLE_ALL_FORWARD_DEP_PACKAGES enables downstream packages/tests**: Setting the user cache-variable ``${PROJECT_NAME}_ENABLE_ALL_FORWARD_PACKAGES=ON`` will result in the `downstream`_ ``PT`` packages and tests to be enabled (and all ``PT`` @@ -3694,7 +3707,7 @@ In more detail, these rules/behaviors are: .. __ENABLE_ALL_PACKAGES enables all PT (cond. ST) packages: -18) **_ENABLE_ALL_PACKAGES enables all PT (cond. ST) packages**: +19) **_ENABLE_ALL_PACKAGES enables all PT (cond. ST) packages**: Setting the user cache-variable ``${PROJECT_NAME}_ENABLE_ALL_PACKAGES=ON`` will result in the enable of all ``PT`` packages when ``${PROJECT_NAME}_SECONDARY_TESTED_CODE=OFF`` and all ``PT`` and ``ST`` @@ -3713,7 +3726,7 @@ In more detail, these rules/behaviors are: .. __ENABLE_TESTS only enables explicitly enabled package tests: -19) **_ENABLE_TESTS only enables explicitly enabled package +20) **_ENABLE_TESTS only enables explicitly enabled package tests**: Setting ``${PROJECT_NAME}_ENABLE_TESTS=ON`` will **only enable tests for explicitly enabled packages** on input. For example, configuring with ``Trilinos_ENABLE_RTOp=ON`` and @@ -3728,7 +3741,7 @@ In more detail, these rules/behaviors are: .. _If no packages are enabled, nothing will get built: -20) **If no packages are enabled, nothing will get built**: Most TriBITS +21) **If no packages are enabled, nothing will get built**: Most TriBITS projects are set up such that if the user does not explicitly enable at least one package in some way, then nothing will be enabled or built. In this case, when ``${PROJECT_NAME}_ALLOW_NO_PACKAGES=TRUE`` a warning @@ -3742,7 +3755,7 @@ In more detail, these rules/behaviors are: .. _TriBITS prints all enables and disables to stdout: -21) **TriBITS prints all enables and disables to stdout**: TriBITS prints out +22) **TriBITS prints all enables and disables to stdout**: TriBITS prints out (to ``cmake`` stdout) the initial set of enables/disables on input, prints a line whenever it sets (or overrides) an enable or disable, and prints out the final set of enables/disables. Therefore, the user just needs to @@ -3755,7 +3768,7 @@ In more detail, these rules/behaviors are: .. _TriBITS auto-enables/disables done using non-cache local variables: -22) **TriBITS auto-enables/disables done using non-cache local variables**: +23) **TriBITS auto-enables/disables done using non-cache local variables**: TriBITS setting (or overrides) of enable/disable cache variables are done by setting local non-cache variables at the top project-level scope (i.e. the ``/CMakeLists.txt`` file scope). This is done so diff --git a/cmake/tribits/doc/guides/TribitsMacroFunctionDocTemplate.rst b/cmake/tribits/doc/guides/TribitsMacroFunctionDocTemplate.rst index c0916454df5b..c045c1962e54 100644 --- a/cmake/tribits/doc/guides/TribitsMacroFunctionDocTemplate.rst +++ b/cmake/tribits/doc/guides/TribitsMacroFunctionDocTemplate.rst @@ -44,7 +44,6 @@ @MACRO: tribits_project_enable_all() + @MACRO: tribits_repository_define_packages() + @MACRO: tribits_repository_define_tpls() + -@MACRO: tribits_set_and_inc_dirs() + @FUNCTION: tribits_set_st_for_dev_mode() + @MACRO: tribits_subpackage() + @MACRO: tribits_subpackage_postprocess() + diff --git a/cmake/tribits/doc/guides/TribitsSystemMacroFunctionDocTemplate.rst b/cmake/tribits/doc/guides/TribitsSystemMacroFunctionDocTemplate.rst index a8c9f53d216a..e42125762328 100644 --- a/cmake/tribits/doc/guides/TribitsSystemMacroFunctionDocTemplate.rst +++ b/cmake/tribits/doc/guides/TribitsSystemMacroFunctionDocTemplate.rst @@ -13,9 +13,8 @@ understand the internals of TriBITS. @FUNCTION: tribits_abort_on_missing_package() + @FUNCTION: tribits_abort_on_self_dep() + @MACRO: tribits_adjust_package_enables() + -@MACRO: tribits_append_forward_dep_packages() + +@FUNCTION: tribits_append_forward_dep_packages() + @MACRO: tribits_assert_read_dependency_vars() + -@FUNCTION: tribits_dump_package_dependencies_info() + @FUNCTION: tribits_extpkg_add_find_upstream_dependencies_str() + @FUNCTION: tribits_extpkg_create_all_libs_target() + @FUNCTION: tribits_extpkg_install_config_file() + @@ -23,10 +22,7 @@ understand the internals of TriBITS. @FUNCTION: tribits_extpkg_process_libraries_list() + @MACRO: tribits_extpkg_setup_enabled_dependencies() + @FUNCTION: tribits_extpkg_write_config_version_file() + -@FUNCTION: tribits_get_sublist_disabled() + -@FUNCTION: tribits_get_sublist_enabled() + -@FUNCTION: tribits_get_sublist_nondisabled() + -@FUNCTION: tribits_get_sublist_nonenabled() + +@FUNCTION: tribits_dump_package_dependencies_info() + @FUNCTION: tribits_print_initial_dependency_info() + @FUNCTION: tribits_print_tentatively_enabled_tpls() + @MACRO: tribits_parse_subpackages_append_packages_add_options() + @@ -46,7 +42,7 @@ understand the internals of TriBITS. @MACRO: tribits_read_subpackage_deps_file_add_to_graph() + @MACRO: tribits_read_toplevel_package_deps_files_add_to_graph() + @MACRO: tribits_save_off_dependency_vars() + -@MACRO: tribits_set_dep_packages() + +@FUNCTION: tribits_set_dep_packages() + @FUNCTION: tribits_trace_file_processing() + @FUNCTION: tribits_write_package_client_export_files_install_targets() + @MACRO: tribits_write_xml_dependency_files() + diff --git a/cmake/tribits/doc/guides/UtilsMacroFunctionDocTemplate.rst b/cmake/tribits/doc/guides/UtilsMacroFunctionDocTemplate.rst index acc98214c162..f5c4cf3970d2 100644 --- a/cmake/tribits/doc/guides/UtilsMacroFunctionDocTemplate.rst +++ b/cmake/tribits/doc/guides/UtilsMacroFunctionDocTemplate.rst @@ -31,6 +31,7 @@ @FUNCTION: print_var() + @FUNCTION: print_var_with_spaces() + @FUNCTION: remove_global_duplicates() + +@MACRO: set_and_inc_dirs() + @FUNCTION: set_cache_on_off_empty() + @MACRO: set_default() + @MACRO: set_default_and_from_env() + @@ -38,10 +39,6 @@ @FUNCTION: timer_get_raw_seconds() + @FUNCTION: timer_get_rel_seconds() + @FUNCTION: timer_print_rel_time() + -@FUNCTION: tribits_add_enum_cache_var() + -@FUNCTION: tribits_deprecated() + -@FUNCTION: tribits_deprecated_command() + -@MACRO: tribits_create_reverse_list() + @FUNCTION: tribits_strip_quotes_from_str() + @FUNCTION: unittest_compare_const() + @FUNCTION: unittest_has_substr_const() + diff --git a/cmake/tribits/doc/guides/users_guide/TribitsUsersGuide.rst b/cmake/tribits/doc/guides/users_guide/TribitsUsersGuide.rst index be4cee320ff3..96d44b9e9abe 100644 --- a/cmake/tribits/doc/guides/users_guide/TribitsUsersGuide.rst +++ b/cmake/tribits/doc/guides/users_guide/TribitsUsersGuide.rst @@ -106,5 +106,3 @@ Appendix .. _tribits_read_all_project_deps_files_create_deps_graph(): TribitsMaintainersGuide.html#tribits-read-all-project-deps-files-create-deps-graph .. _${PACKAGE_NAME}_LIB_DEFINED_DEPENDENCIES: TribitsMaintainersGuide.html#package-name-lib-enabled-dependencies - -.. _${PACKAGE_NAME}_TEST_DEFINED_DEPENDENCIES: TribitsMaintainersGuide.html#package-name-test-enabled-dependencies diff --git a/cmake/tribits/examples/InsertedPkg/CMakeLists.txt b/cmake/tribits/examples/InsertedPkg/CMakeLists.txt index 7df9c56e8157..59554162100b 100644 --- a/cmake/tribits/examples/InsertedPkg/CMakeLists.txt +++ b/cmake/tribits/examples/InsertedPkg/CMakeLists.txt @@ -1,6 +1,6 @@ tribits_package(InsertedPkg) -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library( externalpkg diff --git a/cmake/tribits/examples/MixedSharedStaticLibs/shared_only/CMakeLists.txt b/cmake/tribits/examples/MixedSharedStaticLibs/shared_only/CMakeLists.txt index 7cec4e8cad26..5a4746eda691 100644 --- a/cmake/tribits/examples/MixedSharedStaticLibs/shared_only/CMakeLists.txt +++ b/cmake/tribits/examples/MixedSharedStaticLibs/shared_only/CMakeLists.txt @@ -1,6 +1,6 @@ tribits_subpackage(SharedOnly) -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library( shared_only_lib diff --git a/cmake/tribits/examples/MixedSharedStaticLibs/static_only/CMakeLists.txt b/cmake/tribits/examples/MixedSharedStaticLibs/static_only/CMakeLists.txt index 7df2594891a6..62e8bddd8490 100644 --- a/cmake/tribits/examples/MixedSharedStaticLibs/static_only/CMakeLists.txt +++ b/cmake/tribits/examples/MixedSharedStaticLibs/static_only/CMakeLists.txt @@ -1,6 +1,6 @@ tribits_subpackage(StaticOnly) -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library( static_only_lib diff --git a/cmake/tribits/examples/MockTrilinos/TPLsList.cmake b/cmake/tribits/examples/MockTrilinos/TPLsList.cmake index e83c918dce24..7e9335cf2908 100644 --- a/cmake/tribits/examples/MockTrilinos/TPLsList.cmake +++ b/cmake/tribits/examples/MockTrilinos/TPLsList.cmake @@ -10,7 +10,6 @@ tribits_repository_define_tpls( ADOLC cmake/TPLs/ ST ADIC cmake/TPLs/ EX TVMET cmake/TPLs/ ST - #Zlib cmake/TPLs/ PT # Listed in zoltan/cmake/Dependencies.cmake! y12m cmake/TPLs/ ST SuperLUDist cmake/TPLs/ ST SuperLU cmake/TPLs/ ST diff --git a/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLLAPACKDependencies.cmake b/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLLAPACKDependencies.cmake deleted file mode 100644 index 0256dbbfd4dd..000000000000 --- a/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLLAPACKDependencies.cmake +++ /dev/null @@ -1,2 +0,0 @@ -tribits_extpkg_define_dependencies( LAPACK - DEPENDENCIES BLAS) diff --git a/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLParMETISDependencies.cmake b/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLParMETISDependencies.cmake deleted file mode 100644 index d999aca2b2ae..000000000000 --- a/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLParMETISDependencies.cmake +++ /dev/null @@ -1,2 +0,0 @@ -tribits_extpkg_define_dependencies( ParMETIS - DEPENDENCIES METIS) diff --git a/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDependencies.cmake b/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDependencies.cmake deleted file mode 100644 index 47a938258d0d..000000000000 --- a/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDependencies.cmake +++ /dev/null @@ -1,2 +0,0 @@ -tribits_extpkg_define_dependencies( SuperLU - DEPENDENCIES ParMETIS BLAS) diff --git a/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDistDependencies.cmake b/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDistDependencies.cmake deleted file mode 100644 index d0419545d2cd..000000000000 --- a/cmake/tribits/examples/MockTrilinos/cmake/TPLs/FindTPLSuperLUDistDependencies.cmake +++ /dev/null @@ -1,2 +0,0 @@ -tribits_extpkg_define_dependencies( SuperLUDist - DEPENDENCIES ParMETIS BLAS) diff --git a/cmake/tribits/examples/MockTrilinos/packages/zoltan/cmake/Dependencies.cmake b/cmake/tribits/examples/MockTrilinos/packages/zoltan/cmake/Dependencies.cmake index 5d3bfcfe0062..06261248bff8 100644 --- a/cmake/tribits/examples/MockTrilinos/packages/zoltan/cmake/Dependencies.cmake +++ b/cmake/tribits/examples/MockTrilinos/packages/zoltan/cmake/Dependencies.cmake @@ -37,12 +37,6 @@ # ************************************************************************ # @HEADER -if (SHOW_INVALID_TPL_NAME_ERROR) - set(Zlib_str Zlib) -else() - set(Zlib_str "") -endif() - tribits_package_define_dependencies( - LIB_OPTIONAL_TPLS MPI ParMETIS Scotch ${Zlib_str} + LIB_OPTIONAL_TPLS MPI ParMETIS Scotch Zlib ) diff --git a/cmake/tribits/examples/ReducedMockTrilinos/TPLsList.cmake b/cmake/tribits/examples/ReducedMockTrilinos/TPLsList.cmake index 4de9acf2a02c..542b88f79412 100644 --- a/cmake/tribits/examples/ReducedMockTrilinos/TPLsList.cmake +++ b/cmake/tribits/examples/ReducedMockTrilinos/TPLsList.cmake @@ -1,8 +1,8 @@ tribits_repository_define_tpls( - MPI "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" PT - BLAS "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" PT - LAPACK "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" PT - Boost cmake/TPLs/ ST + MPI "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" PT + BLAS "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" PT + LAPACK "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" PT + Boost "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" ST UMFPACK cmake/TPLs/ ST AMD cmake/TPLs/ EX PETSC "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" ST diff --git a/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/PackagesList.cmake b/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/PackagesList.cmake deleted file mode 100644 index 41002b84335d..000000000000 --- a/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/PackagesList.cmake +++ /dev/null @@ -1,3 +0,0 @@ -tribits_repository_define_packages( - DependsOnLAPACK . PT - ) diff --git a/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/TPLsList.cmake b/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/TPLsList.cmake deleted file mode 100644 index e85baf197743..000000000000 --- a/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/TPLsList.cmake +++ /dev/null @@ -1 +0,0 @@ -tribits_repository_define_tpls() diff --git a/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/cmake/Dependencies.cmake b/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/cmake/Dependencies.cmake deleted file mode 100644 index 3f688dcd49e9..000000000000 --- a/cmake/tribits/examples/ReducedMockTrilinos/extraRepos/DependsOnLAPACK/cmake/Dependencies.cmake +++ /dev/null @@ -1,3 +0,0 @@ -tribits_package_define_dependencies( - LIB_REQUIRED_TPLS LAPACK - ) diff --git a/cmake/tribits/examples/TargetDefinesPkg/CMakeLists.txt b/cmake/tribits/examples/TargetDefinesPkg/CMakeLists.txt index 0952d5736ffd..4ca9cd0fa681 100644 --- a/cmake/tribits/examples/TargetDefinesPkg/CMakeLists.txt +++ b/cmake/tribits/examples/TargetDefinesPkg/CMakeLists.txt @@ -1,6 +1,6 @@ tribits_package(TargetDefinesPkg) -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library( targetdefinespkg diff --git a/cmake/tribits/examples/TribitsExampleApp/AppHelperFuncs.cmake b/cmake/tribits/examples/TribitsExampleApp/AppHelperFuncs.cmake index bfd38d81577b..471f33eb2d20 100644 --- a/cmake/tribits/examples/TribitsExampleApp/AppHelperFuncs.cmake +++ b/cmake/tribits/examples/TribitsExampleApp/AppHelperFuncs.cmake @@ -65,6 +65,7 @@ macro(getTribitsExProjStuffForAppByProject) message(" TribitsExProj_DIR = ${TribitsExProj_DIR}") message(" TribitsExProj_VERSION = ${TribitsExProj_VERSION}") message(" TribitsExProj_PACKAGE_LIST = ${TribitsExProj_PACKAGE_LIST}") + message(" TribitsExProj_TPL_LIST = ${TribitsExProj_TPL_LIST}") message(" TribitsExProj_BUILD_SHARED_LIBS = ${TribitsExProj_BUILD_SHARED_LIBS}") message("End of TribitsExProj details\n") @@ -138,7 +139,7 @@ endfunction() # function(getExpectedAppDepsStr expectedDepsStrOut) - if (TARGET SimpleTpl::all_libs) + if ("SimpleTpl" IN_LIST SimpleCxx_TPL_LIST) set(simpleCxxDeps "simpletpl ") else() set(simpleCxxDeps "") diff --git a/cmake/tribits/examples/TribitsExampleProject/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/CMakeLists.txt index f413d381b010..a44121b807fa 100644 --- a/cmake/tribits/examples/TribitsExampleProject/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/CMakeLists.txt @@ -27,8 +27,6 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/ProjectName.cmake") # not in an include file :-( project(${PROJECT_NAME} NONE) -set(TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE TRUE) - # # B) Pull in the TriBITS system and execute # diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/mixed_lang/src/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/mixed_lang/src/CMakeLists.txt index ddbeb6658fe0..a8d33b430650 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/mixed_lang/src/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/mixed_lang/src/CMakeLists.txt @@ -4,12 +4,12 @@ tribits_configure_file(${PACKAGE_NAME}_config.h) set(HEADERS "") set(SOURCES "") -tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) append_set(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) append_set(HEADERS MixedLang.hpp Ray_Tracer.hh diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/src/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/src/CMakeLists.txt index 234a196d5144..d00de0da8757 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/src/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/src/CMakeLists.txt @@ -11,12 +11,12 @@ tribits_configure_file(${PACKAGE_NAME}_config.h) set(HEADERS "") set(SOURCES "") -tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) append_set(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) append_set(HEADERS SimpleCxx_HelloWorld.hpp ) diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/CMakeLists.txt index f553d4ef2bc9..4b39105c91bc 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/CMakeLists.txt @@ -1,6 +1,3 @@ -tribits_include_directories( REQUIRED_DURING_INSTALLATION_TESTING - ${CMAKE_CURRENT_SOURCE_DIR}/inc ) - tribits_add_executable_and_test( HelloWorldTests SOURCES diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/SimpleCxx_HelloWorld_Tests.cpp b/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/SimpleCxx_HelloWorld_Tests.cpp index 85430c8cffea..575555ffbe59 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/SimpleCxx_HelloWorld_Tests.cpp +++ b/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/SimpleCxx_HelloWorld_Tests.cpp @@ -1,4 +1,9 @@ -#include "SimpleCxx_HelloWorld_Tests.hpp" + +#include +#include +#include +#include "SimpleCxx_HelloWorld.hpp" +#include "HeaderOnlyTpl_stuff.hpp" #define TEST_FIND_SUBSTR_IN_STR(SUBSTR, STR) \ diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/inc/SimpleCxx_HelloWorld_Tests.hpp b/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/inc/SimpleCxx_HelloWorld_Tests.hpp deleted file mode 100644 index 78b70ccc3d89..000000000000 --- a/cmake/tribits/examples/TribitsExampleProject/packages/simple_cxx/test/inc/SimpleCxx_HelloWorld_Tests.hpp +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef SIMPLECXX_HELLOWORLD_TESTS_HPP -#define SIMPLECXX_HELLOWORLD_TESTS_HPP - -#include -#include -#include -#include "SimpleCxx_HelloWorld.hpp" -#include "HeaderOnlyTpl_stuff.hpp" - -#endif // SIMPLECXX_HELLOWORLD_TESTS_HPP diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/a/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/a/CMakeLists.txt index 9de350b0a25a..e7cdf9cf6f63 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/a/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/a/CMakeLists.txt @@ -16,9 +16,9 @@ tribits_pkg_export_cache_var(${PACKAGE_NAME}_SPECIAL_VALUE) tribits_configure_file(${PACKAGE_NAME}_config.h) -tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library(pws_a SOURCES A.cpp HEADERS A.hpp ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/src/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/src/CMakeLists.txt index 0f64659a5c98..cde554625db3 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/src/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/src/CMakeLists.txt @@ -1,10 +1,10 @@ tribits_configure_file(${PACKAGE_NAME}_config.h) -tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) include(${CMAKE_CURRENT_LIST_DIR}/ShowLibErrors.cmake) -tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library(pws_b SOURCES B.cpp HEADERS B.hpp ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/tests/testlib/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/tests/testlib/CMakeLists.txt index 215659e60f2b..407fc6a27fe7 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/tests/testlib/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/b/tests/testlib/CMakeLists.txt @@ -1,6 +1,6 @@ # Define the include dirs for the TESTONLY lib. -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) # # Create a test-only b_mixed_lang lib which uses the optional test dependent diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/c/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/c/CMakeLists.txt index 696a5815c850..475912fac4ab 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/c/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/with_subpackages/c/CMakeLists.txt @@ -7,7 +7,7 @@ tribits_add_executable( c_util include(${CMAKE_CURRENT_LIST_DIR}/ShowLibErrors.cmake) -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library(pws_c SOURCES C.cpp HEADERS wsp_c/C.hpp diff --git a/cmake/tribits/examples/TribitsExampleProject/packages/wrap_external/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject/packages/wrap_external/CMakeLists.txt index 0efcd994f721..3adfc2cdb90b 100644 --- a/cmake/tribits/examples/TribitsExampleProject/packages/wrap_external/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject/packages/wrap_external/CMakeLists.txt @@ -145,7 +145,7 @@ add_dependencies(build_external_func pws_a) append_set(${PACKAGE_NAME}_LIB_TARGETS external_func) global_set(${PACKAGE_NAME}_LIBRARIES external_func pws_a) global_set(${PACKAGE_NAME}_HAS_NATIVE_LIBRARIES ON) -tribits_include_directories(${EXTERNAL_FUNC_SOURCE_DIR}) +include_directories(${EXTERNAL_FUNC_SOURCE_DIR}) # NOTE: Above, you have to add the upstream dependent libraries to the current # package's list of libraries because you can't link to an importing lib with # link_target_libraries() :-( diff --git a/cmake/tribits/examples/TribitsExampleProject2/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject2/CMakeLists.txt index 8e63bc40e843..661cb556e0a0 100644 --- a/cmake/tribits/examples/TribitsExampleProject2/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject2/CMakeLists.txt @@ -7,7 +7,6 @@ cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR) include("${CMAKE_CURRENT_SOURCE_DIR}/ProjectName.cmake") project(${PROJECT_NAME} LANGUAGES NONE) -set(TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE TRUE) set(${PROJECT_NAME}_TRIBITS_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." CACHE STRING "TriBITS base directory (default assumes in TriBITS source tree)") diff --git a/cmake/tribits/examples/TribitsExampleProject2/packages/package1/src/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject2/packages/package1/src/CMakeLists.txt index b74162bb25ed..a0d23199e246 100644 --- a/cmake/tribits/examples/TribitsExampleProject2/packages/package1/src/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject2/packages/package1/src/CMakeLists.txt @@ -1,7 +1,7 @@ set(HEADERS "") set(SOURCES "") -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) append_set(HEADERS Package1.hpp diff --git a/cmake/tribits/examples/TribitsExampleProject2/packages/package2/src/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject2/packages/package2/src/CMakeLists.txt index 5f95a0ef0b9a..1de2194cb03a 100644 --- a/cmake/tribits/examples/TribitsExampleProject2/packages/package2/src/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject2/packages/package2/src/CMakeLists.txt @@ -2,9 +2,9 @@ set(HEADERS "") set(SOURCES "") tribits_configure_file(${PACKAGE_NAME}_config.h) -tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) append_set(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h diff --git a/cmake/tribits/examples/TribitsExampleProject2/packages/package3/src/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProject2/packages/package3/src/CMakeLists.txt index 8b36f56b97af..ffe0ecc60d12 100644 --- a/cmake/tribits/examples/TribitsExampleProject2/packages/package3/src/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProject2/packages/package3/src/CMakeLists.txt @@ -2,9 +2,9 @@ set(HEADERS "") set(SOURCES "") tribits_configure_file(${PACKAGE_NAME}_config.h) -tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) append_set(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h diff --git a/cmake/tribits/examples/TribitsExampleProjectAddons/packages/addon1/src/CMakeLists.txt b/cmake/tribits/examples/TribitsExampleProjectAddons/packages/addon1/src/CMakeLists.txt index c890968cdb23..d4fffaa075b4 100644 --- a/cmake/tribits/examples/TribitsExampleProjectAddons/packages/addon1/src/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsExampleProjectAddons/packages/addon1/src/CMakeLists.txt @@ -1,4 +1,4 @@ -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) tribits_add_library(addon1 SOURCES Addon1.cpp HEADERS Addon1.hpp diff --git a/cmake/tribits/examples/TribitsOldSimpleExampleApp/CMakeLists.txt b/cmake/tribits/examples/TribitsOldSimpleExampleApp/CMakeLists.txt index b0d9d5d0699b..34302ee7b669 100644 --- a/cmake/tribits/examples/TribitsOldSimpleExampleApp/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsOldSimpleExampleApp/CMakeLists.txt @@ -52,14 +52,11 @@ target_include_directories(app enable_testing() -if ("SimpleTpl" IN_LIST TribitsExProj_TPL_LIST OR TARGET SimpleTpl::all_libs) +if ("SimpleTpl" IN_LIST TribitsExProj_TPL_LIST) set(simpleCxxDeps "simpletpl headeronlytpl") else() set(simpleCxxDeps "headeronlytpl") endif() -# NOTE: Above, TribitsExProj_TPL_LIST does not exist in new TriBITS so to make -# this work for new TriBITS as well, we need to check for target -# SimpleTpl::all_libs. Small price to pay for progress! add_test(NAME util_test COMMAND util) set_tests_properties(util_test PROPERTIES diff --git a/cmake/tribits/examples/TribitsSimpleExampleApp/CMakeLists.txt b/cmake/tribits/examples/TribitsSimpleExampleApp/CMakeLists.txt index 58725b4fc565..425e0717cdde 100644 --- a/cmake/tribits/examples/TribitsSimpleExampleApp/CMakeLists.txt +++ b/cmake/tribits/examples/TribitsSimpleExampleApp/CMakeLists.txt @@ -39,7 +39,7 @@ target_link_libraries(app PRIVATE TribitsExProj::all_selected_libs) enable_testing() -if (TARGET SimpleTpl::all_libs) +if ("SimpleTpl" IN_LIST TribitsExProj_TPL_LIST) set(simpleCxxDeps "simpletpl headeronlytpl") else() set(simpleCxxDeps "headeronlytpl") diff --git a/commonTools/gtest/CMakeLists.txt b/commonTools/gtest/CMakeLists.txt index 72535fe88c20..210d6218c186 100644 --- a/commonTools/gtest/CMakeLists.txt +++ b/commonTools/gtest/CMakeLists.txt @@ -5,7 +5,7 @@ SET(${PACKAGE_NAME}_SKIP_INSTALL FALSE CACHE BOOL ADD_DEFINITIONS(-DGTEST_HAS_PTHREAD=0) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/gtest/gtest.h diff --git a/packages/adelus/example/CMakeLists.txt b/packages/adelus/example/CMakeLists.txt index de56f780fc00..3fdcc9bfa670 100644 --- a/packages/adelus/example/CMakeLists.txt +++ b/packages/adelus/example/CMakeLists.txt @@ -54,7 +54,7 @@ PROJECT(my_Adelus_driver C CXX) ADD_DEFINITIONS(-DKKVIEW_API) -TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_INCLUDE_DIRS} ${Trilinos_TPL_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(${Trilinos_INCLUDE_DIRS} ${Trilinos_TPL_INCLUDE_DIRS}) LINK_DIRECTORIES(${Trilinos_LIBRARY_DIRS} ${Trilinos_TPL_LIBRARY_DIRS}) ADD_EXECUTABLE(adelus_driver adelus_driver.cpp) diff --git a/packages/adelus/src/CMakeLists.txt b/packages/adelus/src/CMakeLists.txt index 3228959e7b45..81717dd70d3b 100644 --- a/packages/adelus/src/CMakeLists.txt +++ b/packages/adelus/src/CMakeLists.txt @@ -21,13 +21,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # Core files diff --git a/packages/amesos/src/CMakeLists.txt b/packages/amesos/src/CMakeLists.txt index 74fe29686dfb..ac5445e53316 100644 --- a/packages/amesos/src/CMakeLists.txt +++ b/packages/amesos/src/CMakeLists.txt @@ -20,7 +20,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -30,7 +30,7 @@ SET(HEADERS ${HEADERS} # support files # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES ${SOURCES} Amesos_Status.cpp diff --git a/packages/amesos2/src/CMakeLists.txt b/packages/amesos2/src/CMakeLists.txt index 49725393f27a..0504cf45a19a 100644 --- a/packages/amesos2/src/CMakeLists.txt +++ b/packages/amesos2/src/CMakeLists.txt @@ -60,7 +60,7 @@ SET(SOURCES "") ASSERT_DEFINED(PROJECT_SOURCE_DIR) -TRIBITS_INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) # If we use Trilinos_version then "make install" will fail. #APPEND_SET(HEADERS @@ -69,7 +69,7 @@ TRIBITS_INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) # Set headers (for IDEs and installing) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -78,14 +78,14 @@ APPEND_SET(HEADERS # NOTE: Above, we add the XXX_config.h file so that MS Visual Studio # will know to include this file in the dependency analysis -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/basker) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/KLU2/Include) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/KLU2/Source) -TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/AMD/Include) -TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/COLAMD/Include) -TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/BTF/Include) -TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/UFconfig) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/basker) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/KLU2/Include) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/KLU2/Source) +INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/AMD/Include) +INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/COLAMD/Include) +INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/BTF/Include) +INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/UFconfig) APPEND_SET(HEADERS Amesos2.hpp @@ -258,7 +258,7 @@ IF (${PACKAGE_NAME}_ENABLE_Basker) Amesos2_Basker.cpp ) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/basker) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/basker) APPEND_SET(HEADERS basker/basker.hpp basker/basker_decl.hpp diff --git a/packages/amesos2/src/KLU2/Source/CMakeLists.txt b/packages/amesos2/src/KLU2/Source/CMakeLists.txt index cd0c09eddeac..bb834a60373e 100644 --- a/packages/amesos2/src/KLU2/Source/CMakeLists.txt +++ b/packages/amesos2/src/KLU2/Source/CMakeLists.txt @@ -61,11 +61,11 @@ SET(SOURCES "") ASSERT_DEFINED(PROJECT_SOURCE_DIR) -TRIBITS_INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) # Set headers (for IDEs and installing) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -74,12 +74,12 @@ APPEND_SET(HEADERS # NOTE: Above, we add the XXX_config.h file so that MS Visual Studio # will know to include this file in the dependency analysis -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Include) -TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/AMD/Include) -TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/COLAMD/Include) -TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/BTF/Include) -TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/UFconfig) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Include) +INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/AMD/Include) +INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/COLAMD/Include) +INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/BTF/Include) +INCLUDE_DIRECTORIES(${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/UFconfig) APPEND_SET(HEADERS klu2_analyze_given.hpp diff --git a/packages/anasazi/epetra/src-rbgen/CMakeLists.txt b/packages/anasazi/epetra/src-rbgen/CMakeLists.txt index 7e81360f6fb9..e656ed7342d6 100644 --- a/packages/anasazi/epetra/src-rbgen/CMakeLists.txt +++ b/packages/anasazi/epetra/src-rbgen/CMakeLists.txt @@ -12,8 +12,8 @@ SET(HEADERS "") SET(NOINSTALLHEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src-rbgen) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src-rbgen) # Abstract headers APPEND_SET(HEADERS diff --git a/packages/anasazi/epetra/src/CMakeLists.txt b/packages/anasazi/epetra/src/CMakeLists.txt index ccfdd298d0a8..31808b60d7cc 100644 --- a/packages/anasazi/epetra/src/CMakeLists.txt +++ b/packages/anasazi/epetra/src/CMakeLists.txt @@ -19,7 +19,7 @@ CONFIGURE_FILE("${Trilinos_SOURCE_DIR}/packages/Trilinos_DLLExportMacro.h.in" SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}epetra_DLLExportMacro.h @@ -29,7 +29,7 @@ APPEND_SET(HEADERS # Core Files # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS AnasaziEpetraAdapter.hpp diff --git a/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt b/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt index 0677098dd017..4f8634ddb410 100644 --- a/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt +++ b/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt @@ -19,7 +19,7 @@ CONFIGURE_FILE("${Trilinos_SOURCE_DIR}/packages/Trilinos_DLLExportMacro.h.in" SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}epetra_ModeLaplace_DLLExportMacro.h ) @@ -28,7 +28,7 @@ APPEND_SET(HEADERS # Core Files # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS BlockPCGSolver.h diff --git a/packages/anasazi/src-rbgen/CMakeLists.txt b/packages/anasazi/src-rbgen/CMakeLists.txt index b7aa155894f1..d27665c2de73 100644 --- a/packages/anasazi/src-rbgen/CMakeLists.txt +++ b/packages/anasazi/src-rbgen/CMakeLists.txt @@ -12,7 +12,7 @@ SET(HEADERS "") SET(NOINSTALLHEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Abstract headers APPEND_SET(HEADERS diff --git a/packages/anasazi/src/CMakeLists.txt b/packages/anasazi/src/CMakeLists.txt index d882ecc53cec..2442699c34d5 100644 --- a/packages/anasazi/src/CMakeLists.txt +++ b/packages/anasazi/src/CMakeLists.txt @@ -36,7 +36,7 @@ CONFIGURE_FILE("${Trilinos_SOURCE_DIR}/packages/Trilinos_DLLExportMacro.h.in" SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -47,7 +47,7 @@ SET(HEADERS ${HEADERS} # Core Files # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS AnasaziBasicEigenproblem.hpp @@ -149,7 +149,7 @@ APPEND_SET(HEADERS ASSERT_DEFINED(Anasazi_ENABLE_ThyraCore) IF (Anasazi_ENABLE_ThyraCore) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../thyra/src) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../thyra/src) APPEND_SET(HEADERS ../thyra/src/AnasaziThyraAdapter.hpp ../thyra/src/AnasaziThyraDebugAdapter.hpp @@ -158,7 +158,7 @@ ENDIF() ASSERT_DEFINED(Anasazi_ENABLE_Tpetra) IF (Anasazi_ENABLE_Tpetra) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../tpetra/src) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../tpetra/src) # The AnasaziTpetraAdapter headers are already pulled in by # <./packages/anasazi/tpetra/src/CMakeLists.txt>. ENDIF() diff --git a/packages/anasazi/test/CMakeLists.txt b/packages/anasazi/test/CMakeLists.txt index 51adf9fd4f96..2c9310b768e6 100644 --- a/packages/anasazi/test/CMakeLists.txt +++ b/packages/anasazi/test/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/MVOPTester) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/MVOPTester) ADD_SUBDIRECTORY(MVOPTester) ADD_SUBDIRECTORY(OrthoManager) diff --git a/packages/anasazi/test/OrthoManager/CMakeLists.txt b/packages/anasazi/test/OrthoManager/CMakeLists.txt index 99da387d570e..06826bd9a689 100644 --- a/packages/anasazi/test/OrthoManager/CMakeLists.txt +++ b/packages/anasazi/test/OrthoManager/CMakeLists.txt @@ -6,7 +6,7 @@ IF (${PACKAGE_NAME}_ENABLE_Triutils) # FIXME (mfh 04 Aug 2010) IF ({${PACKAGE_NAME}_ENABLE_COMPLEX) - TRIBITS_INCLUDE_DIRECTORIES(../MVOPTester) + INCLUDE_DIRECTORIES(../MVOPTester) TRIBITS_ADD_EXECUTABLE_AND_TEST( OrthoManagerComplexTester diff --git a/packages/anasazi/thyra/src/CMakeLists.txt b/packages/anasazi/thyra/src/CMakeLists.txt index 796154d065d6..2f59e80fa9e4 100644 --- a/packages/anasazi/thyra/src/CMakeLists.txt +++ b/packages/anasazi/thyra/src/CMakeLists.txt @@ -17,7 +17,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -27,7 +27,7 @@ SET(HEADERS ${HEADERS} # Core Files # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS AnasaziBasicEigenproblem.hpp diff --git a/packages/anasazi/tpetra/src/CMakeLists.txt b/packages/anasazi/tpetra/src/CMakeLists.txt index 6660448f0b39..37be72368a39 100644 --- a/packages/anasazi/tpetra/src/CMakeLists.txt +++ b/packages/anasazi/tpetra/src/CMakeLists.txt @@ -15,13 +15,13 @@ SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # # Core Files # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS AnasaziTpetraAdapter.hpp diff --git a/packages/aztecoo/src/CMakeLists.txt b/packages/aztecoo/src/CMakeLists.txt index b27c6f58a3b4..4e9738592059 100644 --- a/packages/aztecoo/src/CMakeLists.txt +++ b/packages/aztecoo/src/CMakeLists.txt @@ -27,13 +27,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # C files diff --git a/packages/belos/doc/parameterList/CMakeLists.txt b/packages/belos/doc/parameterList/CMakeLists.txt index b5d958c7f771..b307d66ad464 100644 --- a/packages/belos/doc/parameterList/CMakeLists.txt +++ b/packages/belos/doc/parameterList/CMakeLists.txt @@ -2,7 +2,7 @@ IF (${PACKAGE_NAME}_ENABLE_Tpetra) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../tpetra/src ) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../tpetra/src ) # Create the ValidParameters executable TRIBITS_ADD_EXECUTABLE( diff --git a/packages/belos/epetra/src/CMakeLists.txt b/packages/belos/epetra/src/CMakeLists.txt index 0f658527713c..1f9c2c6a29d4 100644 --- a/packages/belos/epetra/src/CMakeLists.txt +++ b/packages/belos/epetra/src/CMakeLists.txt @@ -15,13 +15,13 @@ SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # # Core Files # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS BelosEpetraAdapter.hpp diff --git a/packages/belos/kokkos/example/CMakeLists.txt b/packages/belos/kokkos/example/CMakeLists.txt index 2539e714db0c..b493959ea9af 100644 --- a/packages/belos/kokkos/example/CMakeLists.txt +++ b/packages/belos/kokkos/example/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${Belos_SOURCE_DIR}/kokkos/src) +INCLUDE_DIRECTORIES(${Belos_SOURCE_DIR}/kokkos/src) TRIBITS_ADD_EXECUTABLE_AND_TEST( Kokkos_BlockGmresEx diff --git a/packages/belos/kokkos/src/CMakeLists.txt b/packages/belos/kokkos/src/CMakeLists.txt index 3308e7f45a4d..4d8c6851c1f1 100644 --- a/packages/belos/kokkos/src/CMakeLists.txt +++ b/packages/belos/kokkos/src/CMakeLists.txt @@ -15,13 +15,13 @@ SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # # Core Files # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS BelosKokkosAdapter.hpp diff --git a/packages/belos/kokkos/test/CMakeLists.txt b/packages/belos/kokkos/test/CMakeLists.txt index 68b112e0894f..2a37af1bd697 100644 --- a/packages/belos/kokkos/test/CMakeLists.txt +++ b/packages/belos/kokkos/test/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${Belos_SOURCE_DIR}/kokkos/src) +INCLUDE_DIRECTORIES(${Belos_SOURCE_DIR}/kokkos/src) TRIBITS_ADD_EXECUTABLE_AND_TEST( KokkosMVOPTest diff --git a/packages/belos/src/CMakeLists.txt b/packages/belos/src/CMakeLists.txt index 36df2b008ce6..664dc48f770f 100644 --- a/packages/belos/src/CMakeLists.txt +++ b/packages/belos/src/CMakeLists.txt @@ -13,13 +13,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # CORE APPEND_SET(HEADERS diff --git a/packages/belos/test/GCRODR/CMakeLists.txt b/packages/belos/test/GCRODR/CMakeLists.txt index fe9e1488a034..db62c961fb79 100644 --- a/packages/belos/test/GCRODR/CMakeLists.txt +++ b/packages/belos/test/GCRODR/CMakeLists.txt @@ -1,6 +1,6 @@ -TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../MVOPTester) +INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../MVOPTester) ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Triutils) IF (${PACKAGE_NAME}_ENABLE_Triutils) @@ -8,7 +8,7 @@ IF (${PACKAGE_NAME}_ENABLE_Triutils) ASSERT_DEFINED(Teuchos_ENABLE_COMPLEX) IF(Teuchos_ENABLE_COMPLEX) - TRIBITS_INCLUDE_DIRECTORIES(../MVOPTester) + INCLUDE_DIRECTORIES(../MVOPTester) TRIBITS_ADD_EXECUTABLE_AND_TEST( gcrodr_complex_hb diff --git a/packages/belos/tpetra/src/CMakeLists.txt b/packages/belos/tpetra/src/CMakeLists.txt index 0abb87db2e00..e0062875cc05 100644 --- a/packages/belos/tpetra/src/CMakeLists.txt +++ b/packages/belos/tpetra/src/CMakeLists.txt @@ -15,13 +15,13 @@ SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # # Core Files # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS BelosMultiVecTraits_Tpetra.hpp diff --git a/packages/belos/xpetra/src/CMakeLists.txt b/packages/belos/xpetra/src/CMakeLists.txt index b72027256ee8..65897f3b1a0d 100644 --- a/packages/belos/xpetra/src/CMakeLists.txt +++ b/packages/belos/xpetra/src/CMakeLists.txt @@ -15,13 +15,13 @@ SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # # Core Files # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) APPEND_SET(HEADERS BelosXpetraAdapter.hpp diff --git a/packages/common/auxiliarySoftware/SuiteSparse/src/CMakeLists.txt b/packages/common/auxiliarySoftware/SuiteSparse/src/CMakeLists.txt index a358b6f5e84a..76cdf26bc963 100644 --- a/packages/common/auxiliarySoftware/SuiteSparse/src/CMakeLists.txt +++ b/packages/common/auxiliarySoftware/SuiteSparse/src/CMakeLists.txt @@ -21,14 +21,14 @@ SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/AMD/Include) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/BTF/Include) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/CAMD/Include) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/CCOLAMD/Include) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/COLAMD/Include) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/KLU/Include) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/UFconfig) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/AMD/Include) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/BTF/Include) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/CAMD/Include) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/CCOLAMD/Include) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/COLAMD/Include) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/KLU/Include) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/UFconfig) file(GLOB AMD_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/AMD/Include/*.h) file(GLOB BTF_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/BTF/Include/*.h) diff --git a/packages/compadre/examples/CMakeLists.tribits.cmake b/packages/compadre/examples/CMakeLists.tribits.cmake index 523f31cae25d..a6ee5a92d0ef 100644 --- a/packages/compadre/examples/CMakeLists.tribits.cmake +++ b/packages/compadre/examples/CMakeLists.tribits.cmake @@ -1,4 +1,4 @@ -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) #tribits_add_executable( # UnitTests diff --git a/packages/compadre/src/CMakeLists.tribits.cmake b/packages/compadre/src/CMakeLists.tribits.cmake index 8a7511905816..c714908c844c 100644 --- a/packages/compadre/src/CMakeLists.tribits.cmake +++ b/packages/compadre/src/CMakeLists.tribits.cmake @@ -11,13 +11,13 @@ bob_config_header(${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_Config.h ${PACKAGE set(HEADERS "") set(SOURCES "") -tribits_include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) set(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_Config.h ) -tribits_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) append_glob(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) list(REMOVE_ITEM HEADERS diff --git a/packages/domi/doc/parameterList/CMakeLists.txt b/packages/domi/doc/parameterList/CMakeLists.txt index 6a5d03b56fde..eb835efbac0a 100644 --- a/packages/domi/doc/parameterList/CMakeLists.txt +++ b/packages/domi/doc/parameterList/CMakeLists.txt @@ -42,7 +42,7 @@ # *********************************************************************** # @HEADER -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Create the ValidParameters executable TRIBITS_ADD_EXECUTABLE( diff --git a/packages/domi/src/CMakeLists.txt b/packages/domi/src/CMakeLists.txt index 91776dfcb0e2..31e31e2a08d3 100644 --- a/packages/domi/src/CMakeLists.txt +++ b/packages/domi/src/CMakeLists.txt @@ -73,8 +73,8 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) # # Set the include directories -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # Define the header and source files (and directories) diff --git a/packages/domi/test/MDArray/CMakeLists.txt b/packages/domi/test/MDArray/CMakeLists.txt index 7874d2c5e660..cb78a965ddcf 100644 --- a/packages/domi/test/MDArray/CMakeLists.txt +++ b/packages/domi/test/MDArray/CMakeLists.txt @@ -44,7 +44,7 @@ #INCLUDE(TribitsCopyFilesToBinaryDir) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Unit test the Slice class TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/domi/test/MDComm/CMakeLists.txt b/packages/domi/test/MDComm/CMakeLists.txt index c2aa3f3f66ba..721542809a95 100644 --- a/packages/domi/test/MDComm/CMakeLists.txt +++ b/packages/domi/test/MDComm/CMakeLists.txt @@ -44,7 +44,7 @@ #INCLUDE(TribitsCopyFilesToBinaryDir) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Create the MDComm unit test executable TRIBITS_ADD_EXECUTABLE( diff --git a/packages/domi/test/MDMap/CMakeLists.txt b/packages/domi/test/MDMap/CMakeLists.txt index a18f050171c9..f464419e7dcb 100644 --- a/packages/domi/test/MDMap/CMakeLists.txt +++ b/packages/domi/test/MDMap/CMakeLists.txt @@ -44,7 +44,7 @@ #INCLUDE(TribitsCopyFilesToBinaryDir) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Create the MDMap unit test executable TRIBITS_ADD_EXECUTABLE( diff --git a/packages/domi/test/MDVector/CMakeLists.txt b/packages/domi/test/MDVector/CMakeLists.txt index dfec34d53a32..d497e29ea175 100644 --- a/packages/domi/test/MDVector/CMakeLists.txt +++ b/packages/domi/test/MDVector/CMakeLists.txt @@ -44,7 +44,7 @@ #INCLUDE(TribitsCopyFilesToBinaryDir) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Create the MDVector unit test executable TRIBITS_ADD_EXECUTABLE( diff --git a/packages/epetra/CMakeLists.txt b/packages/epetra/CMakeLists.txt index 72e200ce0acf..91727f9c3167 100644 --- a/packages/epetra/CMakeLists.txt +++ b/packages/epetra/CMakeLists.txt @@ -70,7 +70,7 @@ IF(TPL_ENABLE_MKL) OFF ) IF(Epetra_ENABLE_MKL_SPARSE) - TRIBITS_INCLUDE_DIRECTORIES(${TPL_MKL_INCLUDE_DIRS}) + INCLUDE_DIRECTORIES(${TPL_MKL_INCLUDE_DIRS}) TRIBITS_ADD_OPTION_AND_DEFINE(${PACKAGE_NAME}_DISABLE_MKL_SPARSE_MM Epetra_DISABLE_MKL_SPARSE_MM diff --git a/packages/epetra/src/CMakeLists.txt b/packages/epetra/src/CMakeLists.txt index 427a313a2901..508dd7e27ff9 100644 --- a/packages/epetra/src/CMakeLists.txt +++ b/packages/epetra/src/CMakeLists.txt @@ -26,7 +26,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) # Set the base Trilinos directory in order to find Trilinos_version.h ASSERT_DEFINED(PROJECT_SOURCE_DIR) -TRIBITS_INCLUDE_DIRECTORIES(${Trilinos_BINARY_DIR}) +INCLUDE_DIRECTORIES(${Trilinos_BINARY_DIR}) SET(CURRENT_PACKAGE EPETRA) CONFIGURE_FILE("${Trilinos_SOURCE_DIR}/packages/Trilinos_DLLExportMacro.h.in" @@ -39,14 +39,14 @@ CONFIGURE_FILE("${Trilinos_SOURCE_DIR}/packages/Trilinos_DLLExportMacro.h.in" SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_DLLExportMacro.h ) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS ${HEADERS} Epetra_BLAS.h diff --git a/packages/epetraext/src/CMakeLists.txt b/packages/epetraext/src/CMakeLists.txt index f74358217703..0e0b05695f51 100644 --- a/packages/epetraext/src/CMakeLists.txt +++ b/packages/epetraext/src/CMakeLists.txt @@ -20,12 +20,12 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS ${HEADERS} EpetraExt_ConfigDefs.h @@ -50,7 +50,7 @@ SET(SOURCES ${SOURCES} IF (${PACKAGE_NAME}_BUILD_TRANSFORM) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/transform) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/transform) SET(HEADERS ${HEADERS} transform/EpetraExt_SubCopy_CrsMatrix.h @@ -121,7 +121,7 @@ ENDIF() IF (${PACKAGE_NAME}_BUILD_BTF) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/btf) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/btf) SET(HEADERS ${HEADERS} btf/EpetraExt_BTF_CrsGraph.h @@ -157,7 +157,7 @@ ENDIF() IF (${PACKAGE_NAME}_BUILD_INOUT) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/inout) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/inout) SET(HEADERS ${HEADERS} inout/EpetraExt_mmio.h @@ -217,7 +217,7 @@ ENDIF() IF (${PACKAGE_NAME}_BUILD_COLORING) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/coloring) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/coloring) SET(HEADERS ${HEADERS} coloring/EpetraExt_MapColoring.h @@ -238,7 +238,7 @@ ENDIF() IF (${PACKAGE_NAME}_BUILD_MATLAB) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/matlab) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/matlab) SET(HEADERS ${HEADERS} matlab/EpetraExt_MatlabEngine.h @@ -262,7 +262,7 @@ ENDIF() IF (${PACKAGE_NAME}_BUILD_MODEL_EVALUATOR) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/model_evaluator) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/model_evaluator) SET(HEADERS ${HEADERS} model_evaluator/EpetraExt_ModelEvaluator.h @@ -283,7 +283,7 @@ ENDIF() IF (${PACKAGE_NAME}_BUILD_BLOCK) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/block) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/block) SET(HEADERS ${HEADERS} block/EpetraExt_BlockCrsMatrix.h @@ -328,7 +328,7 @@ ENDIF() IF (${PACKAGE_NAME}_BUILD_RESTRICT) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/restrict) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/restrict) SET(HEADERS ${HEADERS} restrict/EpetraExt_RestrictedMultiVectorWrapper.h @@ -348,7 +348,7 @@ ENDIF() IF (${PACKAGE_NAME}_USING_PETSC) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/petsc) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/petsc) SET(HEADERS ${HEADERS} petsc/EpetraExt_PETScAIJMatrix.h @@ -366,7 +366,7 @@ ENDIF() ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_HYPRE) IF (${PACKAGE_NAME}_ENABLE_HYPRE) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/hypre) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/hypre) SET(HEADERS ${HEADERS} hypre/EpetraExt_HypreIJMatrix.h @@ -386,7 +386,7 @@ IF (${PROJECT_NAME}_ENABLE_PyTrilinos) FIND_PACKAGE(PythonInclude REQUIRED) - TRIBITS_INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) + INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) ENDIF() diff --git a/packages/epetraext/test/CMakeLists.txt b/packages/epetraext/test/CMakeLists.txt index d1793b2f99cb..ec4c87c1dde7 100644 --- a/packages/epetraext/test/CMakeLists.txt +++ b/packages/epetraext/test/CMakeLists.txt @@ -1,7 +1,7 @@ # Compile against epetra_test_err.h in all tests? -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF (${PACKAGE_NAME}_BUILD_TRANSFORM) diff --git a/packages/fei/base/CMakeLists.txt b/packages/fei/base/CMakeLists.txt index 01e9f222e515..abd14e3820ec 100644 --- a/packages/fei/base/CMakeLists.txt +++ b/packages/fei/base/CMakeLists.txt @@ -17,14 +17,14 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) # # Core headers # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp *.h) diff --git a/packages/fei/support-Trilinos/CMakeLists.txt b/packages/fei/support-Trilinos/CMakeLists.txt index 30bcd746a3a8..381c2bc56fd6 100644 --- a/packages/fei/support-Trilinos/CMakeLists.txt +++ b/packages/fei/support-Trilinos/CMakeLists.txt @@ -17,8 +17,8 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -28,7 +28,7 @@ SET(HEADERS ${HEADERS} # Core headers # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB HEADERS *.hpp) FILE(GLOB SOURCES *.cpp) diff --git a/packages/fei/unit_tests/CMakeLists.txt b/packages/fei/unit_tests/CMakeLists.txt index c76c624b2c01..a35d476c0a2e 100644 --- a/packages/fei/unit_tests/CMakeLists.txt +++ b/packages/fei/unit_tests/CMakeLists.txt @@ -1,10 +1,10 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../base) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../support-Trilinos) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../base) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../support-Trilinos) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) diff --git a/packages/galeri/src-epetra/CMakeLists.txt b/packages/galeri/src-epetra/CMakeLists.txt index 9237c6a51677..c6edd3204c2d 100644 --- a/packages/galeri/src-epetra/CMakeLists.txt +++ b/packages/galeri/src-epetra/CMakeLists.txt @@ -20,8 +20,8 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../headers) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../headers) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h @@ -31,7 +31,7 @@ SET(HEADERS ${HEADERS} # src # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS ${HEADERS} ../headers/Galeri_ConfigDefs.h @@ -64,7 +64,7 @@ ENDIF() # src/Maps # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Maps) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Maps) SET(HEADERS ${HEADERS} Maps/Galeri_Linear.h @@ -79,7 +79,7 @@ SET(HEADERS ${HEADERS} # src/CrsMatrices # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/CRSMatrices) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/CRSMatrices) SET(HEADERS ${HEADERS} CrsMatrices/Galeri_BigCross2D.h @@ -113,7 +113,7 @@ SET(HEADERS ${HEADERS} # src/FiniteElements # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/FiniteElements) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/FiniteElements) SET(HEADERS ${HEADERS} FiniteElements/Galeri_AbstractGrid.h diff --git a/packages/galeri/src-xpetra/CMakeLists.txt b/packages/galeri/src-xpetra/CMakeLists.txt index e407ea8ec3be..45ad6c367fe1 100644 --- a/packages/galeri/src-xpetra/CMakeLists.txt +++ b/packages/galeri/src-xpetra/CMakeLists.txt @@ -3,11 +3,11 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src-epetra) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../src-epetra) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../headers) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src-epetra) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../src-epetra) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../headers) APPEND_SET(HEADERS diff --git a/packages/ifpack/src/CMakeLists.txt b/packages/ifpack/src/CMakeLists.txt index 0d0f320f675b..8d2f708abfec 100644 --- a/packages/ifpack/src/CMakeLists.txt +++ b/packages/ifpack/src/CMakeLists.txt @@ -37,13 +37,13 @@ ENDIF () SET(HEADERS) SET(SOURCES) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS ${HEADERS} Ifpack_ConfigDefs.h @@ -187,7 +187,7 @@ ENDIF() IF (${PACKAGE_NAME}_ENABLE_Amesos) - TRIBITS_INCLUDE_DIRECTORIES( + INCLUDE_DIRECTORIES( ${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/AMD/Include ${Trilinos_SOURCE_DIR}/packages/common/auxiliarySoftware/SuiteSparse/src/UFconfig ) @@ -205,7 +205,7 @@ IF (${PACKAGE_NAME}_ENABLE_Amesos) ENDIF() IF (${PACKAGE_NAME}_ENABLE_Euclid) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/euclid) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/euclid) SET(HEADERS ${HEADERS} euclid/Euclid_dh.h @@ -275,7 +275,7 @@ IF (${PACKAGE_NAME}_ENABLE_Euclid) ENDIF() IF (${PACKAGE_NAME}_ENABLE_SUPPORTGRAPH) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/supportgraph) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/supportgraph) SET (HEADERS ${HEADERS} supportgraph/Ifpack_SupportGraph.h @@ -296,7 +296,7 @@ APPEND_SET(${PACKAGE_NAME}_EXPERIMENTAL_SOURCES ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Experimental) IF(${PACKAGE_NAME}_ENABLE_Experimental) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/supportgraph) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/supportgraph) # # Add experimental files to HEADERS and SOURCES. # diff --git a/packages/ifpack/test/AztecOO/CMakeLists.txt b/packages/ifpack/test/AztecOO/CMakeLists.txt index 746c9ee6d08c..c147906de95c 100644 --- a/packages/ifpack/test/AztecOO/CMakeLists.txt +++ b/packages/ifpack/test/AztecOO/CMakeLists.txt @@ -1,8 +1,8 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) diff --git a/packages/ifpack/test/AztecOO_LL/CMakeLists.txt b/packages/ifpack/test/AztecOO_LL/CMakeLists.txt index f3f3042905c2..cfb437736aac 100644 --- a/packages/ifpack/test/AztecOO_LL/CMakeLists.txt +++ b/packages/ifpack/test/AztecOO_LL/CMakeLists.txt @@ -1,8 +1,8 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) diff --git a/packages/ifpack2/adapters/CMakeLists.txt b/packages/ifpack2/adapters/CMakeLists.txt index 1b85a39b3aaf..8429b54fed38 100644 --- a/packages/ifpack2/adapters/CMakeLists.txt +++ b/packages/ifpack2/adapters/CMakeLists.txt @@ -8,14 +8,14 @@ SET(HEADERS "") SET(SOURCES "") IF(${PACKAGE_NAME}_ENABLE_ThyraTpetraAdapters) - TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/thyra) + SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/thyra) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) ENDIF(${PACKAGE_NAME}_ENABLE_ThyraTpetraAdapters) # Must glob the binary dir last to get all of the auto-generated headers -TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) # diff --git a/packages/ifpack2/example/CMakeLists.txt b/packages/ifpack2/example/CMakeLists.txt index 5573b6591c92..803792c8dbea 100644 --- a/packages/ifpack2/example/CMakeLists.txt +++ b/packages/ifpack2/example/CMakeLists.txt @@ -1,5 +1,5 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) TRIBITS_ADD_EXECUTABLE( ex1 diff --git a/packages/ifpack2/src/CMakeLists.txt b/packages/ifpack2/src/CMakeLists.txt index 5e39aa9e18a6..d16b67b28e6c 100644 --- a/packages/ifpack2/src/CMakeLists.txt +++ b/packages/ifpack2/src/CMakeLists.txt @@ -188,7 +188,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS "") SET(SOURCES "") -TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) +SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_GLOB(SOURCES ${DIR}/*.cpp) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) @@ -196,7 +196,7 @@ TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}) # SupportGraph requires some TPLs and options to be enabled. IF (${PACKAGE_NAME}_ENABLE_Experimental AND ${PACKAGE_NAME}_ENABLE_Lemon AND ${PACKAGE_NAME}_ENABLE_Amesos2 AND ${PACKAGE_NAME}_ENABLE_Cholmod) TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR}/supportgraph) - TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/supportgraph) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/supportgraph) SET(HEADERS ${HEADERS} supportgraph/Ifpack2_SupportGraph_decl.hpp supportgraph/Ifpack2_SupportGraph_def.hpp @@ -207,7 +207,7 @@ IF (${PACKAGE_NAME}_ENABLE_Experimental AND ${PACKAGE_NAME}_ENABLE_Lemon AND ${P ENDIF() # Must glob the binary dir last to get all of the auto-generated headers -TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) +SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.hpp) APPEND_SET(HEADERS ${DIR}/${PACKAGE_NAME}_config.h ) APPEND_SET(HEADERS ${DIR}/${PACKAGE_NAME}_ETIHelperMacros.h ) diff --git a/packages/ifpack2/test/belos/AdditiveSchwarzRILUK/CMakeLists.txt b/packages/ifpack2/test/belos/AdditiveSchwarzRILUK/CMakeLists.txt index 29e2017d892c..0fc6e497d3e8 100644 --- a/packages/ifpack2/test/belos/AdditiveSchwarzRILUK/CMakeLists.txt +++ b/packages/ifpack2/test/belos/AdditiveSchwarzRILUK/CMakeLists.txt @@ -1,6 +1,6 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) TRIBITS_ADD_EXECUTABLE_AND_TEST( AdditiveSchwarz_RILUK diff --git a/packages/ifpack2/test/belos/CMakeLists.txt b/packages/ifpack2/test/belos/CMakeLists.txt index 04a482a25812..7117233c6a38 100644 --- a/packages/ifpack2/test/belos/CMakeLists.txt +++ b/packages/ifpack2/test/belos/CMakeLists.txt @@ -1,6 +1,6 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) ADD_SUBDIRECTORY(AdditiveSchwarzRILUK) diff --git a/packages/ifpack2/test/vanka/CMakeLists.txt b/packages/ifpack2/test/vanka/CMakeLists.txt index 542cd4ae6a84..ec5a59f299de 100644 --- a/packages/ifpack2/test/vanka/CMakeLists.txt +++ b/packages/ifpack2/test/vanka/CMakeLists.txt @@ -1,6 +1,6 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src) TRIBITS_ADD_EXECUTABLE_AND_TEST( TomVankaTest diff --git a/packages/intrepid/src/CMakeLists.txt b/packages/intrepid/src/CMakeLists.txt index c1958b25c4f4..296bf127a750 100644 --- a/packages/intrepid/src/CMakeLists.txt +++ b/packages/intrepid/src/CMakeLists.txt @@ -17,13 +17,13 @@ TRIBITS_CONFIGURE_FILE(Intrepid_config.h) SET(HEADERS "") SET(SOURCES "") -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/Intrepid_config.h ) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # All headers @@ -37,7 +37,7 @@ APPEND_SET(HEADERS # Shared headers # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Shared) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Shared) APPEND_SET(HEADERS Shared/Intrepid_ArrayToolsDefCloneScale.hpp Shared/Intrepid_ArrayToolsDefContractions.hpp @@ -67,10 +67,10 @@ APPEND_SET(HEADERS # Discretization headers # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/Integration) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/FunctionSpaceTools) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/Basis) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/TensorProductSpaceTools) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/Integration) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/FunctionSpaceTools) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/Basis) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/TensorProductSpaceTools) APPEND_SET(HEADERS Discretization/Integration/Intrepid_AdaptiveSparseGridInterfaceDef.hpp @@ -220,7 +220,7 @@ APPEND_SET(HEADERS # Cell headers # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Cell) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Cell) APPEND_SET(HEADERS Cell/Intrepid_CellTools.hpp Cell/Intrepid_CellToolsDef.hpp diff --git a/packages/intrepid2/perf-test/CMakeLists.txt b/packages/intrepid2/perf-test/CMakeLists.txt index 1fc39aecf0d9..4c90c57ef130 100644 --- a/packages/intrepid2/perf-test/CMakeLists.txt +++ b/packages/intrepid2/perf-test/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ADD_SUBDIRECTORY(ComputeBasis) ADD_SUBDIRECTORY(DynRankView) diff --git a/packages/intrepid2/perf-test/ComputeBasis/CMakeLists.txt b/packages/intrepid2/perf-test/ComputeBasis/CMakeLists.txt index 9658e1232597..5ddadcc0cd50 100644 --- a/packages/intrepid2/perf-test/ComputeBasis/CMakeLists.txt +++ b/packages/intrepid2/perf-test/ComputeBasis/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(Kokkos_ENABLE_SERIAL) ADD_SUBDIRECTORY(Serial) diff --git a/packages/intrepid2/perf-test/ComputeBasis/Cuda/CMakeLists.txt b/packages/intrepid2/perf-test/ComputeBasis/Cuda/CMakeLists.txt index cc34271a198c..3efdb02678fa 100644 --- a/packages/intrepid2/perf-test/ComputeBasis/Cuda/CMakeLists.txt +++ b/packages/intrepid2/perf-test/ComputeBasis/Cuda/CMakeLists.txt @@ -1,5 +1,5 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES "") diff --git a/packages/intrepid2/perf-test/ComputeBasis/OpenMP/CMakeLists.txt b/packages/intrepid2/perf-test/ComputeBasis/OpenMP/CMakeLists.txt index cc34271a198c..3efdb02678fa 100644 --- a/packages/intrepid2/perf-test/ComputeBasis/OpenMP/CMakeLists.txt +++ b/packages/intrepid2/perf-test/ComputeBasis/OpenMP/CMakeLists.txt @@ -1,5 +1,5 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES "") diff --git a/packages/intrepid2/perf-test/ComputeBasis/Serial/CMakeLists.txt b/packages/intrepid2/perf-test/ComputeBasis/Serial/CMakeLists.txt index cc34271a198c..3efdb02678fa 100644 --- a/packages/intrepid2/perf-test/ComputeBasis/Serial/CMakeLists.txt +++ b/packages/intrepid2/perf-test/ComputeBasis/Serial/CMakeLists.txt @@ -1,5 +1,5 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES "") diff --git a/packages/intrepid2/perf-test/DynRankView/CMakeLists.txt b/packages/intrepid2/perf-test/DynRankView/CMakeLists.txt index 69b55c972bed..3c2750bb9190 100644 --- a/packages/intrepid2/perf-test/DynRankView/CMakeLists.txt +++ b/packages/intrepid2/perf-test/DynRankView/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(Kokkos_ENABLE_SERIAL) ADD_SUBDIRECTORY(Serial) diff --git a/packages/intrepid2/perf-test/DynRankView/Cuda/CMakeLists.txt b/packages/intrepid2/perf-test/DynRankView/Cuda/CMakeLists.txt index 048e49724335..458cb62315bb 100644 --- a/packages/intrepid2/perf-test/DynRankView/Cuda/CMakeLists.txt +++ b/packages/intrepid2/perf-test/DynRankView/Cuda/CMakeLists.txt @@ -1,5 +1,5 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES "") diff --git a/packages/intrepid2/perf-test/DynRankView/OpenMP/CMakeLists.txt b/packages/intrepid2/perf-test/DynRankView/OpenMP/CMakeLists.txt index 048e49724335..458cb62315bb 100644 --- a/packages/intrepid2/perf-test/DynRankView/OpenMP/CMakeLists.txt +++ b/packages/intrepid2/perf-test/DynRankView/OpenMP/CMakeLists.txt @@ -1,5 +1,5 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES "") diff --git a/packages/intrepid2/perf-test/DynRankView/Serial/CMakeLists.txt b/packages/intrepid2/perf-test/DynRankView/Serial/CMakeLists.txt index addaa1d469f1..afcb274528dc 100644 --- a/packages/intrepid2/perf-test/DynRankView/Serial/CMakeLists.txt +++ b/packages/intrepid2/perf-test/DynRankView/Serial/CMakeLists.txt @@ -1,5 +1,5 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(SOURCES "") diff --git a/packages/intrepid2/src/CMakeLists.txt b/packages/intrepid2/src/CMakeLists.txt index cca7b476b23f..960310c600c2 100644 --- a/packages/intrepid2/src/CMakeLists.txt +++ b/packages/intrepid2/src/CMakeLists.txt @@ -49,11 +49,11 @@ LIST(REMOVE_DUPLICATES INCDIRS) FOREACH(INCDIR ${INCDIRS}) ## MESSAGE( STATUS "INCDIR : " ${INCDIR} ) - TRIBITS_INCLUDE_DIRECTORIES(${INCDIR}) + INCLUDE_DIRECTORIES(${INCDIR}) ENDFOREACH() -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # # D) Define the targets for package's library(s) diff --git a/packages/intrepid2/unit-test/Cell/CMakeLists.txt b/packages/intrepid2/unit-test/Cell/CMakeLists.txt index 3be30cf0436c..06dac30b0010 100644 --- a/packages/intrepid2/unit-test/Cell/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Cell/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_HEX_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_HEX_FEM/CMakeLists.txt index b7f2c86eabc9..5529d05453c5 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_HEX_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_HEX_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_QUAD_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_QUAD_FEM/CMakeLists.txt index fdc7df24790b..0d28c5e10775 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_QUAD_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_QUAD_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TET_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TET_FEM/CMakeLists.txt index 67a01d904ea5..f2e011f36049 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TET_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TET_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TRI_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TRI_FEM/CMakeLists.txt index dc47f75c718f..17c83d7bb6fa 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TRI_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TRI_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_I1_FEM/CMakeLists.txt index 9c85536c8f04..945499ecaca3 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_In_FEM/CMakeLists.txt index 5e06a09eb454..46f1e06404ee 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_I1_FEM/CMakeLists.txt index cb69d71df184..8d312baa49a8 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_In_FEM/CMakeLists.txt index 8755589ff621..75da846685f7 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_I1_FEM/CMakeLists.txt index f5d634954c8f..c55825a86240 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_In_FEM/CMakeLists.txt index 133b3a77868a..bc26f191637d 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_I1_FEM/CMakeLists.txt index 76766346b5cf..4444a2e23d59 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_In_FEM/CMakeLists.txt index 5ce72d53a974..c4eb3e10e148 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_WEDGE_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_WEDGE_I1_FEM/CMakeLists.txt index 485e7dfdfadd..f420d7c985f3 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HCURL_WEDGE_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HCURL_WEDGE_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_I1_FEM/CMakeLists.txt index c8d281bcb49d..921df7b61e41 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_In_FEM/CMakeLists.txt index 05d15e60e70f..5152c351ccc1 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_I1_FEM/CMakeLists.txt index bcda1ff0b32d..36691f2b1336 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_In_FEM/CMakeLists.txt index a5b01981d6f6..52de5115eaee 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_I1_FEM/CMakeLists.txt index 4ed14e31a822..b69d69649f72 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_In_FEM/CMakeLists.txt index 60a34963742f..6bd08296ed5f 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_I1_FEM/CMakeLists.txt index cfa3c6d7ee13..2e91ea9296f6 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_In_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_In_FEM/CMakeLists.txt index 0523c74171ea..fe86d0dd9382 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_In_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_In_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_WEDGE_I1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_WEDGE_I1_FEM/CMakeLists.txt index 7d6c9a27cd75..1443291acc47 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HDIV_WEDGE_I1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HDIV_WEDGE_I1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C1_FEM/CMakeLists.txt index 16379535b189..a569545a2326 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C2_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C2_FEM/CMakeLists.txt index c55ac04519c7..d73db74fc767 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C2_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C2_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_Cn_FEM/CMakeLists.txt index d427a02830a1..c0fb7238f19d 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # test diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_C1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_C1_FEM/CMakeLists.txt index 8e83e5e79e80..66be084d1d27 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_C1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_C1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM/CMakeLists.txt index 5c0294c42d18..0173946caa56 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM_JACOBI/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM_JACOBI/CMakeLists.txt index 92a682bedd9c..adc0a21103ce 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM_JACOBI/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM_JACOBI/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_PYR_C1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_PYR_C1_FEM/CMakeLists.txt index c8d82611555d..f5651ca47f51 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_PYR_C1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_PYR_C1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C1_FEM/CMakeLists.txt index a9044329174d..e6361a704af9 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C2_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C2_FEM/CMakeLists.txt index 3df9f211f62d..a94d9156036a 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C2_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C2_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_Cn_FEM/CMakeLists.txt index 83c91c7674f8..cc98f0025934 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # test diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C1_FEM/CMakeLists.txt index 52bc6c051780..45b3db19f768 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C2_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C2_FEM/CMakeLists.txt index 6c46e650c119..4696782c5f86 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C2_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_C2_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_COMP12_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_COMP12_FEM/CMakeLists.txt index ff36bd2c0a02..2d8ee06a3274 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_COMP12_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_COMP12_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM/CMakeLists.txt index fc56c9ac745f..2d689462f31a 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # test diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM_ORTH/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM_ORTH/CMakeLists.txt index d6b9202d58f9..7c39ab11b1e2 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM_ORTH/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TET_Cn_FEM_ORTH/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C1_FEM/CMakeLists.txt index 9afb5b60d8b2..ff6f0df4d07e 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C2_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C2_FEM/CMakeLists.txt index 978408943f4b..4b2d6b4a5190 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C2_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_C2_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM/CMakeLists.txt index 04cb1bcfc9ef..39d5e30bd420 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # test diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM_ORTH/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM_ORTH/CMakeLists.txt index d13a115f40a8..4c5df63a6501 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM_ORTH/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_TRI_Cn_FEM_ORTH/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C1_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C1_FEM/CMakeLists.txt index 7f8c1848100e..801c8242ed8d 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C1_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C1_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C2_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C2_FEM/CMakeLists.txt index 9de6c70a099c..933af0e02be4 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C2_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HGRAD_WEDGE_C2_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_C0_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_C0_FEM/CMakeLists.txt index 35e9be038e07..8c5194b7e52e 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_C0_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_C0_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_HEX_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_HEX_Cn_FEM/CMakeLists.txt index 4b64112810e0..44f65705e1b0 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_HEX_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_HEX_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_LINE_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_LINE_Cn_FEM/CMakeLists.txt index 5ff16a3809c5..5bb953596def 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_LINE_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_LINE_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_QUAD_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_QUAD_Cn_FEM/CMakeLists.txt index 9488b23dbbdc..da53d02dc7cd 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_QUAD_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_QUAD_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TET_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TET_Cn_FEM/CMakeLists.txt index 9cfc6eccf6c1..43b9c584caca 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TET_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TET_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TRI_Cn_FEM/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TRI_Cn_FEM/CMakeLists.txt index 512d8e2dcdc3..cb6063487996 100644 --- a/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TRI_Cn_FEM/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Basis/HVOL_TRI_Cn_FEM/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/FunctionSpaceTools/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/FunctionSpaceTools/CMakeLists.txt index 09ef41aa547f..bc5626bfb86b 100644 --- a/packages/intrepid2/unit-test/Discretization/FunctionSpaceTools/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/FunctionSpaceTools/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Discretization/Integration/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Integration/CMakeLists.txt index e3b4f2fa13a2..0936908bf589 100644 --- a/packages/intrepid2/unit-test/Discretization/Integration/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Integration/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/MonolithicExecutable/CMakeLists.txt b/packages/intrepid2/unit-test/MonolithicExecutable/CMakeLists.txt index 3b05fd70b8e2..1b5019eb4b80 100644 --- a/packages/intrepid2/unit-test/MonolithicExecutable/CMakeLists.txt +++ b/packages/intrepid2/unit-test/MonolithicExecutable/CMakeLists.txt @@ -4,7 +4,7 @@ #FILE(GLOB TEST_SOURCES "*.cpp" ${ETI_SOURCES} ) FILE(GLOB TEST_SOURCES "*.cpp") -TRIBITS_INCLUDE_DIRECTORIES("../../assembly-examples") +INCLUDE_DIRECTORIES("../../assembly-examples") TRIBITS_ADD_EXECUTABLE_AND_TEST( Intrepid2_Tests diff --git a/packages/intrepid2/unit-test/Orientation/CMakeLists.txt b/packages/intrepid2/unit-test/Orientation/CMakeLists.txt index 4ed6bae13257..e2c895af3c03 100644 --- a/packages/intrepid2/unit-test/Orientation/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Orientation/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Projection/CMakeLists.txt b/packages/intrepid2/unit-test/Projection/CMakeLists.txt index 0dd72ae7ec25..59edeef82e45 100644 --- a/packages/intrepid2/unit-test/Projection/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Projection/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # value types SET(Intrepid2_TEST_ETI_VALUETYPE_NAME "") diff --git a/packages/intrepid2/unit-test/Shared/ArrayTools/CMakeLists.txt b/packages/intrepid2/unit-test/Shared/ArrayTools/CMakeLists.txt index b7fa5aca6a9d..fba6dceeb8be 100644 --- a/packages/intrepid2/unit-test/Shared/ArrayTools/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Shared/ArrayTools/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(Intrepid2_TEST_ETI_FILE "test_01;test_02;test_03;test_04;test_05") diff --git a/packages/intrepid2/unit-test/Shared/PointTools/CMakeLists.txt b/packages/intrepid2/unit-test/Shared/PointTools/CMakeLists.txt index 08f122a52785..1e721c9ba703 100644 --- a/packages/intrepid2/unit-test/Shared/PointTools/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Shared/PointTools/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(Intrepid2_TEST_ETI_FILE "test_01") diff --git a/packages/intrepid2/unit-test/Shared/Polylib/CMakeLists.txt b/packages/intrepid2/unit-test/Shared/Polylib/CMakeLists.txt index 364cf1da008b..d251e33e3b5b 100644 --- a/packages/intrepid2/unit-test/Shared/Polylib/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Shared/Polylib/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(Intrepid2_TEST_ETI_FILE "test_01") diff --git a/packages/intrepid2/unit-test/Shared/RealSpaceTools/CMakeLists.txt b/packages/intrepid2/unit-test/Shared/RealSpaceTools/CMakeLists.txt index c32dccfbd94b..7d54c87b93fb 100644 --- a/packages/intrepid2/unit-test/Shared/RealSpaceTools/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Shared/RealSpaceTools/CMakeLists.txt @@ -1,4 +1,4 @@ -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(Intrepid2_TEST_ETI_FILE "test_01") diff --git a/packages/intrepid2/unit-test/performance/StructuredIntegration/CMakeLists.txt b/packages/intrepid2/unit-test/performance/StructuredIntegration/CMakeLists.txt index 9cd20e448e41..86db43427c93 100644 --- a/packages/intrepid2/unit-test/performance/StructuredIntegration/CMakeLists.txt +++ b/packages/intrepid2/unit-test/performance/StructuredIntegration/CMakeLists.txt @@ -2,7 +2,7 @@ SET(SOURCES "") FILE(GLOB SOURCES *.cpp) -TRIBITS_INCLUDE_DIRECTORIES("../../../assembly-examples") +INCLUDE_DIRECTORIES("../../../assembly-examples") SET(LIBRARIES intrepid2) diff --git a/packages/isorropia/src/CMakeLists.txt b/packages/isorropia/src/CMakeLists.txt index d275c4f717f2..041a5f0dc60d 100644 --- a/packages/isorropia/src/CMakeLists.txt +++ b/packages/isorropia/src/CMakeLists.txt @@ -21,13 +21,13 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) SET(HEADERS) SET(SOURCES) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h ) -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(HEADERS ${HEADERS} Isorropia_CostDescriber.hpp @@ -52,8 +52,8 @@ SET(SOURCES ${SOURCES} # src/epetra # -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra) -#TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../utils) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra) +#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../utils) SET(HEADERS ${HEADERS} epetra/Isorropia_EpetraCostDescriber.hpp @@ -85,7 +85,7 @@ SET(SOURCES ${SOURCES} # zoltan -TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra/zoltanLib) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra/zoltanLib) SET(HEADERS ${HEADERS} epetra/zoltanLib/QueryObject.hpp diff --git a/packages/kokkos-kernels/perf_test/CMakeLists.txt b/packages/kokkos-kernels/perf_test/CMakeLists.txt index 98172f4ada7b..91dc72786755 100644 --- a/packages/kokkos-kernels/perf_test/CMakeLists.txt +++ b/packages/kokkos-kernels/perf_test/CMakeLists.txt @@ -24,7 +24,7 @@ TARGET_INCLUDE_DIRECTORIES(kokkoskernelsperf_gtest PUBLIC $