Skip to content

Commit

Permalink
Merge pull request #515 from bartlettroscoe/512-replace-tabs-w-spaces
Browse files Browse the repository at this point in the history
Replace leading tabs with 8 spaces (#512)
  • Loading branch information
bartlettroscoe authored Aug 13, 2022
2 parents 7fdb5a7 + 99596c3 commit 4c184b4
Show file tree
Hide file tree
Showing 22 changed files with 224 additions and 224 deletions.
4 changes: 2 additions & 2 deletions test/ci_support/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,13 @@ function(test_tribitsexampleproject_w_tribits_get_tribits_packages_from_files_li
CMND cp
ARGS -r
"${${PROJECT_NAME}_TRIBITS_DIR}/examples/TribitsExampleProject"
TribitsExampleProject
TribitsExampleProject

TEST_1
CMND cp
ARGS -r
"${${PROJECT_NAME}_TRIBITS_DIR}"
TribitsExampleProject/cmake/tribits
TribitsExampleProject/cmake/tribits

TEST_2
CMND cp
Expand Down
2 changes: 1 addition & 1 deletion test/core/ExamplesUnitTests/SimpleTpl_installs_Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/core/ExamplesUnitTests/TribitsExampleApp_Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down
236 changes: 118 additions & 118 deletions test/ctest_driver/TribitsExampleProject/CMakeLists.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tribits/common_tpls/FindTPLNetcdf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down
18 changes: 9 additions & 9 deletions tribits/common_tpls/find_modules/FindHDF5.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -495,7 +495,7 @@ else()
# Define the HDF5_<component>_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()

Expand All @@ -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})
Expand Down Expand Up @@ -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()
Expand Down
24 changes: 12 additions & 12 deletions tribits/common_tpls/find_modules/FindNetCDF.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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)
Expand Down
18 changes: 9 additions & 9 deletions tribits/core/package_arch/TribitsAddAdvancedTest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -1113,20 +1113,20 @@ function(tribits_add_advanced_test TEST_NAME_IN)
# Parse TEST_<IDX> 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}}
)

Expand Down
6 changes: 3 additions & 3 deletions tribits/core/package_arch/TribitsAddLibrary.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -781,15 +781,15 @@ 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)
elseif (NOT ${PROJECT_NAME}_INSTALL_LIBRARIES_AND_HEADERS AND BUILD_SHARED_LIBS)
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()
Expand Down
4 changes: 2 additions & 2 deletions tribits/core/package_arch/TribitsAddTest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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})
Expand Down
4 changes: 2 additions & 2 deletions tribits/core/package_arch/TribitsAddTestHelpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}!")
Expand Down
16 changes: 8 additions & 8 deletions tribits/core/package_arch/TribitsAdjustPackageEnables.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,17 +328,17 @@ 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()
string(APPEND configFileFragStr
"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
Expand Down Expand Up @@ -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")
Expand Down
18 changes: 9 additions & 9 deletions tribits/core/package_arch/TribitsGlobalMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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."
Expand Down
Loading

0 comments on commit 4c184b4

Please sign in to comment.