DolphinQt2/CMakeLists: Use the target_* equivalents of add_definitions and include_directories

add_definitions and include_directories don't operate on a by-target basis, they act on a
by-directory basis (i.e. if we defined two targets, A and B, in this CMakeLists file, add_definitions
would add the definitions to the COMPILE_DEFINITIONS directory property which both A and B would
implicitly use).

The same idea applies to include_directories, only it appends to the INCLUDE_DIRECTORIES directory
property.

Instead, specify these on the target to keep scope as narrow as possible.
This commit is contained in:
Lioncash 2018-04-05 07:52:21 -04:00
parent d0b7c013a1
commit 9c27c7eda8
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
1 changed files with 13 additions and 5 deletions

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