Skip to content

Commit d531e78

Browse files
authored
Don't use QML flag before definition
1 parent 140c7bf commit d531e78

1 file changed

Lines changed: 21 additions & 20 deletions

File tree

CMakeLists.txt

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1976,26 +1976,6 @@ set(
19761976
src/util/workerthreadscheduler.h
19771977
src/util/xml.h
19781978
)
1979-
if(NOT QML)
1980-
target_sources(
1981-
mixxx-lib
1982-
PRIVATE
1983-
# The following sources need to be in the QML target in order to get QML_ELEMENT properly interpreted.
1984-
# However, if we build Mixxx without QML support, these are still required, so it gets appended to the
1985-
# main target
1986-
src/control/controlmodel.cpp
1987-
src/control/controlsortfiltermodel.cpp
1988-
)
1989-
else()
1990-
target_sources(
1991-
mixxx-lib
1992-
PRIVATE
1993-
# The following source depends of QML being available but aren't part of the new QML UI
1994-
src/controllers/rendering/controllerrenderingengine.cpp
1995-
src/controllers/controllerenginethreadcontrol.cpp
1996-
src/controllers/controllerscreenpreview.cpp
1997-
)
1998-
endif()
19991979
if(QOPENGL)
20001980
target_sources(
20011981
mixxx-lib
@@ -2469,6 +2449,27 @@ else()
24692449
add_executable(mixxx WIN32 src/main.cpp)
24702450
endif()
24712451

2452+
if(NOT QML)
2453+
target_sources(
2454+
mixxx-lib
2455+
PRIVATE
2456+
# The following sources need to be in the QML target in order to get QML_ELEMENT properly interpreted.
2457+
# However, if we build Mixxx without QML support, these are still required, so it gets appended to the
2458+
# main target
2459+
src/control/controlmodel.cpp
2460+
src/control/controlsortfiltermodel.cpp
2461+
)
2462+
else()
2463+
target_sources(
2464+
mixxx-lib
2465+
PRIVATE
2466+
# The following source depends of QML being available but aren't part of the new QML UI
2467+
src/controllers/rendering/controllerrenderingengine.cpp
2468+
src/controllers/controllerenginethreadcontrol.cpp
2469+
src/controllers/controllerscreenpreview.cpp
2470+
)
2471+
endif()
2472+
24722473
set_target_properties(mixxx-lib PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY}")
24732474
target_link_libraries(mixxx PRIVATE mixxx-lib mixxx-gitinfostore)
24742475

0 commit comments

Comments
 (0)