diff options
author | Brad King <brad.king@kitware.com> | 2018-10-17 17:22:43 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-10-17 17:22:49 (GMT) |
commit | b82b8705b2af4a7e3413de8aef6b3eb6371f08c4 (patch) | |
tree | 84cff4f6437365705aca7505bfa0748a4a163197 | |
parent | 275290375dbacc090962285da39e73687b44464f (diff) | |
parent | 0c20d4d67b1f5da52da283f4237fb85a29385acd (diff) | |
download | CMake-b82b8705b2af4a7e3413de8aef6b3eb6371f08c4.zip CMake-b82b8705b2af4a7e3413de8aef6b3eb6371f08c4.tar.gz CMake-b82b8705b2af4a7e3413de8aef6b3eb6371f08c4.tar.bz2 |
Merge topic 'FindLibinput-compile-options'
0c20d4d67b FindLibinput: Use _COMPILE_OPTIONS instead of _DEFINITIONS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2490
-rw-r--r-- | Modules/FindLibinput.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindLibinput.cmake b/Modules/FindLibinput.cmake index df66cff..1057c91 100644 --- a/Modules/FindLibinput.cmake +++ b/Modules/FindLibinput.cmake @@ -26,7 +26,7 @@ This will define the following variables in your project: the libraries to link against to use libinput. ``Libinput_INCLUDE_DIRS`` where to find the libinput headers. -``Libinput_DEFINITIONS`` +``Libinput_COMPILE_OPTIONS`` this should be passed to target_compile_options(), if the target is not used for linking @@ -38,7 +38,7 @@ This will define the following variables in your project: find_package(PkgConfig QUIET) pkg_check_modules(PKG_Libinput QUIET libinput) -set(Libinput_DEFINITIONS ${PKG_Libinput_CFLAGS_OTHER}) +set(Libinput_COMPILE_OPTIONS ${PKG_Libinput_CFLAGS_OTHER}) set(Libinput_VERSION ${PKG_Libinput_VERSION}) find_path(Libinput_INCLUDE_DIR @@ -69,7 +69,7 @@ if(Libinput_FOUND AND NOT TARGET Libinput::Libinput) add_library(Libinput::Libinput UNKNOWN IMPORTED) set_target_properties(Libinput::Libinput PROPERTIES IMPORTED_LOCATION "${Libinput_LIBRARY}" - INTERFACE_COMPILE_OPTIONS "${Libinput_DEFINITIONS}" + INTERFACE_COMPILE_OPTIONS "${Libinput_COMPILE_OPTIONS}" INTERFACE_INCLUDE_DIRECTORIES "${Libinput_INCLUDE_DIR}" ) endif() |