Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLMC
Manage
Activity
Members
Labels
Plan
Issues
26
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLMC
Commits
ad7f0628
Commit
ad7f0628
authored
8 years ago
by
luyikei
Committed by
Hugo Beauzée-Luyssen
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
cmake: Remove "Xml"
Signed-off-by:
Hugo Beauzée-Luyssen
<
hugo@beauzee.fr
>
parent
ce31b7da
No related branches found
Branches containing commit
Tags
0.11.1
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/CMakeLists.txt
+4
-4
4 additions, 4 deletions
src/CMakeLists.txt
with
4 additions
and
4 deletions
src/CMakeLists.txt
+
4
−
4
View file @
ad7f0628
...
...
@@ -12,9 +12,9 @@ find_package(Qt5Core QUIET)
if
(
Qt5Core_FOUND
)
# go on with other packages
if
(
WITH_GUI
)
find_package
(
Qt5 COMPONENTS Widgets Gui
Xml
Network
)
find_package
(
Qt5 COMPONENTS Widgets Gui Network
)
else
()
find_package
(
Qt5 COMPONENTS
Xml
Network
)
find_package
(
Qt5 COMPONENTS Network
)
endif
()
endif
()
...
...
@@ -120,7 +120,7 @@ IF (NOT WITH_GUI)
LIST
(
APPEND VLMC_SRCS Main/main.cpp Renderer/ConsoleRenderer.cpp
)
qt5_add_resources
(
VLMC_RCC_SRCS
${
VLMC_RCC
}
)
ADD_EXECUTABLE
(
vlmc
${
GUI_TYPE
}
${
VLMC_SRCS
}
${
VLMC_MOC_SRCS
}
${
VLMC_RCC_SRCS
}
)
qt5_use_modules
(
vlmc Core
Xml
Network
)
qt5_use_modules
(
vlmc Core Network
)
TARGET_LINK_LIBRARIES
(
vlmc
${
VLMC_LIBS
}
)
#Add GUI stuff if required
...
...
@@ -272,7 +272,7 @@ ELSE(NOT WITH_GUI)
ADD_EXECUTABLE
(
vlmc
${
GUI_TYPE
}
${
VLMC_SRCS
}
${
VLMC_MOC_SRCS
}
${
VLMC_UIS_H
}
${
VLMC_RCC_SRCS
}
${
VLMC_QMS
}
)
TARGET_LINK_LIBRARIES
(
vlmc
${
VLMC_LIBS
}
)
if
(
NOT Qt4_FOUND
)
qt5_use_modules
(
vlmc Core Gui Widgets
Xml
Network
)
qt5_use_modules
(
vlmc Core Gui Widgets Network
)
else
()
# We need to know the target for this one, which is not the case when doing most of the QT4/5 specific stuff.
# We could hide this command in qt_use_modules macro, but this would be some kind of black magic uglyness
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment