Skip to content

Commit

Permalink
Merge pull request #1686 from STEllAR-GROUP/cmake_warnings
Browse files Browse the repository at this point in the history
Fixing cmake warnings about not existing pseudo target dependencies
  • Loading branch information
sithhell committed Jul 23, 2015
2 parents e57a6ef + 27bac55 commit c278463
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 24 deletions.
25 changes: 13 additions & 12 deletions tests/unit/actions/CMakeLists.txt
Expand Up @@ -65,26 +65,27 @@ if(HPX_WITH_COMPILE_ONLY_TESTS)
SOURCES ${sources}
EXCLUDE_FROM_ALL
FOLDER "Tests/Unit/Actions/CompileOnly")
set(target ${compile_test}_compile_test_lib)

# add a custom target for this example
add_hpx_pseudo_target(tests.unit.actions.${compile_test})

# make pseudo-targets depend on master pseudo-target
add_hpx_pseudo_dependencies(tests.unit.actions
tests.unit.actions.${compile_test})

# add dependencies to pseudo-target
add_hpx_pseudo_dependencies(tests.unit.actions.${compile_test}
${compile_test}_compile_test_lib)

else()
add_hpx_unit_compile_test(
"actions"
${compile_test}
SOURCES ${sources}
${${compile_test}_FLAGS}
FOLDER "Tests/Unit/Actions/CompileOnly")
set(target ${compile_test}_test_exe)
# there is no way to make this test depend on one of our pseudo targets
endif()

# add a custom target for this example
add_hpx_pseudo_target(tests.unit.actions.${compile_test})

# make pseudo-targets depend on master pseudo-target
add_hpx_pseudo_dependencies(tests.unit.actions
tests.unit.actions.${compile_test})

# add dependencies to pseudo-target
add_hpx_pseudo_dependencies(tests.unit.actions.${compile_test} ${target})
endforeach()
endif()

24 changes: 12 additions & 12 deletions tests/unit/lcos/CMakeLists.txt
Expand Up @@ -141,26 +141,26 @@ if(HPX_WITH_COMPILE_ONLY_TESTS)
SOURCES ${sources}
EXCLUDE_FROM_ALL
FOLDER "Tests/Unit/LCOs/CompileOnly")
set(target ${compile_test}_compile_test_lib)

# add a custom target for this example
add_hpx_pseudo_target(tests.unit.lcos.${compile_test})

# make pseudo-targets depend on master pseudo-target
add_hpx_pseudo_dependencies(tests.unit.lcos
tests.unit.lcos.${compile_test})

# add dependencies to pseudo-target
add_hpx_pseudo_dependencies(tests.unit.lcos.${compile_test}
${compile_test}_compile_test_lib)
else()
add_hpx_unit_compile_test(
"lcos"
${compile_test}
SOURCES ${sources}
${${compile_test}_FLAGS}
FOLDER "Tests/Unit/LCOs/CompileOnly")
set(target ${compile_test}_test_exe)
# there is no way to make this test depend on one of our pseudo targets
endif()

# add a custom target for this example
add_hpx_pseudo_target(tests.unit.lcos.${compile_test})

# make pseudo-targets depend on master pseudo-target
add_hpx_pseudo_dependencies(tests.unit.lcos
tests.unit.lcos.${compile_test})

# add dependencies to pseudo-target
add_hpx_pseudo_dependencies(tests.unit.lcos.${compile_test} ${target})
endforeach()
endif()

0 comments on commit c278463

Please sign in to comment.