Skip to content

Commit

Permalink
Merge pull request TriBITSPub#539 from KyleFromKitware/use-tribits-de…
Browse files Browse the repository at this point in the history
…precation
  • Loading branch information
bartlettroscoe authored Nov 3, 2022
2 parents f0430db + ee4eed2 commit 7e68637
Show file tree
Hide file tree
Showing 15 changed files with 97 additions and 60 deletions.
2 changes: 1 addition & 1 deletion test/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ tribits_add_advanced_test( TestingFunctionMacro_UnitTests
-D${PROJECT_NAME}_TRIBITS_DIR=${${PROJECT_NAME}_TRIBITS_DIR}
-P "${CMAKE_CURRENT_SOURCE_DIR}/TestingFunctionMacro_UnitTests.cmake"
PASS_REGULAR_EXPRESSION_ALL
"Final UnitTests Result: num_run = 717"
"Final UnitTests Result: num_run = 719"
"Final UnitTests Result: PASSED"
)

Expand Down
36 changes: 18 additions & 18 deletions test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1600,7 +1600,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage
ARGS -DSPKB_SHOW_UPSTREAM_DEPLIBS_ERROR=ON
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: 'simplecxx' in DEPLIBS is not a lib in this package"
"'simplecxx' in DEPLIBS is not a lib in this package"
"packages/with_subpackages/b/src/CMakeLists.txt:.* [(]tribits_add_library[)]"
"Generating done"
"Build files have been written to: .*/TriBITS_TribitsExampleProject_ALL_ST_LibUsage"
Expand All @@ -1612,7 +1612,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage
-DSPKB_SHOW_UPSTREAM_DEPLIBS_ERROR=
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: Lib 'pws_b' in IMPORTEDLIBS is in this package "
"Lib 'pws_b' in IMPORTEDLIBS is in this package "
"packages/with_subpackages/b/tests/testlib/CMakeLists.txt:.* [(]tribits_add_library[)]"
"Generating done"
"Build files have been written to: .*/TriBITS_TribitsExampleProject_ALL_ST_LibUsage"
Expand All @@ -1625,7 +1625,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage
-DSPKB_SHOW_PKG_LIB_IMPORTEDLIBS_ERROR=
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: Lib 'simplecxx' being passed through IMPORTEDLIBS"
"Lib 'simplecxx' being passed through IMPORTEDLIBS"
"TribitsExampleProject/packages/with_subpackages/b/cmake/Dependencies.cmake"
"packages/with_subpackages/b/tests/testlib/CMakeLists.txt:.* [(]tribits_add_library[)]"
"Generating done"
Expand All @@ -1638,7 +1638,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage
-DSPKB_SHOW_UPSTREAM_PKG_LIB_IMPORTEDLIBS_ERROR=
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: 'b_mixed_lang' in DEPLIBS is a TESTONLY lib "
"'b_mixed_lang' in DEPLIBS is a TESTONLY lib "
"TribitsExampleProject/packages/with_subpackages/c/cmake/Dependencies.cmake"
"packages/with_subpackages/c/CMakeLists.txt:.* [(]tribits_add_library[)]"
"Generating done"
Expand All @@ -1651,7 +1651,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage
-DSPKC_SHOW_TESTONLY_DEPLBIS_ERROR=
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: 'b_mixed_lang' in IMPORTEDLIBS is a TESTONLY lib"
"'b_mixed_lang' in IMPORTEDLIBS is a TESTONLY lib"
"packages/with_subpackages/c/CMakeLists.txt:.* [(]tribits_add_library[)]"
"Generating done"
"Build files have been written to: .*/TriBITS_TribitsExampleProject_ALL_ST_LibUsage"
Expand All @@ -1663,7 +1663,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage
-DSPKC_SHOW_TESTONLY_IMPORTEDLIBS_ERROR=
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: 'm' in DEPLIBS is not a lib defined in the current cmake "
"'m' in DEPLIBS is not a lib defined in the current cmake "
"packages/with_subpackages/b/src/CMakeLists.txt:.* [(]tribits_add_library[)]"
"Generating done"
"Build files have been written to: .*/TriBITS_TribitsExampleProject_ALL_ST_LibUsage"
Expand Down Expand Up @@ -1712,7 +1712,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage
-DSPKB_SHOW_IMPORTED_LIBS_THIS_PKG_ERROR=
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: Passing TESTONLY lib 'b_mixed_lang' through DEPLIBS is deprecated"
"Passing TESTONLY lib 'b_mixed_lang' through DEPLIBS is deprecated"
"packages/with_subpackages/b/tests/CMakeLists.txt:.* [(]tribits_add_executable_and_test[)]"
"Generating done"
"Build files have been written to: .*/TriBITS_TribitsExampleProject_ALL_ST_LibUsage"
Expand All @@ -1724,7 +1724,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage
-DSPKB_SHOW_TESTONLY_DEBLIBS_WARNING=
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: Passing non-TESTONLY lib 'pws_b' through DEPLIBS is deprecated"
"Passing non-TESTONLY lib 'pws_b' through DEPLIBS is deprecated"
"packages/with_subpackages/b/tests/CMakeLists.txt:.* [(]tribits_add_executable_and_test[)]"
"Generating done"
"Build files have been written to: .*/TriBITS_TribitsExampleProject_ALL_ST_LibUsage"
Expand All @@ -1736,7 +1736,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage
-DSPKB_SHOW_NONTESTONLY_DEBLIBS_WARNING=
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: Passing external lib 'm' through DEPLIBS is deprecated"
"Passing external lib 'm' through DEPLIBS is deprecated"
"packages/with_subpackages/b/tests/CMakeLists.txt:.* [(]tribits_add_executable_and_test[)]"
"Generating done"
"Build files have been written to: .*/TriBITS_TribitsExampleProject_ALL_ST_LibUsage"
Expand Down Expand Up @@ -1784,7 +1784,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage_LibPrefix
ARGS -DSPKB_SHOW_UPSTREAM_DEPLIBS_ERROR=ON
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: 'simplecxx' in DEPLIBS is not a lib in this package"
"'simplecxx' in DEPLIBS is not a lib in this package"
"packages/with_subpackages/b/src/CMakeLists.txt:.* [(]tribits_add_library[)]"
"Generating done"
"Build files have been written to: .*/TriBITS_TribitsExampleProject_ALL_ST_LibUsage_LibPrefix"
Expand All @@ -1796,7 +1796,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage_LibPrefix
-DSPKB_SHOW_UPSTREAM_DEPLIBS_ERROR=
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: Lib 'pws_b' in IMPORTEDLIBS is in this package "
"Lib 'pws_b' in IMPORTEDLIBS is in this package "
"packages/with_subpackages/b/tests/testlib/CMakeLists.txt:.* [(]tribits_add_library[)]"
"Generating done"
"Build files have been written to: .*/TriBITS_TribitsExampleProject_ALL_ST_LibUsage_LibPrefix"
Expand All @@ -1809,7 +1809,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage_LibPrefix
-DSPKB_SHOW_PKG_LIB_IMPORTEDLIBS_ERROR=
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: Lib 'simplecxx' being passed through IMPORTEDLIBS"
"Lib 'simplecxx' being passed through IMPORTEDLIBS"
"TribitsExampleProject/packages/with_subpackages/b/cmake/Dependencies.cmake"
"packages/with_subpackages/b/tests/testlib/CMakeLists.txt:.* [(]tribits_add_library[)]"
"Generating done"
Expand All @@ -1822,7 +1822,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage_LibPrefix
-DSPKB_SHOW_UPSTREAM_PKG_LIB_IMPORTEDLIBS_ERROR=
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: 'b_mixed_lang' in DEPLIBS is a TESTONLY lib "
"'b_mixed_lang' in DEPLIBS is a TESTONLY lib "
"TribitsExampleProject/packages/with_subpackages/c/cmake/Dependencies.cmake"
"packages/with_subpackages/c/CMakeLists.txt:.* [(]tribits_add_library[)]"
"Generating done"
Expand All @@ -1835,7 +1835,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage_LibPrefix
-DSPKC_SHOW_TESTONLY_DEPLBIS_ERROR=
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: 'b_mixed_lang' in IMPORTEDLIBS is a TESTONLY lib"
"'b_mixed_lang' in IMPORTEDLIBS is a TESTONLY lib"
"packages/with_subpackages/c/CMakeLists.txt:.* [(]tribits_add_library[)]"
"Generating done"
"Build files have been written to: .*/TriBITS_TribitsExampleProject_ALL_ST_LibUsage_LibPrefix"
Expand All @@ -1847,7 +1847,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage_LibPrefix
-DSPKC_SHOW_TESTONLY_IMPORTEDLIBS_ERROR=
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: 'm' in DEPLIBS is not a lib defined in the current cmake "
"'m' in DEPLIBS is not a lib defined in the current cmake "
"packages/with_subpackages/b/src/CMakeLists.txt:.* [(]tribits_add_library[)]"
"Generating done"
"Build files have been written to: .*/TriBITS_TribitsExampleProject_ALL_ST_LibUsage_LibPrefix"
Expand Down Expand Up @@ -1896,7 +1896,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage_LibPrefix
-DSPKB_SHOW_IMPORTED_LIBS_THIS_PKG_ERROR=
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: Passing TESTONLY lib 'b_mixed_lang' through DEPLIBS is deprecated"
"Passing TESTONLY lib 'b_mixed_lang' through DEPLIBS is deprecated"
"packages/with_subpackages/b/tests/CMakeLists.txt:.* [(]tribits_add_executable_and_test[)]"
"Generating done"
"Build files have been written to: .*/TriBITS_TribitsExampleProject_ALL_ST_LibUsage_LibPrefix"
Expand All @@ -1908,7 +1908,7 @@ tribits_add_advanced_test( TribitsExampleProject_ALL_ST_LibUsage_LibPrefix
-DSPKB_SHOW_TESTONLY_DEBLIBS_WARNING=
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: Passing non-TESTONLY lib 'pws_b' through DEPLIBS is deprecated"
"Passing non-TESTONLY lib 'pws_b' through DEPLIBS is deprecated"
"packages/with_subpackages/b/tests/CMakeLists.txt:.* [(]tribits_add_executable_and_test[)]"
"Generating done"
"Build files have been written to: .*/TriBITS_TribitsExampleProject_ALL_ST_LibUsage_LibPrefix"
Expand Down Expand Up @@ -2816,7 +2816,7 @@ tribits_add_advanced_test( TribitsExampleProject_TargetDefinesPkg
-DTribitsExProj_ENABLE_TESTS=ON
.
PASS_REGULAR_EXPRESSION_ALL
"WARNING: Passing extra defines through 'DEFINES'"
"Passing extra defines through 'DEFINES'"
"Final set of enabled top-level packages: TargetDefinesPkg 1"
"Final set of enabled packages: TargetDefinesPkg 1"
"Configuring done"
Expand Down
28 changes: 25 additions & 3 deletions test/core/TestingFunctionMacro_UnitTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ function(unittest_tribits_misc)
tribits_filter_and_assert_categories(CATEGORIES)
set(MESSAGE_WRAPPER_UNIT_TEST_MODE FALSE)
unittest_compare_const(MESSAGE_WRAPPER_INPUT
"WARNING;Warning: The test category 'WEEKLY' is deprecated; and is replaced with 'HEAVY'. Please change to use 'HEAVY' instead.")
"DEPRECATION;The test category 'WEEKLY' is deprecated; and is replaced with 'HEAVY'. Please change to use 'HEAVY' instead.")
unittest_compare_const(CATEGORIES "BASIC;HEAVY;NIGHTLY")

message("Testing tribits_filter_and_assert_categories( ... HEAVY)")
Expand Down Expand Up @@ -1747,7 +1747,7 @@ function(unittest_tribits_add_test_categories)
tribits_add_test( ${EXEN} CATEGORIES WEEKLY )
unittest_compare_const(
MESSAGE_WRAPPER_INPUT
"WARNING;Warning: The test category 'WEEKLY' is deprecated; and is replaced with 'HEAVY'. Please change to use 'HEAVY' instead.;-- PackageA_SomeExec: Added test (HEAVY, PROCESSORS=1)!"
"DEPRECATION;The test category 'WEEKLY' is deprecated; and is replaced with 'HEAVY'. Please change to use 'HEAVY' instead.;-- PackageA_SomeExec: Added test (HEAVY, PROCESSORS=1)!"
)
unittest_compare_const(
TRIBITS_ADD_TEST_ADD_TEST_INPUT
Expand Down Expand Up @@ -4597,6 +4597,16 @@ function(unittest_tribits_deprecated)
"DEPRECATION;This is a deprecation message with TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE unset"
)

message("Testing tribits_deprecated() with multiple message arguments")
unset(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE)
global_set(MESSAGE_WRAPPER_INPUT)
tribits_deprecated("This is a deprecation message with"
" multiple message arguments")
unittest_compare_const(
MESSAGE_WRAPPER_INPUT
"DEPRECATION;This is a deprecation message with; multiple message arguments"
)

message("Testing tribits_deprecated() with TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE set to empty string")
set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE "")
global_set(MESSAGE_WRAPPER_INPUT)
Expand Down Expand Up @@ -4691,6 +4701,18 @@ function(unittest_tribits_deprecated_command)
"DEPRECATION;TriBITS command 'tribits_another_deprecated_command' is deprecated.\n\nUse tribits_some_new_command instead."
)

message("Testing tribits_deprecated_command() with multiple MESSAGE arguments")
unset(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE)
global_set(MESSAGE_WRAPPER_INPUT)
tribits_deprecated_command(tribits_yet_another_deprecated_command
MESSAGE "This is a deprecation message with"
" multiple arguments."
)
unittest_compare_const(
MESSAGE_WRAPPER_INPUT
"DEPRECATION;TriBITS command 'tribits_yet_another_deprecated_command' is deprecated.\n\nThis is a deprecation message with; multiple arguments."
)

endfunction()


Expand Down Expand Up @@ -4791,4 +4813,4 @@ message("*** Determine final result of all unit tests")
message("***\n")

# Pass in the number of expected tests that must pass!
unittest_final_result(717)
unittest_final_result(719)
7 changes: 4 additions & 3 deletions tribits/core/package_arch/TribitsAddExecutable.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ include(TribitsAddTestHelpers)
include(TribitsGeneralMacros)
include(TribitsLibIsTestOnly)
include(TribitsReportInvalidTribitsUsage)
include(TribitsDeprecatedHelpers)

include(PrintVar)
include(AppendSet)
Expand Down Expand Up @@ -374,7 +375,7 @@ function(tribits_add_executable EXE_NAME)
endif()

if (PARSE_DEFINES)
message(WARNING "WARNING: Passing extra defines through 'DEFINES' ${PARSE_DEFINES}"
tribits_deprecated("Passing extra defines through 'DEFINES' ${PARSE_DEFINES}"
" is deprecated. Instead, pass them through 'TARGET_DEFINES'. The 'DEFINES'"
" argument was incorrectly implemented by calling add_definitions() which has"
" directory scope and not function scope as was documented. This resulted in"
Expand Down Expand Up @@ -657,12 +658,12 @@ macro(tribits_add_executable_convert_from_deplibs)
set(prefixedDepLib "${${PROJECT_NAME}_LIBRARY_NAME_PREFIX}${depLib}")
tribits_lib_is_testonly(${prefixedDepLib} depLibIsTestOnlyLib)
if (depLibIsTestOnlyLib)
message(WARNING "WARNING: Passing TESTONLY lib '${depLib}' through DEPLIBS"
tribits_deprecated("Passing TESTONLY lib '${depLib}' through DEPLIBS"
" is deprecated! Instead, please pass through TESTONLYLIBS instead!"
" DEPLIBS is deprecated!")
list(APPEND PARSE_TESTONLYLIBS ${depLib})
elseif (TARGET ${prefixedDepLib})
message(WARNING "WARNING: Passing non-TESTONLY lib '${depLib}' through DEPLIBS"
tribits_deprecated("Passing non-TESTONLY lib '${depLib}' through DEPLIBS"
" is deprecated! The library '${depLib}' appears to be a"
" library defined in this CMake project."
" TriBITS takes care of linking against libraries in dependent upstream"
Expand Down
5 changes: 5 additions & 0 deletions tribits/core/package_arch/TribitsAddExecutableAndTest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

include(TribitsAddExecutable)
include(TribitsAddTest)
include(TribitsDeprecatedHelpers)


#
Expand Down Expand Up @@ -207,6 +208,10 @@ function(tribits_add_executable_and_test EXE_NAME)
# C) tribits_add_executable(...)
#

if (PARSE_DEPLIBS)
tribits_deprecated("DEPLIBS argument of tribits_add_executable_and_test() is deprecated.")
endif()

set(CALL_ARGS "")
tribits_fwd_parse_arg(CALL_ARGS SOURCES)
tribits_fwd_parse_arg(CALL_ARGS DEPLIBS) # Deprecated
Expand Down
9 changes: 5 additions & 4 deletions tribits/core/package_arch/TribitsAddLibrary.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ include(PrependGlobalSet)
include(RemoveGlobalDuplicates)
include(TribitsGeneralMacros)
include(TribitsReportInvalidTribitsUsage)
include(TribitsDeprecatedHelpers)
include(SetAndIncDirs)


Expand Down Expand Up @@ -670,7 +671,7 @@ function(tribits_add_library_assert_deplibs)
# dependency on the upstream package that owns this upstream TESTONLY
# library if it comes from an upstream package.
elseif (NOT PARSE_TESTONLY AND depLibIsTestOnlyLib) # any depLibAlreadyInPkgLibs
message(WARNING "WARNING: '${depLib}' in DEPLIBS is a TESTONLY lib"
tribits_deprecated("'${depLib}' in DEPLIBS is a TESTONLY lib"
" and it is illegal to link to this non-TESTONLY library '${LIBRARY_NAME}'."
" Such usage is deprecated (and this warning will soon become an error)!"
" If this is a regular library in this package or in an dependent upstream"
Expand All @@ -680,7 +681,7 @@ function(tribits_add_library_assert_deplibs)
" ${${PACKAGE_NAME}_SOURCE_DIR}/cmake/Dependencies.cmake")
# ToDo: Turn the above to FATAL_ERROR after dropping deprecated code
elseif (NOT depLibAlreadyInPkgLibs AND TARGET ${prefixedDepLib}) # any PARSE_TESTONLY
message(WARNING "WARNING: '${depLib}' in DEPLIBS is not"
tribits_deprecated("'${depLib}' in DEPLIBS is not"
" a lib in this package but is a library defined in the current"
" cmake project! Such usage is deprecated (and"
" will result in a configure error soon). If this is a library in"
Expand All @@ -691,7 +692,7 @@ function(tribits_add_library_assert_deplibs)
" this package's dependencies file"
" ${${PACKAGE_NAME}_SOURCE_DIR}/cmake/Dependencies.cmake.")
elseif (NOT depLibAlreadyInPkgLibs AND NOT TARGET ${prefixedDepLib} )
message(WARNING "WARNING: '${depLib}' in DEPLIBS is not"
tribits_deprecated("'${depLib}' in DEPLIBS is not"
" a lib defined in the current cmake project! Such usage is deprecated (and"
" will result in a configure error soon). If this is an external"
" lib you are trying to link in, it should likely be handled as a TriBITS"
Expand Down Expand Up @@ -725,7 +726,7 @@ function(tribits_add_library_assert_importedlibs)
FOUND_IMPORTEDLIB_IN_LIBRARIES_IDX)
tribits_lib_is_testonly(${prefixedImportedLib} importedLibIsTestOnlyLib)
if (importedLibIsTestOnlyLib)
message(WARNING "WARNING: '${importedLib}' in IMPORTEDLIBS is a TESTONLY lib"
tribits_deprecated("'${importedLib}' in IMPORTEDLIBS is a TESTONLY lib"
" and it is illegal to pass in through IMPORTEDLIBS!"
" Such usage is deprecated (and this warning will soon become an error)!"
" Should '${importedLib}' instead be passed through DEPLIBS?")
Expand Down
6 changes: 3 additions & 3 deletions tribits/core/package_arch/TribitsGeneralMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ include(AssertDefined)
include(MessageWrapper)
include(TribitsParseArgumentsHelpers)
include(TribitsSortListAccordingToMasterList)
include(TribitsDeprecatedHelpers)


# Optionally start CMake code configure timing
Expand Down Expand Up @@ -337,9 +338,8 @@ endfunction()

# For backward compatibility
macro(tribits_set_ss_for_dev_mode OUTPUT_VAR)
message(WARNING
"WARNING: tribits_set_ss_for_dev_mode() is deprecated,"
" use tribits_set_st_for_dev_mode() instead!")
tribits_deprecated_command(tribits_set_ss_for_dev_mode
MESSAGE "Use tribits_set_st_for_dev_mode() instead.")
tribits_set_st_for_dev_mode(${OUTPUT_VAR})
endmacro()

Expand Down
12 changes: 6 additions & 6 deletions tribits/core/package_arch/TribitsIncludeDirectories.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
# @HEADER

include(CMakeParseArguments)
include(TribitsDeprecatedHelpers)


# @MACRO: tribits_include_directories()
Expand Down Expand Up @@ -89,7 +90,11 @@ endmacro()
# Deprecated. Use tribits_include_directories() instead!
macro(include_directories)

cmake_parse_arguments(
tribits_deprecated_command(include_directories
MESSAGE "Use tribits_include_directories() instead."
)

cmake_parse_arguments(
#prefix
PARSE
#options
Expand All @@ -101,11 +106,6 @@ macro(include_directories)
${ARGN}
)

# if (PARSE_REQUIRED_DURING_INSTALLATION_TESTING)
# message(WARNING "Warning: the override include_directories() is deprecated,"
# " use tribits_include_directories() instead!")
# endif()

if(NOT ${PROJECT_NAME}_ENABLE_INSTALLATION_TESTING OR PARSE_REQUIRED_DURING_INSTALLATION_TESTING)
_include_directories(${PARSE_UNPARSED_ARGUMENTS})
endif()
Expand Down
Loading

0 comments on commit 7e68637

Please sign in to comment.