Skip to content

Q
qgroundcontrol
Commit 61c9879b authored by James Goppert's avatar James Goppert
Browse files
Options

Changed package name not to conflict with debian package.

parent f2ec2953
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
CMakeLists.txt
View file @ 61c9879b
...@@ -77,7 +77,8 @@ enable_language(CXX) ...@@ -77,7 +77,8 @@ enable_language(CXX)
# installer # installer
include(InstallRequiredSystemLibraries) include(InstallRequiredSystemLibraries)
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${qgroundcontrol_VERSION}") set(CPACK_PACKAGE_NAME "${PROJECT_NAME}-${qgroundcontrol_VERSION}-cpack")
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${qgroundcontrol_VERSION}-cpack")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${qgroundcontrol_VERSION}") set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${qgroundcontrol_VERSION}")
set(CPACK_GENERATOR "DEB") set(CPACK_GENERATOR "DEB")
set(CPACK_SOURCE_GENERATOR "TGZ") set(CPACK_SOURCE_GENERATOR "TGZ")
...@@ -124,7 +125,7 @@ if (UNIX) ...@@ -124,7 +125,7 @@ if (UNIX)
endif(UNIX) endif(UNIX)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(OpenSceneGraph 2.9.9 COMPONENTS osgGA osgDB osgUtil osgViewer) find_package(OpenSceneGraph 2.9.9 COMPONENTS osgGA osgDB osgUtil osgViewer)
if ("OSG_LIBRARY" STREQUAL "${OSG_LIBRARY}") if ("OSG_LIBRARY-NOTFOUND" STREQUAL "${OSG_LIBRARY}")
set(OPENSCENEGRAPH_FOUND FALSE) set(OPENSCENEGRAPH_FOUND FALSE)
else() else()
set(OPENSCENEGRAPH_FOUND TRUE) set(OPENSCENEGRAPH_FOUND TRUE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment