From 61c9879bcc4d445de62bdaceac91b607b522b7c7 Mon Sep 17 00:00:00 2001 From: James Goppert Date: Thu, 3 Mar 2011 20:48:43 -0500 Subject: [PATCH] Changed package name not to conflict with debian package. --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 788428750..2238bcbb3 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) -- 2.22.0