diff --git a/CMakeLists.txt b/CMakeLists.txt index 51c69f5..3c97ff9 100644 --- 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 ") +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) \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bfb51a5..0bbf5db 100644 --- 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 index 00640e2..8429159 100644 --- 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 . \ No newline at end of file +CMD cmake /PlanetaryImager -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release && make -j4 && make package && cp -av PlanetaryImager* /PlanetaryImager-dist \ No newline at end of file