Latest fixes for 0.3.0

GuLinux · Aug 25, 2015 · cbd0b11 · cbd0b11
1 parent df64e9d
commit cbd0b11
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,3 +30,17 @@ add_subdirectory(src)
 add_subdirectory(tests)
 add_subdirectory(files)
 add_subdirectory(support)
+
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GuLinux.net Planetary Imager for Linux")
+SET(CPACK_PACKAGE_VENDOR "GuLinux <marco@gulinux.net>")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
+#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/src/")
+SET(CPACK_PACKAGE_VERSION_MAJOR "${MAJOR_VERSION}")
+SET(CPACK_PACKAGE_VERSION_MINOR "${MINOR_VERSION}")
+SET(CPACK_PACKAGE_VERSION_PATCH "${PATCH_VERSION}")
+SET(CPACK_PACKAGE_CONTACT "marco@gulinux.net")
+#SET(CPACK_STRIP_FILES "bin/planetary_imager")
+SET(CPACK_GENERATOR DEB)
+SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libusb (>= 1.0-0), libqt5gui5 (>= 5.4.0), libqt5multimedia5 (>= 5.4.0), libqt5network5 (>= 5.4.0), libqt5widgets5 (>= 5.4.0)")
+
+INCLUDE(CPack)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -33,7 +33,7 @@ else(CMAKE_SIZEOF_VOID_P MATCHES "8")
 endif(CMAKE_SIZEOF_VOID_P MATCHES "8")
 
 
-target_link_libraries(planetary_imager qhy_driver ${QHY_LIBRARY} qmultimedia_driver Qt5::Widgets Qt5::Multimedia ${Boost_LIBRARIES} ${MAGICK_LIBRARIES} )
+target_link_libraries(planetary_imager qhy_driver ${QHY_LIBRARY} qmultimedia_driver Qt5::Widgets Qt5::Multimedia ${Boost_LIBRARIES} )
 
 install(TARGETS planetary_imager RUNTIME DESTINATION bin)
 
diff --git a/support/Ubuntu-15.04/Dockerfile b/support/Ubuntu-15.04/Dockerfile
@@ -14,4 +14,4 @@ VOLUME "/PlanetaryImager-dist"
 WORKDIR /PlanetaryImager-build
 RUN rm -rf /qtmultimedia*
 
-CMD cmake /PlanetaryImager -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release && make -j4 && make install DESTDIR=/PlanetaryImager-install && cd /PlanetaryImager-install && tar czf /PlanetaryImager-dist/PlanetaryImager.tar.gz .
+CMD cmake /PlanetaryImager -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release && make -j4 && make package && cp -av PlanetaryImager* /PlanetaryImager-dist