Skip to content

Commit

Permalink
Remove unused/unneeded list vars and logic for packages and TPLs (Tri…
Browse files Browse the repository at this point in the history
…BITSPub#299, TriBITSPub#63)

This commit gets rid of several list variables that are not needed with the
move to modern CMake and some fairly complex code that was needed to compute
these list variables:

* <Project>_REVERSE_DEFINED_INTERNAL_PACKAGES
* <Project>_REVERSE_DEFINED_TPLS
* <Project>_TPL_LIST
* <Package>_PACKAGE_LIST
* <Package>_TPL_LIBRARIES
* <Package>_TPL_LIST
* <Package>_LIBRARY_DIRS
* <Package>_INCLUDE_DIR
* <Package>_TPL_LIBRARIES
* <Package>_TPL_LIBRARY_DIRS
* <Package>_TPL_INCLUDE_DIR
  • Loading branch information
bartlettroscoe committed Oct 17, 2022
1 parent 515df6c commit b020f8a
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 270 deletions.
4 changes: 2 additions & 2 deletions test/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ tribits_add_advanced_test( TribitsReadAllProjectDepsFilesCreateDepsGraph_UnitTes
-DCMAKE_CURRENT_LIST_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-P "${CMAKE_CURRENT_SOURCE_DIR}/TribitsReadAllProjectDepsFilesCreateDepsGraph_UnitTests.cmake"
PASS_REGULAR_EXPRESSION_ALL
"Final UnitTests Result: num_run = 125"
"Final UnitTests Result: num_run = 124"
"Final UnitTests Result: PASSED"
)

Expand Down Expand Up @@ -131,7 +131,7 @@ tribits_add_advanced_test( TribitsWriteClientExportFiles_UnitTests
-DCMAKE_CURRENT_LIST_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-P "${CMAKE_CURRENT_SOURCE_DIR}/TribitsWriteClientExportFiles_UnitTests.cmake"
PASS_REGULAR_EXPRESSION_ALL
"Final UnitTests Result: num_run = 33"
"Final UnitTests Result: num_run = 12"
"Final UnitTests Result: PASSED"
)

Expand Down
37 changes: 4 additions & 33 deletions test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,6 @@ function(TribitsExampleProject_ALL_ST_NoFortran sharedOrStatic serialOrMpi)
set(TPL_MPI_FILE_TRACE "")
set(FINAL_ENABLED_TPLS "HeaderOnlyTpl 1")
set(TEST_MPI_1_SUFFIX "")
set(WithSubpackages_TPL_LIBRARIES HeaderOnlyTpl::all_libs)
set(WithSubpackages_TPL_LIST HeaderOnlyTpl)
set(TribitsExProj_TPL_LIBRARIES HeaderOnlyTpl::all_libs)
set(TribitsExProj_TPL_LIST HeaderOnlyTpl)
set(TribitsExProj_SHARED_LIB_RPATH_COMMAND_REGEX "")
elseif (serialOrMpi STREQUAL "MPI")
set(tplEnableMpiArg -DTPL_ENABLE_MPI=ON)
Expand All @@ -101,10 +97,6 @@ function(TribitsExampleProject_ALL_ST_NoFortran sharedOrStatic serialOrMpi)
"-- File Trace: TPL INCLUDE .*/core/std_tpls/FindTPLMPI.cmake")
set(FINAL_ENABLED_TPLS "MPI HeaderOnlyTpl 2")
set(TEST_MPI_1_SUFFIX "_MPI_1")
set(WithSubpackages_TPL_LIBRARIES "HeaderOnlyTpl::all_libs;MPI::all_libs")
set(WithSubpackages_TPL_LIST "HeaderOnlyTpl;MPI")
set(TribitsExProj_TPL_LIBRARIES "HeaderOnlyTpl::all_libs;MPI::all_libs")
set(TribitsExProj_TPL_LIST "HeaderOnlyTpl;MPI")
set(TribitsExProj_SHARED_LIB_RPATH_COMMAND_REGEX
"-Wl,-rpath,.*/${testName}/install/lib")
else()
Expand Down Expand Up @@ -315,21 +307,13 @@ function(TribitsExampleProject_ALL_ST_NoFortran sharedOrStatic serialOrMpi)
"WithSubpackages_LINKER = '.+'"
"WithSubpackages_AR = '.+'"
"WithSubpackages_INSTALL_DIR = .*/${testName}/install"
"WithSubpackages_INCLUDE_DIRS = ''"
"WithSubpackages_LIBRARY_DIRS = ''"
"WithSubpackages_LIBRARIES = 'WithSubpackagesC::pws_c[;]WithSubpackagesB::pws_b[;]WithSubpackagesA::pws_a[;]SimpleCxx::simplecxx'"
"WithSubpackages_TPL_INCLUDE_DIRS = ''"
"WithSubpackages_TPL_LIBRARY_DIRS = ''"
"WithSubpackages_TPL_LIBRARIES = '${WithSubpackages_TPL_LIBRARIES}'"
"WithSubpackages_LIBRARIES = 'WithSubpackages::all_libs'"
"WithSubpackages_MPI_LIBRARIES = ''"
"WithSubpackages_MPI_LIBRARY_DIRS = ''"
"WithSubpackages_MPI_INCLUDE_DIRS = ''"
"WithSubpackages_MPI_EXEC = '${MPI_EXEC}'"
"WithSubpackages_MPI_EXEC_MAX_NUMPROCS = '${MPI_EXEC_MAX_NUMPROCS}'"
"WithSubpackages_MPI_EXEC_NUMPROCS_FLAG = '${MPI_EXEC_NUMPROCS_FLAG}'"
"WithSubpackages_PACKAGE_LIST = 'WithSubpackagesC.WithSubpackagesB.WithSubpackagesA.SimpleCxx'"
"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'"
"-- Configuring done"
Expand Down Expand Up @@ -409,21 +393,13 @@ function(TribitsExampleProject_ALL_ST_NoFortran sharedOrStatic serialOrMpi)
"WithSubpackages_LINKER = '.+'"
"WithSubpackages_AR = '.+'"
"WithSubpackages_INSTALL_DIR = '.+/install'"
"WithSubpackages_INCLUDE_DIRS = ''"
"WithSubpackages_LIBRARY_DIRS = ''"
"WithSubpackages_LIBRARIES = 'WithSubpackagesC::pws_c[;]WithSubpackagesB::pws_b[;]WithSubpackagesA::pws_a[;]SimpleCxx::simplecxx'"
"WithSubpackages_TPL_INCLUDE_DIRS = ''"
"WithSubpackages_TPL_LIBRARY_DIRS = ''"
"WithSubpackages_TPL_LIBRARIES = '${WithSubpackages_TPL_LIBRARIES}'"
"WithSubpackages_LIBRARIES = 'WithSubpackages::all_libs'"
"WithSubpackages_MPI_LIBRARIES = ''"
"WithSubpackages_MPI_LIBRARY_DIRS = ''"
"WithSubpackages_MPI_INCLUDE_DIRS = ''"
"WithSubpackages_MPI_EXEC = '${MPI_EXEC}'"
"WithSubpackages_MPI_EXEC_MAX_NUMPROCS = '${MPI_EXEC_MAX_NUMPROCS}'"
"WithSubpackages_MPI_EXEC_NUMPROCS_FLAG = '${MPI_EXEC_NUMPROCS_FLAG}'"
"WithSubpackages_PACKAGE_LIST = 'WithSubpackagesC.WithSubpackagesB.WithSubpackagesA.SimpleCxx'"
"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'"
ALWAYS_FAIL_ON_NONZERO_RETURN
Expand Down Expand Up @@ -466,11 +442,7 @@ function(TribitsExampleProject_ALL_ST_NoFortran sharedOrStatic serialOrMpi)
"TribitsExProj_AR = '.*'"
"TribitsExProj_INSTALL_DIR = '.*/${testName}/install'"
"TribitsExProj_INCLUDE_DIRS = '.*/${testName}/install/include'"
"TribitsExProj_LIBRARY_DIRS = ''"
"TribitsExProj_LIBRARIES = 'WithSubpackagesC::pws_c[;]WithSubpackagesB::pws_b[;]WithSubpackagesA::pws_a[;]SimpleCxx::simplecxx'"
"TribitsExProj_TPL_INCLUDE_DIRS = ''"
"TribitsExProj_TPL_LIBRARY_DIRS = ''"
"TribitsExProj_TPL_LIBRARIES = '${TribitsExProj_TPL_LIBRARIES}'"
"TribitsExProj_LIBRARIES = 'WithSubpackages::all_libs;WithSubpackagesC::all_libs;WithSubpackagesB::all_libs;WithSubpackagesA::all_libs;SimpleCxx::all_libs'"
"TribitsExProj_MPI_LIBRARIES = ''"
"TribitsExProj_MPI_LIBRARY_DIRS = ''"
"TribitsExProj_MPI_INCLUDE_DIRS = ''"
Expand Down Expand Up @@ -1221,8 +1193,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_TPL_LIST = 'HeaderOnlyTpl'"
"WithSubpackages::all_libs INTERFACE_LINK_LIBRARIES: 'WithSubpackagesA::pws_a[;]WithSubpackagesB::pws_b[;]WithSubpackagesC::pws_c'"
ALWAYS_FAIL_ON_NONZERO_RETURN

TEST_6 CMND ninja ARGS -j1 install ${CTEST_BUILD_FLAGS}
Expand Down
6 changes: 1 addition & 5 deletions test/core/ExamplesUnitTests/TribitsHelloWorld_Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -768,11 +768,7 @@ tribits_add_advanced_test( TribitsHelloWorld_install_config_dummy_proj
"TribitsHelloWorld_AR = '.*'"
"TribitsHelloWorld_INSTALL_DIR = '.*/TriBITS_TribitsHelloWorld_install_config_dummy_proj/install'"
"TribitsHelloWorld_INCLUDE_DIRS = '.*/TriBITS_TribitsHelloWorld_install_config_dummy_proj/install/include'"
"TribitsHelloWorld_LIBRARY_DIRS = ''"
"TribitsHelloWorld_LIBRARIES = 'HelloWorld::hello_world_lib'"
"TribitsHelloWorld_TPL_INCLUDE_DIRS = '"
"TribitsHelloWorld_TPL_LIBRARY_DIRS = ''"
"TribitsHelloWorld_TPL_LIBRARIES = ''"
"TribitsHelloWorld_LIBRARIES = 'HelloWorld::all_libs'"
"TribitsHelloWorld_MPI_LIBRARIES = ''"
"TribitsHelloWorld_MPI_LIBRARY_DIRS = ''"
"TribitsHelloWorld_MPI_INCLUDE_DIRS = ''"
Expand Down
7 changes: 0 additions & 7 deletions test/core/TribitsAdjustPackageEnablesHelpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,6 @@ macro(unittest_helper_read_and_process_packages)
foreach(tribitsPkg ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES})
global_set(${tribitsPkg}_FULL_ENABLED_DEP_PACKAGES)
endforeach()
# ${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()
tribits_print_enables_before_adjust_package_enables()
tribits_adjust_package_enables(TRUE)
tribits_print_enables_after_adjust_package_enables()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,6 @@ function(unittest_read_packages_and_dependencies)
unittest_helper_read_packages_and_dependencies()
unittest_compare_const(${PROJECT_NAME}_DEFINED_TPLS "MPI;BLAS;LAPACK;Boost")
unittest_compare_const(${PROJECT_NAME}_NUM_DEFINED_TPLS 4)
unittest_compare_const(${PROJECT_NAME}_REVERSE_DEFINED_TPLS "Boost;LAPACK;BLAS;MPI")
unittest_compare_const(${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES
"Teuchos;RTOp;Ex2Package1;Ex2Package2")
unittest_compare_const(${PROJECT_NAME}_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES 4)
Expand Down Expand Up @@ -772,4 +771,4 @@ unittest_extra_repo_missing_required_package_verbose()
unittest_elevate_subpackages_st_to_pt()

# Pass in the number of expected tests that must pass!
unittest_final_result(125)
unittest_final_result(124)
29 changes: 4 additions & 25 deletions test/core/TribitsWriteClientExportFiles_UnitTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -176,29 +176,15 @@ function(unittest_write_specialized_package_export_makefile_rtop_before_libs)
unittest_file_regex("${GENERATED_EXPORT_CONFIG_FOR_BUILD}"
REGEX_STRINGS
"set[(]RTOp1_CMAKE_BUILD_TYPE .DEBUG."
"set[(]RTOp1_INCLUDE_DIRS ..[)]"
"set[(]RTOp1_LIBRARY_DIRS ..[)]"
"set[(]RTOp1_LIBRARIES .teuchoscore.teuchosnumeric.[)]"
"set[(]RTOp1_TPL_INCLUDE_DIRS ..[)]"
"set[(]RTOp1_TPL_LIBRARY_DIRS ..[)]"
"set[(]RTOp1_TPL_LIBRARIES .LAPACK::all_libs[;]BLAS::all_libs.[)]"
"set[(]RTOp1_PACKAGE_LIST .Teuchos.[)]"
"set[(]RTOp1_TPL_LIST .LAPACK.BLAS.[)]"
"set[(]RTOp1_LIBRARIES RTOp::all_libs[)]"
"set[(]RTOp1_ENABLE_Teuchos ON[)]"

)

unittest_file_regex("${GENERATED_EXPORT_CONFIG_FOR_INSTALL}"
REGEX_STRINGS
"set[(]RTOp1_CMAKE_BUILD_TYPE .DEBUG."
"set[(]RTOp1_INCLUDE_DIRS ..[)]"
"set[(]RTOp1_LIBRARY_DIRS ..[)]"
"set[(]RTOp1_LIBRARIES .teuchoscore.teuchosnumeric.[)]"
"set[(]RTOp1_TPL_INCLUDE_DIRS ..[)]"
"set[(]RTOp1_TPL_LIBRARY_DIRS ..[)]"
"set[(]RTOp1_TPL_LIBRARIES .LAPACK::all_libs[;]BLAS::all_libs.[)]"
"set[(]RTOp1_PACKAGE_LIST .Teuchos.[)]"
"set[(]RTOp1_TPL_LIST .LAPACK.BLAS.[)]"
"set[(]RTOp1_LIBRARIES RTOp::all_libs[)]"
"set[(]RTOp1_ENABLE_Teuchos ON[)]"
)

Expand Down Expand Up @@ -266,14 +252,7 @@ function(unittest_write_specialized_package_export_makefile_rtop_after_libs)
unittest_file_regex("${GENERATED_EXPORT_CONFIG_FOR_BUILD}"
REGEX_STRINGS
"set[(]RTOp2_CMAKE_BUILD_TYPE .RELEASE."
"set[(]RTOp2_INCLUDE_DIRS ..[)]"
"set[(]RTOp2_LIBRARY_DIRS ..[)]"
"set[(]RTOp2_LIBRARIES .rtop.teuchoscore.teuchosnumeric.[)]"
"set[(]RTOp2_TPL_INCLUDE_DIRS ..[)]"
"set[(]RTOp2_TPL_LIBRARY_DIRS ..[)]"
"set[(]RTOp2_TPL_LIBRARIES .LAPACK::all_libs[;]BLAS::all_libs.[)]"
"set[(]RTOp2_PACKAGE_LIST .RTOp.Teuchos.[)]"
"set[(]RTOp2_TPL_LIST .LAPACK.BLAS.[)]"
"set[(]RTOp2_LIBRARIES RTOp::all_libs[)]"
"set[(]RTOp2_ENABLE_Teuchos ON[)]"
)

Expand All @@ -300,4 +279,4 @@ unittest_write_specialized_package_export_makefile_rtop_before_libs()
unittest_write_specialized_package_export_makefile_rtop_after_libs()

# Pass in the number of expected tests that must pass!
unittest_final_result(33)
unittest_final_result(12)
1 change: 0 additions & 1 deletion test/ctest_driver/TribitsExampleProject/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2709,7 +2709,6 @@ function(generate_aao_tests)
"Calling: find_package[(]TribitsExProj REQUIRED COMPONENTS OPTIONAL_COMPONENTS SimpleCxx[;]WithSubpackagesA[;]WithSubpackageC [)]"
"TribitsExProj_PACKAGE_LIST = 'WithSubpackages[;]WithSubpackagesC[;]WithSubpackagesB[;]WithSubpackagesA[;]MixedLang[;]SimpleCxx'"
"TribitsExProj_SELECTED_PACKAGE_LIST = 'SimpleCxx[;]WithSubpackagesA'"
"TribitsExProj_TPL_LIST = 'HeaderOnlyTpl'"
"TribitsExProj_SimpleCxx_FOUND = 'TRUE'"
"TribitsExProj_WithSubpackagesA_FOUND = 'TRUE'"
"TribitsExProj_WithSubpackageC_FOUND = 'FALSE'"
Expand Down
23 changes: 1 addition & 22 deletions tribits/core/installation/TribitsPackageConfigTemplate.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}

## ----------------------------------------------------------------------------
Expand Down
14 changes: 0 additions & 14 deletions tribits/core/installation/TribitsProjectConfigTemplate.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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
## ---------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,14 +238,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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,6 @@ macro(tribits_read_all_package_deps_files_create_deps_graph)
${${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)
Expand Down
Loading

0 comments on commit b020f8a

Please sign in to comment.