diff --git a/CMakeLists.txt b/CMakeLists.txt
index 788428750e9a81dec14141b587d2479633eec60d..2238bcbb31a51c2c7994874d7071aec25f15266a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,7 +77,8 @@ enable_language(CXX)
 
 # installer
 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_GENERATOR "DEB")
 set(CPACK_SOURCE_GENERATOR "TGZ")
@@ -124,7 +125,7 @@ if (UNIX)
 endif(UNIX)
 find_package(OpenGL REQUIRED)
 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)
 else()
     set(OPENSCENEGRAPH_FOUND TRUE)