ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6598 from lioncash/target 

DolphinQt2/CMakeLists: Use the target_* equivalents of add_definitions and include_directories
This commit is contained in:
Léo Lam 2018-04-05 17:53:24 +02:00 committed by GitHub
parent 4cd5ef76ad 9c27c7eda8
commit a3bdb5d85e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/DolphinQt2/CMakeLists.txt
View File

@ -3,11 +3,6 @@ find_package(Qt5 REQUIRED COMPONENTS Gui Widgets)
set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES "") set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES "")
message(STATUS "Found Qt version ${Qt5Core_VERSION}") message(STATUS "Found Qt version ${Qt5Core_VERSION}")
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
add_definitions(-DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
add_executable(dolphin-emu-qt2 add_executable(dolphin-emu-qt2
@ -118,6 +113,19 @@ add_executable(dolphin-emu-qt2
Updater.cpp Updater.cpp
) )
target_compile_definitions(dolphin-emu-qt2
PRIVATE
-DQT_USE_QSTRINGBUILDER
-DQT_NO_CAST_FROM_ASCII
-DQT_NO_CAST_TO_ASCII
)
target_include_directories(dolphin-emu-qt2
PRIVATE
${CMAKE_CURRENT_BINARY_DIR}
${Qt5Gui_PRIVATE_INCLUDE_DIRS}
)
target_link_libraries(dolphin-emu-qt2 target_link_libraries(dolphin-emu-qt2
PRIVATE PRIVATE
core core