Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
3530275e
Commit
3530275e
authored
Feb 21, 2011
by
James Goppert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed resource problem with cmake.
parent
e7d30da7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
CMakeLists.txt
CMakeLists.txt
+4
-2
FindPhonon.cmake
CMakeModules/FindPhonon.cmake
+2
-2
No files found.
CMakeLists.txt
View file @
3530275e
...
...
@@ -56,7 +56,7 @@ set(CMAKE_LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
# only find static libraries
if
(
STATIC_LINKING
)
message
(
WARNING
"static linking is not yet
fully functional and will
have linking errors"
)
message
(
WARNING
"static linking is not yet
tested and may
have linking errors"
)
if
(
WIN32
)
set
(
CMAKE_FIND_LIBRARY_SUFFIXES .lib .a
${
CMAKE_FIND_LIBRARY_SUFFIXES
}
)
else
(
WIN32
)
...
...
@@ -186,7 +186,6 @@ if (PHONON_FOUND)
else
()
message
(
STATUS
"
\t\t
PHONON
\t\t
NO"
)
endif
(
PHONON_FOUND
)
message
(
${
PHONON_INCLUDE_DIR
}
)
message
(
STATUS
"======================================="
)
# project flags
...
...
@@ -520,6 +519,9 @@ set (qgroundcontrolSrc
src/ui/watchdog/WatchdogView.cc
)
# qgroundcontrol resource files
set
(
qgroundcontrolRscSrc mavground.qrc
)
# qgroundcontrol linking
qt4_wrap_cpp
(
qgroundcontrolMoc
${
qgroundcontrolMocSrc
}
)
qt4_wrap_ui
(
qgroundcontrolUi
${
qgroundcontrolUiSrc
}
)
...
...
CMakeModules/FindPhonon.cmake
View file @
3530275e
...
...
@@ -31,11 +31,11 @@ else(PHONON_FOUND)
endif
(
PHONON_INCLUDE_DIR AND PHONON_LIBRARY
)
# As discussed on kde-buildsystem: first look at CMAKE_PREFIX_PATH, then at the suggested PATHS (kde4 install dir)
find_library
(
PHONON_LIBRARY NAMES phonon phonon4 PATHS
${
KDE4_LIB_INSTALL_DIR
}
${
QT_LIBRARY_DIR
}
NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
)
find_library
(
PHONON_LIBRARY NAMES phonon phonon4 PATHS
/usr/lib
${
KDE4_LIB_INSTALL_DIR
}
${
QT_LIBRARY_DIR
}
)
# then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.)
find_library
(
PHONON_LIBRARY NAMES phonon phonon4
)
find_path
(
PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS
${
KDE4_INCLUDE_INSTALL_DIR
}
${
QT_INCLUDE_DIR
}
${
INCLUDE_INSTALL_DIR
}
${
QT_LIBRARY_DIR
}
NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
)
find_path
(
PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS
/usr/include
${
KDE4_INCLUDE_INSTALL_DIR
}
${
QT_INCLUDE_DIR
}
${
INCLUDE_INSTALL_DIR
}
${
QT_LIBRARY_DIR
}
)
find_path
(
PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h
)
if
(
PHONON_INCLUDE_DIR AND PHONON_LIBRARY
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment