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
37b0e008
Commit
37b0e008
authored
8 years ago
by
Hugo Beauzée-Luyssen
Browse files
Options
Downloads
Patches
Plain Diff
cmake: Move Qt stuff to src/CMakeLists.txt
parent
36d5e3e9
No related branches found
Branches containing commit
Tags
3.2.0-b3
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+0
-14
0 additions, 14 deletions
CMakeLists.txt
src/CMakeLists.txt
+15
-0
15 additions, 0 deletions
src/CMakeLists.txt
with
15 additions
and
14 deletions
CMakeLists.txt
+
0
−
14
View file @
37b0e008
...
...
@@ -106,20 +106,6 @@ endif()
INCLUDE_DIRECTORIES
(
${
FREI0R_INCLUDE_DIR
}
)
# Manually set Qt5 path for OSX installed using brew
SET
(
CMAKE_PREFIX_PATH
"/usr/local/opt/qt5"
)
# search for Qt5
find_package
(
Qt5Core QUIET
)
if
(
Qt5Core_FOUND
)
# go on with other packages
if
(
WITH_GUI
)
find_package
(
Qt5 COMPONENTS Widgets Gui Xml Network
)
else
()
find_packages
(
Qt5 COMPONENTS Xml Network
)
endif
()
endif
()
# layout of VLMC installation
# (default values are platform-specific)
SET
(
CMAKE_RUNTIME_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
/bin
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
15
−
0
View file @
37b0e008
...
...
@@ -6,6 +6,21 @@
#check if version will support target_compile_features command
#to ensure we can use some C++11 featrues
cmake_minimum_required
(
VERSION 3.1
)
# Manually set Qt5 path for OSX installed using brew
SET
(
CMAKE_PREFIX_PATH
"/usr/local/opt/qt5"
)
# search for Qt5
find_package
(
Qt5Core QUIET
)
if
(
Qt5Core_FOUND
)
# go on with other packages
if
(
WITH_GUI
)
find_package
(
Qt5 COMPONENTS Widgets Gui Xml Network
)
else
()
find_packages
(
Qt5 COMPONENTS Xml Network
)
endif
()
endif
()
SET
(
VLMC_SRCS
Commands/Commands.cpp
Backend/IBackend.h
...
...
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