diff --git a/test/core/ExamplesUnitTests/SimpleTpl_installs_Tests.cmake b/test/core/ExamplesUnitTests/SimpleTpl_installs_Tests.cmake index b87eb5425..3fc26dc33 100644 --- a/test/core/ExamplesUnitTests/SimpleTpl_installs_Tests.cmake +++ b/test/core/ExamplesUnitTests/SimpleTpl_installs_Tests.cmake @@ -74,7 +74,7 @@ function(SimpleTpl_install_test sharedOrStatic) ${SERIAL_PASSTHROUGH_CONFIGURE_ARGS} ${buildSharedLibsArg} -DCMAKE_BUILD_TYPE=Release - -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON + -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DCMAKE_INSTALL_PREFIX=${testDir}/install -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_INSTALL_LIBDIR=lib diff --git a/test/core/ExamplesUnitTests/TribitsExampleApp_Tests.cmake b/test/core/ExamplesUnitTests/TribitsExampleApp_Tests.cmake index e37434c51..ac2f06400 100644 --- a/test/core/ExamplesUnitTests/TribitsExampleApp_Tests.cmake +++ b/test/core/ExamplesUnitTests/TribitsExampleApp_Tests.cmake @@ -313,7 +313,7 @@ function(TribitsExampleApp_NoFortran fullOrComponents sharedOrStatic) ${TribitsExampleProject_COMMON_CONFIG_ARGS} -DTribitsExProj_TRIBITS_DIR=${${PROJECT_NAME}_TRIBITS_DIR} -DCMAKE_BUILD_TYPE=Release - -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON + -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DTribitsExProj_ENABLE_Fortran=OFF -DTribitsExProj_ENABLE_ALL_PACKAGES=ON -DTribitsExProj_ENABLE_SECONDARY_TESTED_CODE=ON @@ -448,7 +448,7 @@ function(TribitsExampleApp_EnableSingleSubpackage fullOrComponents sharedOrStati ${TribitsExampleProject_COMMON_CONFIG_ARGS} -DTribitsExProj_TRIBITS_DIR=${${PROJECT_NAME}_TRIBITS_DIR} -DCMAKE_BUILD_TYPE=Release - -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON + -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DTribitsExProj_ENABLE_Fortran=OFF -DTribitsExProj_ENABLE_WithSubpackagesB=ON -DTribitsExProj_ENABLE_SECONDARY_TESTED_CODE=ON diff --git a/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake b/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake index c56ba2c14..c72f8a7a2 100644 --- a/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake +++ b/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake @@ -304,7 +304,7 @@ function(TribitsExampleProject_ALL_ST_NoFortran sharedOrStatic serialOrMpi) "WithSubpackages_SELECTED_PACKAGE_LIST = ''" "WithSubpackages_TPL_LIST = '${WithSubpackages_TPL_LIST}'" "WithSubpackages_FOUND = '1'" - "WithSubpackages::all_libs INTERFACE_LINK_LIBRARIES: 'WithSubpackagesA::pws_a[;]WithSubpackagesB::pws_b[;]WithSubpackagesC::pws_c'" + "WithSubpackages::all_libs INTERFACE_LINK_LIBRARIES: 'WithSubpackagesA::pws_a[;]WithSubpackagesB::pws_b[;]WithSubpackagesC::pws_c'" "-- Configuring done" "-- Generating done" ALWAYS_FAIL_ON_NONZERO_RETURN @@ -387,7 +387,7 @@ function(TribitsExampleProject_ALL_ST_NoFortran sharedOrStatic serialOrMpi) "WithSubpackages_SELECTED_PACKAGE_LIST = ''" "WithSubpackages_TPL_LIST = '${WithSubpackages_TPL_LIST}'" "WithSubpackages_FOUND = '1'" - "WithSubpackages::all_libs INTERFACE_LINK_LIBRARIES: 'WithSubpackagesA::pws_a[;]WithSubpackagesB::pws_b[;]WithSubpackagesC::pws_c'" + "WithSubpackages::all_libs INTERFACE_LINK_LIBRARIES: 'WithSubpackagesA::pws_a[;]WithSubpackagesB::pws_b[;]WithSubpackagesC::pws_c'" ALWAYS_FAIL_ON_NONZERO_RETURN TEST_7 @@ -1183,7 +1183,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_NoFortran_Ninja -P ${CMAKE_CURRENT_SOURCE_DIR}/RunDummyPackageClientBulid.cmake PASS_REGULAR_EXPRESSION_ALL "WithSubpackages_INSTALL_DIR = '.*/TriBITS_TribitsExampleProject_ALL_ST_NoFortran_Ninja/install'" - "WithSubpackages::all_libs INTERFACE_LINK_LIBRARIES: 'WithSubpackagesA::pws_a[;]WithSubpackagesB::pws_b[;]WithSubpackagesC::pws_c'" + "WithSubpackages::all_libs INTERFACE_LINK_LIBRARIES: 'WithSubpackagesA::pws_a[;]WithSubpackagesB::pws_b[;]WithSubpackagesC::pws_c'" "WithSubpackages_TPL_LIST = 'HeaderOnlyTpl'" ALWAYS_FAIL_ON_NONZERO_RETURN @@ -1208,7 +1208,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_NoFortran_Ninja PASS_REGULAR_EXPRESSION_ALL "Calling: find_package[(]WithSubpackages REQUIRED COMPONENTS OPTIONAL_COMPONENTS [)]" "WithSubpackages_FOUND = '1'" - "WithSubpackages::all_libs INTERFACE_LINK_LIBRARIES: 'WithSubpackagesA::pws_a[;]WithSubpackagesB::pws_b[;]WithSubpackagesC::pws_c'" + "WithSubpackages::all_libs INTERFACE_LINK_LIBRARIES: 'WithSubpackagesA::pws_a[;]WithSubpackagesB::pws_b[;]WithSubpackagesC::pws_c'" ALWAYS_FAIL_ON_NONZERO_RETURN TEST_8 CMND ninja ARGS -j1 package_source diff --git a/tribits/common_tpls/FindTPLNetcdf.cmake b/tribits/common_tpls/FindTPLNetcdf.cmake index 9ffd66c06..13730f045 100644 --- a/tribits/common_tpls/FindTPLNetcdf.cmake +++ b/tribits/common_tpls/FindTPLNetcdf.cmake @@ -130,7 +130,7 @@ if ("${TPL_Netcdf_PARALLEL}" STREQUAL "") 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") + "True if netcdf compiled with parallel enabled") endif() endif() if ("${TPL_Netcdf_PARALLEL}" STREQUAL "") diff --git a/tribits/common_tpls/find_modules/FindHDF5.cmake b/tribits/common_tpls/find_modules/FindHDF5.cmake index bed6cb04b..1ec935410 100644 --- a/tribits/common_tpls/find_modules/FindHDF5.cmake +++ b/tribits/common_tpls/find_modules/FindHDF5.cmake @@ -389,10 +389,10 @@ else() foreach( _component ${HDF5_VALID_COMPONENTS} ) set(target ${HDF5_${_component}_TARGET}) - if ( TARGET ${target} ) - set(HDF5_${_component}_LIBRARY ${target}) - list(APPEND HDF5_LIBRARIES ${HDF5_${_component}_LIBRARY}) - endif() + if ( TARGET ${target} ) + set(HDF5_${_component}_LIBRARY ${target}) + list(APPEND HDF5_LIBRARIES ${HDF5_${_component}_LIBRARY}) + endif() endforeach() # Define HDF5_C_LIBRARIES to contain hdf5 and hdf5_hl C libraries @@ -470,7 +470,7 @@ else() LOCATION ${_HDF5_C_LIBRARY} LINK_LANGUAGES "C" LINK_INTERFACE_LIBRARIES "${HDF5_LINK_LIBRARIES}") - set(HDF5_C_LIBRARY ${HDF5_C_TARGET}) + set(HDF5_C_LIBRARY ${HDF5_C_TARGET}) # --- Search for the other possible component libraries @@ -495,7 +495,7 @@ else() # Define the HDF5__LIBRARY to point to the target foreach ( _component ${HDF5_VALID_COMPONENTS} ) if ( TARGET ${HDF5_${_component}_TARGET} ) - set(HDF5_${_component}_LIBRARY ${HDF5_${_component}_TARGET}) + set(HDF5_${_component}_LIBRARY ${HDF5_${_component}_TARGET}) endif() endforeach() @@ -513,7 +513,7 @@ else() set(HDF5_LIBRARIES) foreach (_component ${HDF5_VALID_COMPONENTS}) if ( TARGET ${HDF5_${_component}_TARGET} ) - list(APPEND HDF5_LIBRARIES ${_HDF5_${_component}_LIBRARY}) + list(APPEND HDF5_LIBRARIES ${_HDF5_${_component}_LIBRARY}) endif() endforeach() list(APPEND HDF5_LIBRARIES ${HDF5_LINK_LIBRARIES}) @@ -581,8 +581,8 @@ if ( NOT HDF5_FIND_QUIETLY ) set(HDF5_COMPONENTS_NOTFOUND) foreach (_component ${HDF5_VALID_COMPONENTS} ) if ( HDF5_${_component}_FOUND ) - #message(STATUS "\t HDF5_${_component}_LIBRARY\t\t=${HDF5_${_component}_LIBRARY}") - message(STATUS "\t${HDF5_${_component}_LIBRARY}") + #message(STATUS "\t HDF5_${_component}_LIBRARY\t\t=${HDF5_${_component}_LIBRARY}") + message(STATUS "\t${HDF5_${_component}_LIBRARY}") else() list(APPEND HDF5_COMPONENTS_NOTFOUND ${_component}) endif() diff --git a/tribits/common_tpls/find_modules/FindNetCDF.cmake b/tribits/common_tpls/find_modules/FindNetCDF.cmake index 960088f3e..1e97c3e23 100644 --- a/tribits/common_tpls/find_modules/FindNetCDF.cmake +++ b/tribits/common_tpls/find_modules/FindNetCDF.cmake @@ -186,21 +186,21 @@ else(NetCDF_LIBRARIES AND NetCDF_INCLUDE_DIRS) set(NetCDF_LARGE_DIMS FALSE) endif() - set(NetCDF_PARALLEL False) + set(NetCDF_PARALLEL False) find_path(meta_path - NAMES "netcdf_meta.h" + NAMES "netcdf_meta.h" HINTS ${NetCDF_INCLUDE_DIR} NO_DEFAULT_PATH) if(meta_path) - # Search meta for NC_HAS_PARALLEL setting... - # Note that there is both NC_HAS_PARALLEL4 and NC_HAS_PARALLEL, only want NC_HAS_PARALLEL - # so add a space to end to avoid getting NC_HAS_PARALLEL4 - file(STRINGS "${meta_path}/netcdf_meta.h" netcdf_par_string REGEX "NC_HAS_PARALLEL ") - string(REGEX REPLACE "[^0-9]" "" netcdf_par_val "${netcdf_par_string}") - # NOTE: The line for NC_HAS_PARALLEL has an hdf5 string in it which results + # Search meta for NC_HAS_PARALLEL setting... + # Note that there is both NC_HAS_PARALLEL4 and NC_HAS_PARALLEL, only want NC_HAS_PARALLEL + # so add a space to end to avoid getting NC_HAS_PARALLEL4 + file(STRINGS "${meta_path}/netcdf_meta.h" netcdf_par_string REGEX "NC_HAS_PARALLEL ") + string(REGEX REPLACE "[^0-9]" "" netcdf_par_val "${netcdf_par_string}") + # NOTE: The line for NC_HAS_PARALLEL has an hdf5 string in it which results # netcdf_par_val being set to 05 or 15 above... - if (netcdf_par_val EQUAL 15) - set(NetCDF_PARALLEL True) + if (netcdf_par_val EQUAL 15) + set(NetCDF_PARALLEL True) endif() endif() @@ -291,8 +291,8 @@ else(NetCDF_LIBRARIES AND NetCDF_INCLUDE_DIRS) message(STATUS "\tNetCDF_ROOT is ${NetCDF_ROOT}") find_program(netcdf_config nc-config PATHS ${NetCDF_ROOT}/bin ${NetCDF_BIN_DIR} - NO_DEFAULT_PATH - NO_CMAKE_SYSTEM_PATH + NO_DEFAULT_PATH + NO_CMAKE_SYSTEM_PATH DOC "NetCDF configuration script") if (netcdf_config) diff --git a/tribits/core/package_arch/TribitsAddAdvancedTest.cmake b/tribits/core/package_arch/TribitsAddAdvancedTest.cmake index 3f4d02a35..2f4928c8f 100644 --- a/tribits/core/package_arch/TribitsAddAdvancedTest.cmake +++ b/tribits/core/package_arch/TribitsAddAdvancedTest.cmake @@ -1097,7 +1097,7 @@ function(tribits_add_advanced_test TEST_NAME_IN) "" # multi_value_keywords "COPY_FILES_TO_TEST_DIR;SOURCE_DIR;DEST_DIR" - # Arguments to parse + # Arguments to parse ${PARSE_TEST_${TEST_CMND_IDX}} ) tribits_check_for_unparsed_arguments() @@ -1113,20 +1113,20 @@ function(tribits_add_advanced_test TEST_NAME_IN) # Parse TEST_ block args for types EXEC and CMND set(testBlockOptionsList NOEXEPREFIX NOEXESUFFIX NO_ECHO_OUTPUT PASS_ANY - STANDARD_PASS_OUTPUT ALWAYS_FAIL_ON_NONZERO_RETURN ALWAYS_FAIL_ON_ZERO_RETURN - WILL_FAIL ADD_DIR_TO_NAME SKIP_CLEAN_WORKING_DIRECTORY + STANDARD_PASS_OUTPUT ALWAYS_FAIL_ON_NONZERO_RETURN ALWAYS_FAIL_ON_ZERO_RETURN + WILL_FAIL ADD_DIR_TO_NAME SKIP_CLEAN_WORKING_DIRECTORY ) set(testBlockMultiValueKeywordsList EXEC CMND ARGS DIRECTORY MESSAGE - WORKING_DIRECTORY OUTPUT_FILE NUM_MPI_PROCS NUM_TOTAL_CORES_USED - PASS_REGULAR_EXPRESSION_ALL FAIL_REGULAR_EXPRESSION PASS_REGULAR_EXPRESSION - ) + WORKING_DIRECTORY OUTPUT_FILE NUM_MPI_PROCS NUM_TOTAL_CORES_USED + PASS_REGULAR_EXPRESSION_ALL FAIL_REGULAR_EXPRESSION PASS_REGULAR_EXPRESSION + ) cmake_parse_arguments( PARSE #prefix - "${testBlockOptionsList}" - "" # one_value_keywords - "${testBlockMultiValueKeywordsList}" + "${testBlockOptionsList}" + "" # one_value_keywords + "${testBlockMultiValueKeywordsList}" ${PARSE_TEST_${TEST_CMND_IDX}} ) diff --git a/tribits/core/package_arch/TribitsAddLibrary.cmake b/tribits/core/package_arch/TribitsAddLibrary.cmake index 26bddd919..bb32b1c3a 100644 --- a/tribits/core/package_arch/TribitsAddLibrary.cmake +++ b/tribits/core/package_arch/TribitsAddLibrary.cmake @@ -701,7 +701,7 @@ function(tribits_add_library_assert_deplibs) else() message(WARNING "WARNING: The case PARSE_TESTONLY=${PARSE_TESTONLY}," " depLibAlreadyInPkgLibs=${depLibAlreadyInPkgLibs}," - " depLibIsTestOnlyLib=${depLibIsTestOnlyLib}, has" + " depLibIsTestOnlyLib=${depLibIsTestOnlyLib}, has" " not yet been handled!") endif() @@ -781,7 +781,7 @@ function(tribits_add_library_determine_install_lib_and_or_headers if (${PROJECT_NAME}_VERBOSE_CONFIGURE) message("-- " "Skipping installation of headers and libraries" " because ${PROJECT_NAME}_INSTALL_LIBRARIES_AND_HEADERS=FALSE and" - " BUILD_SHARED_LIBS=FALSE ...") + " BUILD_SHARED_LIBS=FALSE ...") endif() set(installLib OFF) set(installHeaders OFF) @@ -789,7 +789,7 @@ function(tribits_add_library_determine_install_lib_and_or_headers if (${PROJECT_NAME}_VERBOSE_CONFIGURE) message("-- " "Skipping installation of headers but installing libraries" " because ${PROJECT_NAME}_INSTALL_LIBRARIES_AND_HEADERS=FALSE and" - " BUILD_SHARED_LIBS=TRUE ...") + " BUILD_SHARED_LIBS=TRUE ...") endif() set(installHeaders OFF) endif() diff --git a/tribits/core/package_arch/TribitsAddTest.cmake b/tribits/core/package_arch/TribitsAddTest.cmake index bdf500b5b..5853d99a0 100644 --- a/tribits/core/package_arch/TribitsAddTest.cmake +++ b/tribits/core/package_arch/TribitsAddTest.cmake @@ -1009,7 +1009,7 @@ function(tribits_add_test EXE_NAME) "${EXECUTABLE_PATH}" "${PARSE_CATEGORIES}" "${NUM_PROCS_USED}" "${NUM_TOTAL_CORES_USED}" "${SET_RUN_SERIAL}" "${SET_DISABLED_AND_MSG}" ADDED_TEST_NAME ${INARGS} - "${${TEST_NAME_INSTANCE}_EXTRA_ARGS}" ) + "${${TEST_NAME_INSTANCE}_EXTRA_ARGS}" ) if(PARSE_ADDED_TESTS_NAMES_OUT AND ADDED_TEST_NAME) list(APPEND ADDED_TESTS_NAMES_OUT ${ADDED_TEST_NAME}) endif() @@ -1054,7 +1054,7 @@ function(tribits_add_test EXE_NAME) "${EXECUTABLE_PATH}" "${PARSE_CATEGORIES}" "${NUM_PROCS_USED}" "${NUM_TOTAL_CORES_USED}" "${SET_RUN_SERIAL}" "${SET_DISABLED_AND_MSG}" ADDED_TEST_NAME ${INARGS} - "${${TEST_NAME_INSTANCE}_EXTRA_ARGS}" + "${${TEST_NAME_INSTANCE}_EXTRA_ARGS}" ) if(PARSE_ADDED_TESTS_NAMES_OUT AND ADDED_TEST_NAME) list(APPEND ADDED_TESTS_NAMES_OUT ${ADDED_TEST_NAME}) diff --git a/tribits/core/package_arch/TribitsAddTestHelpers.cmake b/tribits/core/package_arch/TribitsAddTestHelpers.cmake index ca8d1b0bd..453de5432 100644 --- a/tribits/core/package_arch/TribitsAddTestHelpers.cmake +++ b/tribits/core/package_arch/TribitsAddTestHelpers.cmake @@ -658,10 +658,10 @@ function(tribits_add_test_process_skip_ctest_add_test ADD_THE_TEST_OUT) if(${PACKAGE_NAME}_SKIP_CTEST_ADD_TEST OR ${PARENT_PACKAGE_NAME}_SKIP_CTEST_ADD_TEST) if (PARENT_PACKAGE_NAME STREQUAL PACKAGE_NAME) set(DISABLE_VAR_MSG - "${PACKAGE_NAME}_SKIP_CTEST_ADD_TEST='${${PACKAGE_NAME}_SKIP_CTEST_ADD_TEST}'") + "${PACKAGE_NAME}_SKIP_CTEST_ADD_TEST='${${PACKAGE_NAME}_SKIP_CTEST_ADD_TEST}'") else() set(DISABLE_VAR_MSG - "${PARENT_PACKAGE_NAME}_SKIP_CTEST_ADD_TEST='${${PARENT_PACKAGE_NAME}_SKIP_CTEST_ADD_TEST}'") + "${PARENT_PACKAGE_NAME}_SKIP_CTEST_ADD_TEST='${${PARENT_PACKAGE_NAME}_SKIP_CTEST_ADD_TEST}'") endif() message_wrapper( "-- ${TEST_NAME}: NOT added test because ${DISABLE_VAR_MSG}!") diff --git a/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake b/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake index 84a599432..6c157ce97 100644 --- a/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake +++ b/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake @@ -1019,20 +1019,20 @@ macro(tribits_apply_subpackage_tests_examples_enables PARENT_PACKAGE_NAME) 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}") + " ${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}") + " ${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() diff --git a/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake b/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake index 3c1c6763d..2d041a2ca 100644 --- a/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake +++ b/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake @@ -328,7 +328,7 @@ function(tribits_extpkg_add_find_upstream_dependencies_str ) foreach (upstreamTplDepEntry IN LISTS ${tplName}_LIB_ENABLED_DEPENDENCIES) tribits_extpkg_get_dep_name_and_vis( - "${upstreamTplDepEntry}" upstreamTplDepName upstreamTplDepVis) + "${upstreamTplDepEntry}" upstreamTplDepName upstreamTplDepVis) if ("${${upstreamTplDepName}_DIR}" STREQUAL "") message(FATAL_ERROR "ERROR: ${upstreamTplDepName}_DIR is empty!") endif() @@ -336,9 +336,9 @@ function(tribits_extpkg_add_find_upstream_dependencies_str "if (NOT TARGET ${upstreamTplDepName}::all_libs)\n" " set(${upstreamTplDepName}_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../${upstreamTplDepName}\")\n" " find_dependency(${upstreamTplDepName} REQUIRED CONFIG \${${tplName}_SearchNoOtherPathsArgs})\n" - " unset(${upstreamTplDepName}_DIR)\n" + " unset(${upstreamTplDepName}_DIR)\n" "endif()\n" - "\n" + "\n" ) endforeach() string(APPEND configFileFragStr @@ -705,7 +705,7 @@ function(tribits_extpkg_append_upstream_target_link_libraries_str "target_link_libraries(${prefix_libname}\n") foreach (upstreamTplDepEntry IN LISTS ${tplName}_LIB_ENABLED_DEPENDENCIES) tribits_extpkg_get_dep_name_and_vis( - "${upstreamTplDepEntry}" upstreamTplDepName upstreamTplDepVis) + "${upstreamTplDepEntry}" upstreamTplDepName upstreamTplDepVis) if (upstreamTplDepVis STREQUAL "PUBLIC") string(APPEND configFileStr " INTERFACE ${upstreamTplDepName}::all_libs # i.e. PUBLIC\n") diff --git a/tribits/core/package_arch/TribitsGlobalMacros.cmake b/tribits/core/package_arch/TribitsGlobalMacros.cmake index ca763c914..c269cf63b 100644 --- a/tribits/core/package_arch/TribitsGlobalMacros.cmake +++ b/tribits/core/package_arch/TribitsGlobalMacros.cmake @@ -204,12 +204,12 @@ function(assert_project_set_group_and_permissions_on_install_base_dir) "***\n" "*** ERROR in ${PROJECT_NAME}_SET_GROUP_AND_PERMISSIONS_ON_INSTALL_BASE_DIR!\n" "***\n" - "\n" - "${PROJECT_NAME}_SET_GROUP_AND_PERMISSIONS_ON_INSTALL_BASE_DIR=${${PROJECT_NAME}_SET_GROUP_AND_PERMISSIONS_ON_INSTALL_BASE_DIR}\n" + "\n" + "${PROJECT_NAME}_SET_GROUP_AND_PERMISSIONS_ON_INSTALL_BASE_DIR=${${PROJECT_NAME}_SET_GROUP_AND_PERMISSIONS_ON_INSTALL_BASE_DIR}\n" "\n" "is not a strict base dir of:\n" - "\n" - "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}\n" + "\n" + "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}\n" "\n" "Either remove ${PROJECT_NAME}_SET_GROUP_AND_PERMISSIONS_ON_INSTALL_BASE_DIR from the cache or set it to be a base dir of CMAKE_INSTALL_PREFIX!\n" "\n" @@ -2079,7 +2079,7 @@ macro(tribits_configure_enabled_packages) endif() else() set(${TRIBITS_PACKAGE}_BINARY_DIR - ${CMAKE_CURRENT_BINARY_DIR}/${${TRIBITS_PACKAGE}_REL_SOURCE_DIR}) + ${CMAKE_CURRENT_BINARY_DIR}/${${TRIBITS_PACKAGE}_REL_SOURCE_DIR}) endif() if (${PROJECT_NAME}_VERBOSE_CONFIGURE) print_var(${TRIBITS_PACKAGE}_BINARY_DIR) @@ -2139,7 +2139,7 @@ macro(tribits_configure_enabled_packages) "${TRIBITS_PACKAGE_CMAKELIST_FILE}") if (NOT ${TRIBITS_PACKAGE}_SOURCE_DIR STREQUAL ${PROJECT_NAME}_SOURCE_DIR) add_subdirectory(${${TRIBITS_PACKAGE}_SOURCE_DIR} ${${TRIBITS_PACKAGE}_BINARY_DIR}) - else() + else() include("${TRIBITS_PACKAGE_CMAKELIST_FILE}") endif() if (NOT ${PACKAGE_NAME}_TRIBITS_PACKAGE_POSTPROCESS) @@ -2307,15 +2307,15 @@ macro(tribits_setup_packaging_and_distribution) # package has to have this file to work correctly it should be # guaranteed to be there. string(REGEX MATCH "[.][.]/" RELATIVE_PATH_CHARS_MATCH - ${${TRIBITS_PACKAGE}_REL_SOURCE_DIR}) + ${${TRIBITS_PACKAGE}_REL_SOURCE_DIR}) if ("${RELATIVE_PATH_CHARS_MATCH}" STREQUAL "") set(CPACK_SOURCE_IGNORE_FILES - "${PROJECT_SOURCE_DIR}/${${TRIBITS_PACKAGE}_REL_SOURCE_DIR}/" + "${PROJECT_SOURCE_DIR}/${${TRIBITS_PACKAGE}_REL_SOURCE_DIR}/" ${CPACK_SOURCE_IGNORE_FILES}) else() find_path(ABSOLUTE_PATH CMakeLists.txt PATHS "${PROJECT_SOURCE_DIR}/${${TRIBITS_PACKAGE}_REL_SOURCE_DIR}" - NO_DEFAULT_PATH) + NO_DEFAULT_PATH) if ("${ABSOLUTE_PATH}" STREQUAL "ABSOLUTE_PATH-NOTFOUND") message(AUTHOR_WARNING "Relative path found for disabled package" " ${TRIBITS_PACKAGE} but package was missing a CMakeLists.txt file." diff --git a/tribits/core/package_arch/TribitsPackageMacros.cmake b/tribits/core/package_arch/TribitsPackageMacros.cmake index 99191e850..de132128c 100644 --- a/tribits/core/package_arch/TribitsPackageMacros.cmake +++ b/tribits/core/package_arch/TribitsPackageMacros.cmake @@ -737,7 +737,7 @@ macro(tribits_package_postprocess) NOT ${PACKAGE_NAME}_TRIBITS_PROCESS_SUBPACKAGES_CALLED ) tribits_report_invalid_tribits_usage( - "Must call tribits_package_decl(), tribits_process_subpackages()" + "Must call tribits_package_decl(), tribits_process_subpackages()" " and tribits_package_def() before tribits_package_postprocess()." " Because this package has subpackages you cannot use tribits_package()" " you must call these in the following order:" @@ -755,16 +755,16 @@ macro(tribits_package_postprocess) # This is a package without subpackages if ( - (NOT ${PACKAGE_NAME}_TRIBITS_PACKAGE_CALLED) - AND - (NOT ${PACKAGE_NAME}_TRIBITS_PACKAGE_DEF_CALLED) + (NOT ${PACKAGE_NAME}_TRIBITS_PACKAGE_CALLED) + AND + (NOT ${PACKAGE_NAME}_TRIBITS_PACKAGE_DEF_CALLED) ) tribits_report_invalid_tribits_usage( "Must call tribits_package() or tribits_package_def() before" - " tribits_package_postprocess()" - " at the top of the file:\n" - " ${TRIBITS_PACKAGE_CMAKELIST_FILE}" - ) + " tribits_package_postprocess()" + " at the top of the file:\n" + " ${TRIBITS_PACKAGE_CMAKELIST_FILE}" + ) endif() endif() diff --git a/tribits/core/package_arch/TribitsSubPackageMacros.cmake b/tribits/core/package_arch/TribitsSubPackageMacros.cmake index 60a7c668e..316063528 100644 --- a/tribits/core/package_arch/TribitsSubPackageMacros.cmake +++ b/tribits/core/package_arch/TribitsSubPackageMacros.cmake @@ -123,16 +123,16 @@ function(tribits_subpackage_assert_call_context) if(${SUBPACKAGE_FULLNAME}_TRIBITS_SUBPACKAGE_CALLED) tribits_report_invalid_tribits_usage( "Already called tribits_subpackge() for the" - " ${PARENT_PACKAGE_NAME} subpackage ${TRIBITS_SUBPACKAGE}") + " ${PARENT_PACKAGE_NAME} subpackage ${TRIBITS_SUBPACKAGE}") endif() # make sure the name in the macro call matches the name in the packages cmake file if (NOT ${SUBPACKAGE_NAME_IN} STREQUAL ${SUBPACKAGE_NAME}) tribits_report_invalid_tribits_usage( "Error, the package-defined subpackage name" - " '${SUBPACKAGE_NAME_IN}' is not the same as the subpackage name" - " '${SUBPACKAGE_NAME}' defined in the parent packages's" - " Dependencies.cmake file") + " '${SUBPACKAGE_NAME_IN}' is not the same as the subpackage name" + " '${SUBPACKAGE_NAME}' defined in the parent packages's" + " Dependencies.cmake file") endif() endif() diff --git a/tribits/core/package_arch/TribitsTplFindIncludeDirsAndLibraries.cmake b/tribits/core/package_arch/TribitsTplFindIncludeDirsAndLibraries.cmake index 987aaf8dd..8a5eeb35f 100644 --- a/tribits/core/package_arch/TribitsTplFindIncludeDirsAndLibraries.cmake +++ b/tribits/core/package_arch/TribitsTplFindIncludeDirsAndLibraries.cmake @@ -505,7 +505,7 @@ function(tribits_tpl_find_include_dirs_and_libraries TPL_NAME) "-- ${LIB_NOT_FOUND_MSG_PREFIX} Did not find a lib in the lib set \"${LIBNAME_SET}\"" " for the TPL '${TPL_NAME}'!") if (MUST_FIND_ALL_LIBS) - set(_${TPL_NAME}_ENABLE_SUCCESS FALSE) + set(_${TPL_NAME}_ENABLE_SUCCESS FALSE) else() break() endif() diff --git a/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake b/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake index 9b1f967af..6321f6d93 100644 --- a/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake +++ b/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake @@ -876,7 +876,7 @@ include(\"${${TRIBITS_PACKAGE}_BINARY_DIR}/${TRIBITS_PACKAGE}Config.cmake\")") set(TRIBITS_PROJECT_INSTALL_INCLUDE_DIR "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}") else() set(TRIBITS_PROJECT_INSTALL_INCLUDE_DIR - "${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}") + "${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}") endif() configure_file( diff --git a/tribits/ctest_driver/TribitsAddDashboardTarget.cmake b/tribits/ctest_driver/TribitsAddDashboardTarget.cmake index a9a8b6992..723725deb 100644 --- a/tribits/ctest_driver/TribitsAddDashboardTarget.cmake +++ b/tribits/ctest_driver/TribitsAddDashboardTarget.cmake @@ -196,7 +196,7 @@ macro(tribits_add_dashboard_target) # NOTE: Above, if ${PROJECT_NAME}_ENABLE_ALL_PACKAGES was set in CMakeCache.txt, then setting # -D${PROJECT_NAME}_ENABLE_ALL_PACKAGES:BOOL=OFF will turn it off in the cache. Note that it will # never be turned on again which means that the list of packages will be set explicitly below. - ) + ) set(DASHBOARD_TARGET_CTEST_DRIVER_CMND_NUM "B) ") @@ -226,7 +226,7 @@ macro(tribits_add_dashboard_target) COMMAND echo COMMAND echo "See the results at http://${CTEST_DROP_SITE}${CTEST_DROP_LOCATION}&display=project\#Experimental" COMMAND echo - ) + ) endif() diff --git a/tribits/ctest_driver/TribitsCTestDriverCore.cmake b/tribits/ctest_driver/TribitsCTestDriverCore.cmake index da12e79f9..33f2c886b 100644 --- a/tribits/ctest_driver/TribitsCTestDriverCore.cmake +++ b/tribits/ctest_driver/TribitsCTestDriverCore.cmake @@ -2128,18 +2128,18 @@ function(tribits_ctest_driver) if (EXISTS "${CTEST_TESTING_TAG_FILE}") file(READ "${CTEST_TESTING_TAG_FILE}" TAG_FILE_CONTENTS_STR) message( - "\nPrevious file:" - "\n" - "\n '${CTEST_TESTING_TAG_FILE}'" - "\n" - "\nexists with contents:\n" - "\n" - "${TAG_FILE_CONTENTS_STR}\n") + "\nPrevious file:" + "\n" + "\n '${CTEST_TESTING_TAG_FILE}'" + "\n" + "\nexists with contents:\n" + "\n" + "${TAG_FILE_CONTENTS_STR}\n") else() message(FATAL_ERROR - "ERROR: Previous file '${CTEST_TESTING_TAG_FILE}' does NOT exist!" - " A previous ctest_start() was not called. Please call again" - " this time setting CTEST_DO_NEW_START=TRUE") + "ERROR: Previous file '${CTEST_TESTING_TAG_FILE}' does NOT exist!" + " A previous ctest_start() was not called. Please call again" + " this time setting CTEST_DO_NEW_START=TRUE") endif() list(APPEND CTEST_START_ARGS APPEND) diff --git a/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake b/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake index f54285bb8..1d62d292e 100644 --- a/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake +++ b/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake @@ -50,7 +50,7 @@ macro(extrarepo_execute_process_wrapper) if (NOT EXTRAREPO_EXECUTE_PROCESS_WRAPPER_RTN_VAL STREQUAL "0") message(SEND_ERROR "Error: execute_process(${ARGN}) returned" - " '${EXTRAREPO_EXECUTE_PROCESS_WRAPPER_RTN_VAL}'") + " '${EXTRAREPO_EXECUTE_PROCESS_WRAPPER_RTN_VAL}'") endif() else() message("execute_process(${ARGN})") @@ -136,12 +136,12 @@ function(tribits_clone_or_update_extrarepo EXTRAREPO_NAME_IN EXTRAREPO_DIR_IN set(CLONE_CMND_ARGS COMMAND "${GIT_EXECUTABLE}" clone ${CHECKOUT_BRANCH_ARG} -o ${${PROJECT_NAME}_GIT_REPOSITORY_REMOTE} - "${EXTRAREPO_REPOURL}" ${EXTRAREPO_DIR_IN} + "${EXTRAREPO_REPOURL}" ${EXTRAREPO_DIR_IN} WORKING_DIRECTORY "${${PROJECT_NAME}_SOURCE_DIRECTORY}" OUTPUT_FILE "${EXTRAREPO_CLONE_OUT_FILE}" ) else() message(SEND_ERROR - "Error, Invalid EXTRAREPO_REPOTYPE_IN='${EXTRAREPO_REPOTYPE_IN}'!") + "Error, Invalid EXTRAREPO_REPOTYPE_IN='${EXTRAREPO_REPOTYPE_IN}'!") endif() # Do the clone @@ -508,7 +508,7 @@ macro(enable_only_modified_packages) if (${PROJECT_NAME}_ENABLE_ALL_PACKAGES) if (NOT ${PROJECT_NAME}_CTEST_DO_ALL_AT_ONCE) message(FATAL_ERROR - "Error, failing 'ALL_PACKAGES' only allowed with all-at-once mode!") + "Error, failing 'ALL_PACKAGES' only allowed with all-at-once mode!") endif() message("\nDirectly modified or failing non-disabled packages that need" " to be tested: ALL_PACKAGES") @@ -954,7 +954,7 @@ macro(tribits_ctest_package_by_package) if (CTEST_DEPENDENCY_HANDLING_UNIT_TESTING) message("${TRIBITS_PACKAGE}: Skipping configure due" - " to running in unit testing mode!") + " to running in unit testing mode!") else() @@ -1001,7 +1001,7 @@ macro(tribits_ctest_package_by_package) if (NOT CTEST_DO_CONFIGURE AND CTEST_DO_SUBMIT) message("${TRIBITS_PACKAGE}: Skipping submitting configure" - " and notes due to CTEST_DO_CONFIGURE='${CTEST_DO_CONFIGURE}'!") + " and notes due to CTEST_DO_CONFIGURE='${CTEST_DO_CONFIGURE}'!") elseif (CTEST_DO_SUBMIT) message("\nSubmitting configure and notes ...") tribits_ctest_submit( PARTS configure notes ) @@ -1025,7 +1025,7 @@ macro(tribits_ctest_package_by_package) if ( NOT PBP_CONFIGURE_PASSED AND CTEST_DO_BUILD ) message("\n${TRIBITS_PACKAGE}: Skipping build due" - " to configure failing!") + " to configure failing!") set(PBP_BUILD_PASSED FALSE) set(PBP_BUILD_LIBS_PASSED FALSE) @@ -1033,14 +1033,14 @@ macro(tribits_ctest_package_by_package) elseif (NOT CTEST_DO_BUILD) message("\n${TRIBITS_PACKAGE}: Skipping build due" - " to CTEST_DO_BUILD='${CTEST_DO_BUILD}'!") + " to CTEST_DO_BUILD='${CTEST_DO_BUILD}'!") elseif (CTEST_DEPENDENCY_HANDLING_UNIT_TESTING OR CTEST_CONFIGURATION_UNIT_TESTING ) message("\n${TRIBITS_PACKAGE}: Skipping build due" - " to running in unit testing mode!") + " to running in unit testing mode!") else() @@ -1152,7 +1152,7 @@ macro(tribits_ctest_package_by_package) " exists so there were failed tests!") else() message("\n${TRIBITS_PACKAGE}: File '${FAILED_TEST_LOG_FILE}'" - " does NOT exist so all tests passed!") + " does NOT exist so all tests passed!") set(PBP_TESTS_PASSED TRUE) endif() # 2009/12/05: ToDo: We need to add an argument to ctest_test(...) @@ -1190,7 +1190,7 @@ macro(tribits_ctest_package_by_package) if (NOT PBP_BUILD_LIBS_PASSED AND CTEST_DO_MEMORY_TESTING) message("\n${TRIBITS_PACKAGE}: Skipping running memory checking" - "tests since library build failed!\n") + "tests since library build failed!\n") elseif (NOT CTEST_DO_MEMORY_TESTING) @@ -1209,7 +1209,7 @@ macro(tribits_ctest_package_by_package) BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL "${CTEST_PARALLEL_LEVEL}" INCLUDE_LABEL "^${TRIBITS_PACKAGE}$" - ) + ) # ToDo: Determine if memory testing passed or not and affect overall # pass/fail!