Going on with packaging with dependencies on libgrantlee5-dev and librdata.

CMakeLists.txt

@@ -12,6 +12,12 @@ set(XTPCPP_VERSION_PATCH "25")
 set(VERSION 0.4.25)
 set(XTPCPP_VERSION "${XTPCPP_VERSION_MAJOR}.${XTPCPP_VERSION_MINOR}.${XTPCPP_VERSION_PATCH}")
 
+# Set additional project information
+set(COMPANY "pappso.org")
+set(COPYRIGHT "Copyright (c) 2021 pappso. Licensed under GPLv3+")
+set(IDENTIFIER "org.pappso")
+
+
 #depending on libpappsomspp version :
 set(LIBPAPPSOMSPP_VERSION "0.8.19")
 

CMakeStuff/toolchains/apple-macport-toolchain.cmake

@@ -6,6 +6,15 @@ message("cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Debug ../development")
 set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "/opt/local/include")
 set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "/opt/local/lib")
 
+# This is used throughout all the build system files
+set(TARGET Xtp++)
+
+# Now that we know what is the TARGET (in the toolchain files above,
+# we can compute the lowercase TARGET (used for string replacements in 
+# configure files and also for the resource compilation with windres.exe.
+string(TOLOWER ${TARGET} TARGET_LOWERCASE)
+message("TARGET_LOWERCASE: ${TARGET_LOWERCASE}")
+
 
 set(HOME_DEVEL_DIR "/Users/rusconi/devel")
 
@@ -16,6 +25,38 @@ set(CMAKE_MACOSX_RPATH 1)
 
 add_definitions("-I/usr/include -I/usr/local/include")
 
+### Define the MacOSX application bundle
+
+# Copy the icon file to the Contents/Resources directory of the bundle at
+# location ${MACOSX_PACKAGE_LOCATION}.
+set_source_files_properties(${CMAKE_SOURCE_DIR}/src/resources/xtandempipeline_icon.icns 
+  PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+
+set(MACOSX_BUNDLE_BUNDLE_NAME ${TARGET}.app)
+message(STATUS "MACOSX_BUNDLE_BUNDLE_NAME: ${MACOSX_BUNDLE_BUNDLE_NAME}")
+
+# The bundle directory will be in the binary directory matching the
+# src directory of the main source tree.
+set(BUNDLE_DIR ${CMAKE_BINARY_DIR}/src/${MACOSX_BUNDLE_BUNDLE_NAME})
+message("BUNDLE_DIR: ${BUNDLE_DIR}")
+
+## INSTALL directories
+# Install the files in the bundle.
+set(CMAKE_INSTALL_PREFIX "${BUNDLE_DIR}/Contents")
+message("CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
+
+set(BIN_DIR ${BUNDLE_DIR}/Contents/MacOS)
+set(DOC_DIR ${BUNDLE_DIR}/Contents/doc)
+
+set(MACOSX_BUNDLE_BUNDLE_EXECUTABLE_NAME ${TARGET})
+set(MACOSX_BUNDLE_COPYRIGHT ${COPYRIGHT})
+set(MACOSX_BUNDLE_ICON_FILE ../../src/resources/xtandempipeline_icon.icns)
+set(MACOSX_BUNDLE_GUI_IDENTIFIER ${IDENTIFIER})
+set(MACOSX_BUNDLE_LONG_VERSION_STRING ${VERSION})
+set(MACOSX_BUNDLE_BUNDLE_NAME ${TARGET})
+set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${VERSION})
+set(MACOSX_BUNDLE_BUNDLE_VERSION ${VERSION})
+
 
 set(QCustomPlot_FOUND 1)
 set(QCustomPlot_INCLUDE_DIRS "${HOME_DEVEL_DIR}/qcustomplot/development")

debian/changelog

 xtpcpp (0.4.26-1) unstable; urgency=low
 
-  * New upstream version.
+  * New upstream version now depending on librdata and libgrantlee5.
 
   * Standards-Version: 4.5.1 (no change done).
 

debian/control

@@ -7,15 +7,16 @@ Build-Depends: debhelper-compat (= 12),
  dpkg-dev (>= 1.18.25),
  cmake (>= 3.12),
  qtbase5-dev,
- libpappsomspp-dev (>= 0.8.19),
- libpappsomspp-widget-dev (>= 0.8.19),
+ libpappsomspp-dev (>= 0.8.17),
+ libpappsomspp-widget-dev (>= 0.8.17),
  libodsstream-dev,
  libqt5svg5-dev,
  libqcustomplot-dev,
+ librdata(>=0~20201223+git-f80cea08-1),
  libgrantlee5-dev,
  docbook-to-man,
  doxygen
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Homepage: http://pappso.inra.fr/bioinfo
 
 Package: xtpcpp

src/CMakeLists.txt

@@ -19,16 +19,16 @@ find_package(ZLIB REQUIRED)
 
 
 if(QCustomPlot_FOUND)
-    MESSAGE("QCustomPlot_INCLUDES found ${QCustomPlot_INCLUDE_DIRS}")
+    message("QCustomPlot_INCLUDES found ${QCustomPlot_INCLUDE_DIRS}")
 else(QCustomPlot_FOUND)
-    FIND_PACKAGE( QCustomPlot REQUIRED )
+    find_package( QCustomPlot REQUIRED )
 endif(QCustomPlot_FOUND)
 
 
 if(RData_FOUND)
-    MESSAGE("RData_INCLUDES found ${RData_INCLUDES}")
+    message("RData_INCLUDES found ${RData_INCLUDES}")
 else(RData_FOUND)
-    FIND_PACKAGE(RData REQUIRED)
+    find_package(RData REQUIRED)
 endif(RData_FOUND)
 
 if(Grantlee5_FOUND)