diff options
| author | 2017-05-29 15:12:21 -0700 | |
|---|---|---|
| committer | 2017-05-29 15:12:21 -0700 | |
| commit | a4f88c7d7c94107df6bfada31617ff553bb5e89e (patch) | |
| tree | cb0d3adbbe115604051300ae451a22a4de751b27 /src/input_common | |
| parent | Merge pull request #2729 from yuriks/quaternion-fix (diff) | |
| parent | CMake: Re-organize root CMakeLists.txt file (diff) | |
| download | yuzu-a4f88c7d7c94107df6bfada31617ff553bb5e89e.tar.gz yuzu-a4f88c7d7c94107df6bfada31617ff553bb5e89e.tar.xz yuzu-a4f88c7d7c94107df6bfada31617ff553bb5e89e.zip | |
Merge pull request #2734 from yuriks/cmake-imported-libs
CMake: Use CMake target properties for all libraries
Diffstat (limited to 'src/input_common')
| -rw-r--r-- | src/input_common/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt index 5b306e42e..e3e36ada7 100644 --- a/src/input_common/CMakeLists.txt +++ b/src/input_common/CMakeLists.txt | |||
| @@ -13,7 +13,6 @@ set(HEADERS | |||
| 13 | if(SDL2_FOUND) | 13 | if(SDL2_FOUND) |
| 14 | set(SRCS ${SRCS} sdl/sdl.cpp) | 14 | set(SRCS ${SRCS} sdl/sdl.cpp) |
| 15 | set(HEADERS ${HEADERS} sdl/sdl.h) | 15 | set(HEADERS ${HEADERS} sdl/sdl.h) |
| 16 | include_directories(${SDL2_INCLUDE_DIR}) | ||
| 17 | endif() | 16 | endif() |
| 18 | 17 | ||
| 19 | create_directory_groups(${SRCS} ${HEADERS}) | 18 | create_directory_groups(${SRCS} ${HEADERS}) |
| @@ -22,6 +21,6 @@ add_library(input_common STATIC ${SRCS} ${HEADERS}) | |||
| 22 | target_link_libraries(input_common PUBLIC core PRIVATE common) | 21 | target_link_libraries(input_common PUBLIC core PRIVATE common) |
| 23 | 22 | ||
| 24 | if(SDL2_FOUND) | 23 | if(SDL2_FOUND) |
| 25 | target_link_libraries(input_common PRIVATE ${SDL2_LIBRARY}) | 24 | target_link_libraries(input_common PRIVATE SDL2) |
| 26 | target_compile_definitions(input_common PRIVATE HAVE_SDL2) | 25 | target_compile_definitions(input_common PRIVATE HAVE_SDL2) |
| 27 | endif() | 26 | endif() |