Skip to content

Commit

Permalink
TribitsExampleProject2: Remove hacked dependencies on indirect TPLs (#63
Browse files Browse the repository at this point in the history
, #299)

This shows that the new TPL dependencies actually work to bring in indirect
TPL dependencies and create the proper link lines.  If you comment out the
`set(<tplName>_LIB_ENABLED_DEPENDENCIES ...)` statements in
`TribitsExampleProject2/TPLsList.cmake`, you will see failing tests.
  • Loading branch information
bartlettroscoe committed May 13, 2022
1 parent 4233071 commit 9a2adfd
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,7 @@ function(TribitsExampleProject2_find_tpl_parts sharedOrStatic findingTplsMethod)
"set[(]Package3_ENABLE_Package1 ON[)]"
"set[(]Package3_ENABLE_Package2 ON[)]"
"set[(]Package3_ENABLE_Tpl2 ON[)]"
"set[(]Package3_ENABLE_Tpl1 ON[)]"
"set[(]Package3_ENABLE_Tpl4 ON[)]"
"set[(]Package3_ENABLE_Tpl3 ON[)]"

TEST_2
MESSAGE "Build verbose to check the link line of Package3"
Expand Down Expand Up @@ -253,9 +251,7 @@ function(TribitsExampleProject2_find_tpl_parts sharedOrStatic findingTplsMethod)
"set[(]Package3_ENABLE_Package1 ON[)]"
"set[(]Package3_ENABLE_Package2 ON[)]"
"set[(]Package3_ENABLE_Tpl2 ON[)]"
"set[(]Package3_ENABLE_Tpl1 ON[)]"
"set[(]Package3_ENABLE_Tpl4 ON[)]"
"set[(]Package3_ENABLE_Tpl3 ON[)]"

${ENV_PATH_HACK_FOR_TPL1_${sharedOrStatic}_ARG}

Expand Down Expand Up @@ -345,9 +341,7 @@ function(TribitsExampleProject2_find_tpl_parts_no_optional_packages_tpls sharedO
"set[(]Package3_ENABLE_Package1 ON[)]"
"set[(]Package3_ENABLE_Package2 OFF[)]"
"set[(]Package3_ENABLE_Tpl2 ON[)]"
"set[(]Package3_ENABLE_Tpl1 ON[)]"
"set[(]Package3_ENABLE_Tpl4 OFF[)]"
"set[(]Package3_ENABLE_Tpl3 OFF[)]"

TEST_2
MESSAGE "Build verbose to check the link line of Package3"
Expand Down Expand Up @@ -378,9 +372,7 @@ function(TribitsExampleProject2_find_tpl_parts_no_optional_packages_tpls sharedO
"set[(]Package3_ENABLE_Package1 ON[)]"
"set[(]Package3_ENABLE_Package2 OFF[)]"
"set[(]Package3_ENABLE_Tpl2 ON[)]"
"set[(]Package3_ENABLE_Tpl1 ON[)]"
"set[(]Package3_ENABLE_Tpl4 OFF[)]"
"set[(]Package3_ENABLE_Tpl3 OFF[)]"

ADDED_TEST_NAME_OUT ${testNameBase}_NAME
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
tribits_package_define_dependencies(
LIB_REQUIRED_PACKAGES Package1
LIB_OPTIONAL_TPLS Tpl3
Tpl2 Tpl1 # ToDo: Remove this line once TPL dependencies are implemented! (#299)
)
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@ tribits_package_define_dependencies(
LIB_REQUIRED_PACKAGES Package1
LIB_OPTIONAL_PACKAGES Package2
LIB_REQUIRED_TPLS Tpl2
Tpl1 # ToDo: Remove this line once TPL dependencies are implemented! (#299)
LIB_OPTIONAL_TPLS Tpl4
Tpl3 # ToDo: Remove this line once TPL dependencies are implemented! (#299)
)

0 comments on commit 9a2adfd

Please sign in to comment.