Skip to content

Commit

Permalink
HYDRA-843 : Attempt to revert QT_NO_KEYWORDS to be on each target
Browse files Browse the repository at this point in the history
  • Loading branch information
debloip-adsk committed Mar 4, 2024
1 parent 2dcf9ab commit 9254150
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
3 changes: 0 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,6 @@ if(MAYA_APP_VERSION VERSION_GREATER 2024)
set(WANT_QT_VERSION 6.5)
find_package(Qt6 ${WANT_QT_VERSION} COMPONENTS Core Widgets QUIET)
if (Qt6_FOUND)
# QT_NO_KEYWORDS prevents Qt from defining the foreach, signals, slots and emit macros.
# This avoids overlap between Qt macros and boost, and enforces using Q_ macros.
set_target_properties(Qt6::Core PROPERTIES INTERFACE_COMPILE_DEFINITIONS QT_NO_KEYWORDS)
if (CODE_COVERAGE)
set(BUILD_HDSB_PLUGIN FALSE)
message(STATUS "Code coverage enabled, Hydra Scene Browser will not be built.")
Expand Down
4 changes: 4 additions & 0 deletions lib/adskHydraSceneBrowser/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ target_include_directories(${TARGET_NAME}
# -----------------------------------------------------------------------------
# compiler configuration
# -----------------------------------------------------------------------------
# QT_NO_KEYWORDS prevents Qt from defining the foreach, signals, slots and emit macros.
# this avoids overlap between Qt macros and boost, and enforces using Q_ macros.
set_target_properties(Qt6::Core PROPERTIES INTERFACE_COMPILE_DEFINITIONS QT_NO_KEYWORDS)

target_compile_definitions(${TARGET_NAME}
PRIVATE
HDUI_EXPORT
Expand Down
4 changes: 4 additions & 0 deletions test/lib/mayaUsd/render/mayaToHydra/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ target_sources(${TARGET_NAME}
# -----------------------------------------------------------------------------
# compiler configuration
# -----------------------------------------------------------------------------
# QT_NO_KEYWORDS prevents Qt from defining the foreach, signals, slots and emit macros.
# this avoids overlap between Qt macros and boost, and enforces using Q_ macros.
set_target_properties(Qt6::Core PROPERTIES INTERFACE_COMPILE_DEFINITIONS QT_NO_KEYWORDS)

mayaHydra_compile_config(${TARGET_NAME})

target_compile_definitions(${TARGET_NAME}
Expand Down

0 comments on commit 9254150

Please sign in to comment.