Commit ec2f7ad6 authored by James Goppert's avatar James Goppert

Cmake bug fix.

parent 2d8d4a65
...@@ -78,8 +78,9 @@ enable_language(CXX) ...@@ -78,8 +78,9 @@ enable_language(CXX)
# installer # installer
include(InstallRequiredSystemLibraries) include(InstallRequiredSystemLibraries)
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${qgroundcontrol_VERSION}") set(CPACK_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;ZIP") set(CPACK_SOURCE_GENERATOR "TGZ")
set(CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") set(CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
set(CPACK_SET_DESTDIR TRUE) set(CPACK_SET_DESTDIR TRUE)
set(CPACK_PACKAGE_CONTACT "James Goppert james.goppert@gmail.com") set(CPACK_PACKAGE_CONTACT "James Goppert james.goppert@gmail.com")
...@@ -89,7 +90,8 @@ set(CPACK_PACKAGE_DESCRITION_SUMMARY " ...@@ -89,7 +90,8 @@ set(CPACK_PACKAGE_DESCRITION_SUMMARY "
A qt based ground-control program for unmanned systems. A qt based ground-control program for unmanned systems.
") ")
set(CPACK_SOURCE_IGNORE_FILES ${CPACK_SOURCE_IGNORE_FILES} set(CPACK_SOURCE_IGNORE_FILES ${CPACK_SOURCE_IGNORE_FILES}
/.git/;/build/;~$;.*\\\\.bin$;.*\\\\.swp$) "/.git/";"/build/";"~$";".*\\\\.bin$";".*\\\\.swp$"
)
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/license.txt") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/license.txt")
set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README") set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README")
set(CPACK_PACKAGE_VERSION_MAJOR ${qgroundcontrol_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MAJOR ${qgroundcontrol_VERSION_MAJOR})
...@@ -196,11 +198,6 @@ else() ...@@ -196,11 +198,6 @@ else()
message(STATUS "\t\tMAVLINK\tNO") message(STATUS "\t\tMAVLINK\tNO")
endif () endif ()
# fix for osg found bug
if (NOT ${OSG_LIBRARY} STREQUAL "OSG_LIBRARY-NOTFOUND")
set(OPENSCENEGRAPH_FOUND FALSE)
endif()
if (OPENSCENEGRAPH_FOUND) if (OPENSCENEGRAPH_FOUND)
message(STATUS "\t\tOpenSceneGraph\tNO") message(STATUS "\t\tOpenSceneGraph\tNO")
else() else()
......
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