Commit 37ea1a69 authored by Rusconi Filippo's avatar Rusconi Filippo
Browse files

New upstream version 0.4.43

parent d916ef12
......@@ -4,3 +4,11 @@ maintainer-scripts/__pycache__/
Session.vim
compile_commands.json
.ycm_extra_conf.py
build/*
.kdev4/xtpcpp.kdev4
win64/thomas.cmake
win64/xtpcpp-mingw64-win7+.iss
win64/xtpcpp-mxe.iss
xtpcpp.kdev4
src/config.h
.vscode/*
\ No newline at end of file
......@@ -8,9 +8,9 @@ PROJECT(xtpcpp CXX)
set(XTPCPP_VERSION_MAJOR "0")
set(XTPCPP_VERSION_MINOR "4")
set(XTPCPP_VERSION_PATCH "26")
set(VERSION 0.4.26)
set(XTPCPP_VERSION_PATCH "43")
set(XTPCPP_VERSION "${XTPCPP_VERSION_MAJOR}.${XTPCPP_VERSION_MINOR}.${XTPCPP_VERSION_PATCH}")
set(VERSION 0.4.43)
# Set additional project information
set(COMPANY "pappso.org")
......@@ -19,7 +19,7 @@ set(IDENTIFIER "org.pappso")
#depending on libpappsomspp version :
set(LIBPAPPSOMSPP_VERSION "0.8.19")
set(LIBPAPPSOMSPP_VERSION "0.8.37")
set(LIBRDATA_VERSION "0~20210223+git-85757dc6")
# Add folder where are supportive functions
......@@ -61,8 +61,8 @@ message(STATUS "${BoldGreen}Setting definition -Wextra.${ColourReset}")
add_definitions(-Wextra)
if(WARN_AS_ERROR)
message(STATUS "${BoldYellow}Setting definition -Werror.${ColourReset}")
add_definitions(-Werror)
message(STATUS "${BoldYellow}Setting definition -Werror.${ColourReset}")
add_definitions(-Werror)
endif()
message(STATUS "${BoldRed}CMAKE_SOURCE_DIR: ${CMAKE_SOURCE_DIR}${ColourReset}")
......@@ -72,34 +72,34 @@ message(STATUS "${BoldRed}CMAKE_SOURCE_DIR: ${CMAKE_SOURCE_DIR}${ColourReset}")
#############################################################
# Platform-specific CMake configuration
if(MXE)
# Run the following cmake command line:
# x86_64-w64-mingw32.shared-cmake -DCMAKE_BUILD_TYPE=Release -DMXE=1 ../development
#include(${CMAKE_TOOLCHAINS_PATH}/mxe-toolchain.cmake)
include(${CMAKE_TOOLCHAINS_PATH}/mxe-toolchain-olivier.cmake)
# Run the following cmake command line:
# x86_64-w64-mingw32.shared-cmake -DCMAKE_BUILD_TYPE=Release -DMXE=1 ../development
#include(${CMAKE_TOOLCHAINS_PATH}/mxe-toolchain.cmake)
include(${CMAKE_TOOLCHAINS_PATH}/mxe-toolchain-olivier.cmake)
# Set the name to the systemUname variable because in this situation that name
# is not found, it it passed as a flag in the command line.
set(systemUname "mxe")
# Set the name to the systemUname variable because in this situation that name
# is not found, it it passed as a flag in the command line.
set(systemUname "mxe")
elseif(UNIX AND NOT APPLE)
# Run the following cmake command line:
# cmake -DBUILD_USER_MANUAL=1 -DCMAKE_BUILD_TYPE=Debug
# Run the following cmake command line:
# cmake -DBUILD_USER_MANUAL=1 -DCMAKE_BUILD_TYPE=Debug
include(${CMAKE_TOOLCHAINS_PATH}/unix-toolchain.cmake)
#include(${CMAKE_TOOLCHAINS_PATH}/unix-toolchain-olivier.cmake)
#include(${CMAKE_TOOLCHAINS_PATH}/unix-toolchain-pappsomsppdev.cmake)
include(${CMAKE_TOOLCHAINS_PATH}/unix-toolchain.cmake)
#include(${CMAKE_TOOLCHAINS_PATH}/unix-toolchain-olivier.cmake)
#include(${CMAKE_TOOLCHAINS_PATH}/unix-toolchain-pappsomsppdev.cmake)
elseif(WIN64)
# Run the following cmake command line:
# cmake -DBUILD_USER_MANUAL=0 -DCMAKE_BUILD_TYPE=Release ../development
# Run the following cmake command line:
# cmake -DBUILD_USER_MANUAL=0 -DCMAKE_BUILD_TYPE=Release ../development
include(${CMAKE_TOOLCHAINS_PATH}/win10-mingw64-toolchain.cmake)
include(${CMAKE_TOOLCHAINS_PATH}/win10-mingw64-toolchain.cmake)
elseif(APPLE)
# Run the following cmake command line:
# cmake -DBUILD_USER_MANUAL=0 -DCMAKE_BUILD_TYPE=Release ../development
# Run the following cmake command line:
# cmake -DBUILD_USER_MANUAL=0 -DCMAKE_BUILD_TYPE=Release ../development
include(${CMAKE_TOOLCHAINS_PATH}/apple-macport-toolchain.cmake)
include(${CMAKE_TOOLCHAINS_PATH}/apple-macport-toolchain.cmake)
endif()
......@@ -120,24 +120,24 @@ message(STATUS "CMAKE_CURRENT_BINARY_DIR: " ${CMAKE_CURRENT_BINARY_DIR})
# set(MAKE_TEST 1)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release CACHE STRING
"Type of build, options are: None, Debug, Release, RelWithDebInfo, MinSizeRel."
FORCE)
set(CMAKE_BUILD_TYPE Release CACHE STRING
"Type of build, options are: None, Debug, Release, RelWithDebInfo, MinSizeRel."
FORCE)
endif(NOT CMAKE_BUILD_TYPE)
if(CMAKE_BUILD_TYPE MATCHES "Release")
message(STATUS "Compiling in release mode.")
add_definitions("-DQT_NO_DEBUG_OUTPUT")
message(STATUS "Compiling in release mode.")
add_definitions("-DQT_NO_DEBUG_OUTPUT")
endif()
if(CMAKE_BUILD_TYPE MATCHES "Debug")
message(STATUS "Compiling in debug mode with MAKE_TEST: ${MAKE_TEST}.")
message(STATUS "Add definition -ggdb3 to format debug output for GDB.")
add_definitions(-ggdb3)
message(STATUS "Compiling in debug mode with MAKE_TEST: ${MAKE_TEST}.")
message(STATUS "Add definition -ggdb3 to format debug output for GDB.")
add_definitions(-ggdb3)
endif()
if(CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")
message(STATUS "Compiling in release with debug info mode.")
message(STATUS "Compiling in release with debug info mode.")
endif( CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo" )
message(STATUS "${BoldYellow}CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}.${ColourReset}")
......@@ -161,19 +161,19 @@ add_subdirectory(src)
add_subdirectory(doc)
if(UNIX)
# Doxygen
find_package(Doxygen)
if(DOXYGEN_FOUND)
# Doxygen
find_package(Doxygen)
if(DOXYGEN_FOUND)
add_custom_target(apidoc cp Doxyfile ${CMAKE_BINARY_DIR}/Doxyfile-build
COMMAND echo "OUTPUT_DIRECTORY=${CMAKE_BINARY_DIR}" >> ${CMAKE_BINARY_DIR}/Doxyfile-build
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile-build
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
COMMAND echo "OUTPUT_DIRECTORY=${CMAKE_BINARY_DIR}" >> ${CMAKE_BINARY_DIR}/Doxyfile-build
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile-build
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
add_custom_target(apidoc-stable cp Doxyfile ${CMAKE_BINARY_DIR}/Doxyfile-stable
COMMAND echo "OUTPUT_DIRECTORY=${CMAKE_BINARY_DIR}" >> ${CMAKE_BINARY_DIR}/Doxyfile-stable
COMMAND echo "HTML_HEADER=header.html" >> ${CMAKE_BINARY_DIR}/Doxyfile-stable
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile-stable
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
endif(DOXYGEN_FOUND)
COMMAND echo "OUTPUT_DIRECTORY=${CMAKE_BINARY_DIR}" >> ${CMAKE_BINARY_DIR}/Doxyfile-stable
COMMAND echo "HTML_HEADER=header.html" >> ${CMAKE_BINARY_DIR}/Doxyfile-stable
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile-stable
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
endif(DOXYGEN_FOUND)
endif(UNIX)
# Packager
set(CPACK_PACKAGE_NAME "xtpcpp")
......@@ -188,36 +188,36 @@ set(CPACK_RESOURCE_FILE_AUTHORS "${CMAKE_SOURCE_DIR}/AUTHORS")
set(CPACK_RESOURCE_FILE_INSTALL "${CMAKE_SOURCE_DIR}/INSTALL")
set(CPACK_SOURCE_GENERATOR "TGZ")
set(CPACK_SOURCE_IGNORE_FILES
"CMakeFiles"
"Makefile"
"_CPack_Packages"
"CMakeCache.txt"
".*\\\\.git"
".*\\\\.gz"
".*\\\\.deb"
".*\\\\.rpm"
".*\\\\.dmg"
".*\\\\.xpip"
".*\\\\..*\\\\.swp"
"src/\\\\..*"
"src/libbpp*"
"debian/tmp"
"debian/libbpp.*/"
"debian/libbpp.*\\\\.so.*"
"debian/libbpp.*\\\\.a"
"debian/libbpp.*\\\\.substvars"
"debian/libbpp.*\\\\.debhelper"
"debian/debhelper\\\\.log"
"build/"
"cbuild/"
"wbuild/"
"Core.tag"
"Testing"
"build-stamp"
"install_manifest.txt"
"DartConfiguration.tcl"
${CPACK_SOURCE_IGNORE_FILES}
)
"CMakeFiles"
"Makefile"
"_CPack_Packages"
"CMakeCache.txt"
".*\\\\.git"
".*\\\\.gz"
".*\\\\.deb"
".*\\\\.rpm"
".*\\\\.dmg"
".*\\\\.xpip"
".*\\\\..*\\\\.swp"
"src/\\\\..*"
"src/libbpp*"
"debian/tmp"
"debian/libbpp.*/"
"debian/libbpp.*\\\\.so.*"
"debian/libbpp.*\\\\.a"
"debian/libbpp.*\\\\.substvars"
"debian/libbpp.*\\\\.debhelper"
"debian/debhelper\\\\.log"
"build/"
"cbuild/"
"wbuild/"
"Core.tag"
"Testing"
"build-stamp"
"install_manifest.txt"
"DartConfiguration.tcl"
${CPACK_SOURCE_IGNORE_FILES}
)
......@@ -243,43 +243,43 @@ add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
# 'clean' is not (yet) a first class target. However, we need to clean the directories before building the sources:
if("${CMAKE_GENERATOR}" MATCHES "Make")
add_custom_target(make_clean
COMMAND ${CMAKE_MAKE_PROGRAM} clean
WORKING_DIRECTORY ${CMAKE_CURRENT_DIR}
)
COMMAND ${CMAKE_MAKE_PROGRAM} clean
WORKING_DIRECTORY ${CMAKE_CURRENT_DIR}
)
Add_dependencies(dist make_clean)
endif()
if(UNIX)
#This creates deb packages:
#This creates deb packages:
add_custom_target(targz
cpack -G TGZ --config CPackSourceConfig.cmake && tar xvfz ${CPACK_PACKAGE_NAME}-${XTPCPP_VERSION}.tar.gz && ln -s ${CPACK_PACKAGE_NAME}-${XTPCPP_VERSION}.tar.gz ${CPACK_PACKAGE_NAME}_${XTPCPP_VERSION}.orig.tar.gz
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Creating .tar.gz" VERBATIM
)
add_custom_target(targz
cpack -G TGZ --config CPackSourceConfig.cmake && tar xvfz ${CPACK_PACKAGE_NAME}-${XTPCPP_VERSION}.tar.gz && ln -s ${CPACK_PACKAGE_NAME}-${XTPCPP_VERSION}.tar.gz ${CPACK_PACKAGE_NAME}_${XTPCPP_VERSION}.orig.tar.gz
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Creating .tar.gz" VERBATIM
)
add_custom_target(deb
cd ${CPACK_PACKAGE_NAME}-${XTPCPP_VERSION} && dpkg-buildpackage
DEPENDS targz
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Creating Debian package" VERBATIM
)
add_custom_target(deb
cd ${CPACK_PACKAGE_NAME}-${XTPCPP_VERSION} && dpkg-buildpackage -B
DEPENDS targz
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Creating Debian package" VERBATIM
)
file(GLOB changesdebs "${CMAKE_BINARY_DIR}/${CPACK_PACKAGE_NAME}_*.dsc")
file(GLOB changesdebs "${CMAKE_BINARY_DIR}/${CPACK_PACKAGE_NAME}_*.dsc")
foreach(libfile ${changesdebs})
SET(changesdeb "${libfile}")
endforeach(libfile)
foreach(libfile ${changesdebs})
SET(changesdeb "${libfile}")
endforeach(libfile)
message ("changes debian file : ${changesdeb}")
#lintian -IEi --pedantic tandem-mass_2013.06.15-1_amd64.changes
add_custom_target(lintian
lintian -IEi --pedantic ${changesdeb}
DEPENDS deb
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "lintian check" VERBATIM
)
message ("changes debian file : ${changesdeb}")
#lintian -IEi --pedantic tandem-mass_2013.06.15-1_amd64.changes
add_custom_target(lintian
lintian -IEi --pedantic ${changesdeb}
DEPENDS deb
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "lintian check" VERBATIM
)
endif()
......@@ -294,11 +294,26 @@ set(UPDATE_OPTIONS "")
#endif(BUILD_TESTING)
configure_file (${CMAKE_SOURCE_DIR}/templates/share/applications/xtpcpp.desktop.cmake ${CMAKE_BINARY_DIR}/templates/share/applications/xtpcpp.desktop)
configure_file (${CMAKE_SOURCE_DIR}/win64/xtpcpp-mingw64-win7+.iss.cmake ${CMAKE_SOURCE_DIR}/win64/xtpcpp-mingw64-win7+.iss)
configure_file (${CMAKE_SOURCE_DIR}/win64/xtpcpp-mxe.iss.cmake ${CMAKE_SOURCE_DIR}/win64/xtpcpp-mxe.iss)
install(FILES ${CMAKE_BINARY_DIR}/templates/share/applications/xtpcpp.desktop DESTINATION share/applications)
install(PROGRAMS ${CMAKE_BINARY_DIR}/src/xtpcpp DESTINATION bin)
if(NOT APPLE)
# We want to install the binary arch-dependent target in
# specific situations. To have proper control, we define the arch
# component.
install(TARGETS ${TARGET}
RUNTIME
COMPONENT arch
DESTINATION ${BIN_DIR})
endif()
configure_file(${CMAKE_SOURCE_DIR}/src/resources/xtandempipeline_icon.svg ${CMAKE_BINARY_DIR}/src/resources/xtpcpp.svg COPYONLY)
install(FILES ${CMAKE_BINARY_DIR}/src/resources/xtpcpp.svg DESTINATION share/icons/hicolor/scalable/apps)
## Doc config file for MAIN-@TARGET@-user-manual.xml
## The following settings are only applied when building from this DC file.
## To customize DAPS's global configuration, use the configuration file
## ~/.config/daps/dapsrc (you may have to create that file initially).
## For documentation of the settings below, see /etc/daps/config .
## MAIN file of the document, mandatory
## The MAIN file is the central DocBook XML file of your document that
## references all other DocBook XML files that may be part of your document.
## By convention, its name starts with "MAIN.".
MAIN="MAIN-user-manual.xml"
##--------------------
## Root ID, optional
## If MAIN contains a set with several books and/or articles of which you only
## want to build specific ones only, use a separate DC file for each book/
## article and set ROOTID to the id/xml:id of the respective <book>/<article>
## element of the document.
## For more information about sets, see
## https://tdg.docbook.org/tdg/5.1/set (for DocBook 5.1).
ROOTID=""
##-------------------
## Custom stylesheets, optional
## (if not defined, the DocBook stylesheets will be used)
STYLEROOT="xslt"
#FALLBACK_STYLEROOT=""
#HTML_CSS=""
#EPUB_CSS=""
##---------------------
## Profiling parameters, optional
## For elements with arch="...", condition="...", os="..." and vendor="..."
## For information about profiling, see
## http://www.sagehill.net/docbookxsl/Profiling.html .
#PROFARCH=""
#PROFCONDITION=""
#PROFOS=""
#PROFVENDOR=""
FOP_CMD_OPTIONS="-c @FOP_XCONF_DIR@/fop.xconf"
......@@ -7,7 +7,7 @@ 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++)
set(TARGET XtpCpp)
# Now that we know what is the TARGET (in the toolchain files above,
# we can compute the lowercase TARGET (used for string replacements in
......
......@@ -6,6 +6,10 @@ message("MXE (M cross environment) https://mxe.cc/")
message("Please run the configuration like this:")
message("x86_64-w64-mingw32.shared-cmake -DMXE=1 -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Release ../../development")
# The TARGET changes according to the plaform
# For example, it changes to XtpCpp for macOS.
SET(TARGET xtpcpp)
set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES /win64/mxe/usr/x86_64-w64-mingw32.shared/include)
set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES /win64/mxe/usr/x86_64-w64-mingw32.shared/include)
......
message("UNIX non APPLE environment")
message("Please run the configuration like this:")
message("cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Debug ../development")
set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES /usr/include)
set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES /usr/include)
# The TARGET changes according to the plaform
# For example, it changes to XtpCpp for macOS.
# Here we want it to be lowercase, UNIX-culture,
# and it is needed for the user manual build.
SET(TARGET xtpcpp)
## Install directories
if(NOT CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX /usr)
endif()
set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
set(DOC_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/${TARGET})
find_package(QCustomPlot REQUIRED)
# Per instructions of the lib author:
# https://www.qcustomplot.com/index.php/tutorials/settingup
message(STATUS "Setting definition -DQCUSTOMPLOT_USE_LIBRARY.")
if(NOT TARGET QCustomPlot::QCustomPlot)
add_library(QCustomPlot::QCustomPlot UNKNOWN IMPORTED)
set_target_properties(QCustomPlot::QCustomPlot PROPERTIES
IMPORTED_LOCATION "${QCustomPlot_LIBRARIES}"
INTERFACE_INCLUDE_DIRECTORIES "${QCustomPlot_INCLUDE_DIR}"
INTERFACE_COMPILE_DEFINITIONS QCUSTOMPLOT_USE_LIBRARY )
endif()
if (NOT OdsStream_FOUND)
find_package( OdsStream REQUIRED )
endif (NOT OdsStream_FOUND)
set(PappsoMSpp_INCLUDE_DIR /home/langella/developpement/git/pappsomspp/src)
mark_as_advanced(PappsoMSpp_INCLUDE_DIR)
set(PappsoMSpp_INCLUDE_DIRS ${PappsoMSpp_INCLUDE_DIR})
# Look for the necessary library
set(PappsoMSpp_LIBRARY /home/langella/developpement/git/pappsomspp/build/src/libpappsomspp.so)
mark_as_advanced(PappsoMSpp_LIBRARY)
# Mark the lib as found
set(PappsoMSpp_FOUND 1)
set(PappsoMSpp_LIBRARIES ${PappsoMSpp_LIBRARY})
if(NOT TARGET PappsoMSpp::Core)
add_library(PappsoMSpp::Core UNKNOWN IMPORTED)
set_target_properties(PappsoMSpp::Core PROPERTIES
IMPORTED_LOCATION "${PappsoMSpp_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${PappsoMSpp_INCLUDE_DIRS}")
endif()
set(PappsoMSppWidget_LIBRARY /home/langella/developpement/git/pappsomspp/build/src/pappsomspp/widget/libpappsomspp-widget.so)
mark_as_advanced(PappsoMSppWidget_LIBRARY)
message(STATUS "~~~~~~~~~~~~~ ${PappsoMSppWidget_LIBRARY} ~~~~~~~~~~~~~~~")
set(PappsoMSppWidget_FOUND TRUE)
if(NOT TARGET PappsoMSpp::Widget)
add_library(PappsoMSpp::Widget UNKNOWN IMPORTED)
set_target_properties(PappsoMSpp::Widget PROPERTIES
IMPORTED_LOCATION "${PappsoMSppWidget_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${PappsoMSpp_INCLUDE_DIRS}")
endif()
if(NOT OdsStream_FOUND)
find_package(OdsStream REQUIRED)
endif(NOT OdsStream_FOUND)
if(NOT PappsoMSpp_FOUND)
find_package(PappsoMSpp REQUIRED)
endif(NOT PappsoMSpp_FOUND)
if(NOT RData_FOUND)
find_package(RData REQUIRED)
endif(NOT RData_FOUND)
#sudo apt install libgrantlee5-dev
if(NOT Grantlee5_FOUND)
find_package(Grantlee5 REQUIRED)
endif(NOT Grantlee5_FOUND)
......@@ -5,6 +5,34 @@ message("cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Debug ../development")
set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES /usr/include)
set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES /usr/include)
# The TARGET changes according to the plaform
# For example, it changes to XtpCpp for macOS.
# Here we want it to be lowercase, UNIX-culture,
# and it is needed for the user manual build.
SET(TARGET xtpcpp)
## Install directories
if(NOT CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX /usr)
endif()
set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
set(DOC_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/${TARGET})
find_package(QCustomPlot REQUIRED)
# Per instructions of the lib author:
# https://www.qcustomplot.com/index.php/tutorials/settingup
message(STATUS "Setting definition -DQCUSTOMPLOT_USE_LIBRARY.")
if(NOT TARGET QCustomPlot::QCustomPlot)
add_library(QCustomPlot::QCustomPlot UNKNOWN IMPORTED)
set_target_properties(QCustomPlot::QCustomPlot PROPERTIES
IMPORTED_LOCATION "${QCustomPlot_LIBRARIES}"
INTERFACE_INCLUDE_DIRECTORIES "${QCustomPlot_INCLUDE_DIR}"
INTERFACE_COMPILE_DEFINITIONS QCUSTOMPLOT_USE_LIBRARY )
endif()
if(NOT OdsStream_FOUND)
find_package(OdsStream REQUIRED)
......
......@@ -6,6 +6,10 @@ message("cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Release ../development")
set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "c:/msys64/mingw64/include")
set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "c:/msys64/mingw64/bin")
# The TARGET changes according to the plaform
# For example, it changes to XtpCpp for macOS.
SET(TARGET xtpcpp)
# We do not build the tests under Win10.
set (MAKE_TEST 0)
......
<?xml-model href="http://docbook.org/xml/5.0CR3/rng/docbookxi.rng"
schematypens="http://relaxng.org/ns/structure/1.0"?>
<!--
<?xml-model href="http://docbook.org/xml/5.1CR3/rng/docbook.rng"
schematypens="http://purl.oclc.org/dsdl/schematron"?>
-->
<book xmlns="http://docbook.org/ns/docbook" version="5.0"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
xml:id="book.template"
xml:lang="en">
<xi:include href="book-info.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
</xi:include>
<dedication>
<para>To all the admirable people acting in the <emphasis><quote>Free
Software Movement</quote></emphasis> for a better and more ethical
computing world</para>
<para>To all the readers who helped me with this manual.</para>
</dedication>
<xi:include href="preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
</xi:include>
<xi:include href="generalities.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
</xi:include>
<xi:include href="graphical-user-interface.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
</xi:include>
<xi:include href="mass-data-integrations.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
</xi:include>
<xi:include href="mass-spectral-deconvolutions.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
</xi:include>
<xi:include href="isotopic-cluster-computations.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
</xi:include>
<xi:include href="processing-flows.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
</xi:include>
<xi:include href="record-data-mining-discoveries.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
</xi:include>
<xi:include href="gpl-3.0.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
</xi:include>
<xi:include href="colophon.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
</xi:include>
</book>
......@@ -29,6 +29,14 @@ if(UNIX AND NOT APPLE)
endif()
#############################################################
###########################
# BUILD OF THE USER MANUALS
if(BUILD_USER_MANUAL)
add_subdirectory(user-manual)
endif()
message("")
message(STATUS "${BoldGreen}Finished configuration of the doc material.${ColourReset}")
......
if(BUILD_USER_MANUAL)
message("")
message(STATUS "${BoldGreen}Starting configuration for the user manual for ${CMAKE_PROJECT_NAME} ${ColourReset}")
message("")
# The version of the program needs to be set in the user manual front
# matter.
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/CMakeStuff/user-manual-version-entity.ent.cmake.in
${CMAKE_SOURCE_DIR}/doc/user-manual/xml/user-manual-version-entity.ent @ONLY)
# The location of the main user manual config file (set fop.xconf file
# location)
set(FOP_XCONF_DIR ${CMAKE_SOURCE_DIR}/doc/user-manual)
CONFIGURE_FILE