diff options
| author | Gerald Combs <gerald@wireshark.org> | 2021-02-16 18:04:59 -0800 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-02-18 06:34:46 +0000 |
| commit | 4fd5224ecf5f5b51d3e4e5036948571649898313 (patch) | |
| tree | 6fb457e3ee5d3e0295fe56712adf4b92763d228f /epan/crypt | |
| parent | 6bffbc9896f7772adc94660564b5cbafead73fc6 (diff) | |
CMake: Use target_include_directores more.
The include_directories documentation at
https://cmake.org/cmake/help/latest/command/include_directories.html
says:
"Note: Prefer the target_include_directories() command to add include
directories to individual targets and optionally propagate/export them
to dependents."
Switch from include_directories to target_include_directories in a bunch
of places.
Add "SYSTEM" to the remaining external include_directories calls in
order to minimize our compiler warning blast radius.
Diffstat (limited to 'epan/crypt')
| -rw-r--r-- | epan/crypt/CMakeLists.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/crypt/CMakeLists.txt b/epan/crypt/CMakeLists.txt index 23e36a89f8..d9dcb93aba 100644 --- a/epan/crypt/CMakeLists.txt +++ b/epan/crypt/CMakeLists.txt @@ -9,12 +9,6 @@ ADD_CUSTOM_CMAKE_INCLUDE() - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} -) - set(CRYPT_HEADER_FILES dot11decrypt_debug.h dot11decrypt_int.h @@ -63,6 +57,9 @@ add_library(crypt OBJECT target_include_directories(crypt SYSTEM PRIVATE ${GCRYPT_INCLUDE_DIRS} + PRIVATE + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} ) set_target_properties(crypt PROPERTIES |