New upstream version 2.2.23

2ec7eb6f · Filippo Rusconi · 9667e004 · 2ec7eb6f · 2ec7eb6f · 2ec7eb6f
Commit 2ec7eb6f authored Dec 02, 2020 by Filippo Rusconi
--- a/.gitignore
+++ b/.gitignore
+build
+src/config.h
+templates/share/applications/masschroq-gui.desktop
+templates/share/applications/masschroq-studio.desktop
+.project
+*~
+
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+
+# cmake helps to compile "masschroq"
+# please install the cmake package depending on your linux distribution
+# and type in the beads root directory :
+# cmake .
+# make
+# make install
+cmake_minimum_required(VERSION 3.0)
+
+# The name of this project is "masschroq". CMakeLists files in this project can
+# refer to the root source directory of the project as ${masschroq_SOURCE_DIR}
+# and to the root binary directory of the project as ${masschroq_BINARY_DIR}.
+
+project(masschroq CXX C)
+
+
+
+# Add folder where are supportive functions
+set(CMAKE_UTILS_PATH ${CMAKE_SOURCE_DIR}/CMakeStuff)
+set(CMAKE_TOOLCHAINS_PATH ${CMAKE_UTILS_PATH}/toolchains)
+set(CMAKE_MODULE_PATH ${CMAKE_UTILS_PATH}/modules)
+
+# Include the system's uname that fills in SYSTEM_UNAME_S.
+# Sets WIN64 if SYSTEM_UNAME_S is "^.*MING64.*"
+include(${CMAKE_UTILS_PATH}/systemUname.cmake)
+
+# Include the various colors we want to use in the output
+include(${CMAKE_UTILS_PATH}/outputColors.cmake)
+
+set(CMAKE_COLOR_MAKEFILE ON)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
+message("\n${BoldRed}Configuring build for project ${PROJECT}${ColourReset}\n")
+
+# Find includes in corresponding build directories
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+# Instruct CMake to run moc automatically when needed.
+set(CMAKE_AUTOMOC ON)
+
+
+# We want C++17
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+message(STATUS "${BoldGreen}CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}${ColourReset}")
+
+#############################################################
+# We do not want warnings for unknown pragmas:
+message(STATUS "Setting definition -Wno-unknown-pragmas.${ColourReset}")
+add_definitions(-Wno-unknown-pragmas)
+# Enable warnings and possibly treat them as errors
+message(STATUS "${BoldGreen}Setting definition -Wall.${ColourReset}")
+add_definitions(-Wall)
+message(STATUS "${BoldGreen}Setting definition -Wextra.${ColourReset}")
+add_definitions(-Wextra)
+
+if(WARN_AS_ERROR)
+	message(STATUS "${BoldYellow}Setting definition -Werror.${ColourReset}")
+	add_definitions(-Werror)
+endif()
+
+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)
+
+	# 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
+
+	include(${CMAKE_TOOLCHAINS_PATH}/unix-toolchain.cmake)
+
+elseif(WIN64)
+	# Run the following cmake command line:
+	# cmake -DBUILD_USER_MANUAL=0 -DCMAKE_BUILD_TYPE=Release ../development
+
+	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
+
+	include(${CMAKE_TOOLCHAINS_PATH}/apple-macport-toolchain.cmake)
+endif()
+
+message("")
+message(STATUS "${BoldGreen}Starting configuration of ${PROJECT}${ColourReset}")
+message("")
+message(STATUS "${BoldYellow}The build toolchain is: ${SystemUname}${ColourReset}")
+message("")
+
+
+
+#############################################################
+#############################################################
+# Essential software configuration
+message(STATUS "CMAKE_CURRENT_BINARY_DIR: " ${CMAKE_CURRENT_BINARY_DIR})
+
+# Gee, do not set that to default!
+# 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)
+endif(NOT CMAKE_BUILD_TYPE)
+
+if(CMAKE_BUILD_TYPE MATCHES "Release")
+	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)
+endif()
+
+if(CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")
+	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}")
+
+
+#depending on libpappsomspp version :
+set(LIBPAPPSOMSPP_VERSION "0.8.3")
+configure_file (${CMAKE_SOURCE_DIR}/debian/control.cmake ${CMAKE_SOURCE_DIR}/debian/control  @ONLY)
+
+# Project version
+#
+
+SET (MASSCHROQ_MAJOR_VERSION 2)
+SET (MASSCHROQ_MINOR_VERSION 2)
+SET (MASSCHROQ_PATCH_LEVEL   23)
+SET (MASSCHROQ_VERSION
+  "${MASSCHROQ_MAJOR_VERSION}.${MASSCHROQ_MINOR_VERSION}.${MASSCHROQ_PATCH_LEVEL}")
+SET (MASSCHROQ_LIB_NAME "masschroq")
+SET (MASSCHROQ_LIB_VERSION ${MASSCHROQ_VERSION})
+SET (MASSCHROQ_LIB_SOVERSION ${MASSCHROQ_MAJOR_VERSION})
+
+SET (MASSCHROQ_SCHEMA_VERSION "${MASSCHROQ_MAJOR_VERSION}.2")
+#SET (masschroq_BINARY_DIR "bin")
+SET(VERSION 2.2.23)
+
+
+# We want C++17
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+message(STATUS "${BoldGreen}CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}${ColourReset}")
+
+
+
+
+if (NOT CMAKE_INSTALL_PREFIX)
+  SET (CMAKE_INSTALL_PREFIX /usr/local)
+endif (NOT CMAKE_INSTALL_PREFIX)
+
+
+
+
+SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
+SET(CPACK_GENERATOR "STGZ;TGZ;TZ")
+SET(CPACK_OUTPUT_CONFIG_FILE "./CPackConfig.cmake")
+#SET(CPACK_PACKAGE_DESCRIPTION_FILE ${masschroq_SOURCE_DIR}/COPYING)
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MassChroQ : Mass Chromatogram Quantification")
+SET(CPACK_PACKAGE_EXECUTABLES "masschroq")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "masschroq-${MASSCHROQ_VERSION}")
+SET(CPACK_SYSTEM_NAME "Linux-i686")
+SET(CPACK_PACKAGE_FILE_NAME "masschroq-${MASSCHROQ_VERSION}-${CPACK_SYSTEM_NAME}")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "masschroq ${MASSCHROQ_VERSION}")
+SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "masschroq ${MASSCHROQ_VERSION}")
+SET(CPACK_PACKAGE_NAME "masschroq")
+SET(CPACK_PACKAGE_VENDOR "PAPPSO")
+SET(CPACK_PACKAGE_VERSION ${MASSCHROQ_VERSION})
+SET(CPACK_RESOURCE_FILE_LICENSE ${masschroq_SOURCE_DIR}/debian/copyright)
+SET(CPACK_RESOURCE_FILE_README ${masschroq_SOURCE_DIR}/README)
+SET(CPACK_RESOURCE_FILE_WELCOME ${masschroq_SOURCE_DIR}/README)
+SET(CPACK_SOURCE_GENERATOR "TGZ;TZ")
+SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "./CPackSourceConfig.cmake")
+SET(CPACK_SOURCE_STRIP_FILES "")
+SET(CPACK_SYSTEM_NAME "Linux-i686")
+SET(CPACK_TOPLEVEL_TAG "Linux-i686")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "masschroq-${MASSCHROQ_VERSION}")
+
+
+SET(CPACK_SOURCE_IGNORE_FILES
+  ".*\\\\.tar\\\\.gz"
+  "moc_.*cxx"
+  "\\\\.#.*"
+  ".*\\\\.aux"
+  ".*\\\\.bbl"
+  ".*\\\\.blg"
+  ".*\\\\.log"
+  ".*\\\\.out"
+  ".*\\\\.toc"
+  "/.kdev4/"
+  "/devel_archives/"
+  "/doc\\\\/misc/"
+  "/doc\\\\/slides/"
+  "/doc\\\\/examples/"
+   "/figures/"
+  "/Soumis/"
+  "Makefile"
+  "install_manifest.txt"
+  "CMakeCache.txt"
+  "CPackConfig.cmake"
+  "CPackSourceConfig.cmake"
+  "/CMakeFiles/"
+  "/_CPack_Packages/"
+  "/Debug/"
+  "/Release/"
+  "/tests/"
+  "/\\\\.externalToolBuilders/"
+  "/\\\\.git/"
+  "/\\\\.settings/"
+  "Makefile"
+  "\\\\.cdtbuild"
+  "\\\\.cdtproject"
+  "\\\\.project"
+  "\\\\.cproject"
+  "/win32/"
+  "/cbuild/"
+  "/build/"
+  "/buildmingw/"
+  "masschroq$"
+  "libmasschroq.so"
+  "mzxml2lmat$"
+  "align_mzxml$"
+  "viewxic$"
+  "xicextractor$"
+  ".gitignore"
+  ".*~"
+  "masschroq_manual.pdf"
+  "masschroq_manual.tex.backup"
+  ".*masschroqML"
+  "/time/"
+  "/buildwin32/"
+  "/buildwin64/"
+  )
+# to create a TGZ archive of the  source code type shell command
+# cpack -G TGZ --config CPackSourceConfig.cmake
+
+# dpkg-buildpackage -rfakeroot -k7BEF3B25
+
+#.dput.cf
+#[olivier-langella]
+#fqdn = ppa.launchpad.net
+#method = ftp
+#incoming = ~olivier-langella/ubuntu/
+#login = olivier-langella
+#allow_unsigned_uploads = 0
+#
+#  debuild -S -sa
+# dput -f olivier-langella *changes
+
+
+#dch -Dwheezy "message"
+#cmake ..
+#make deb
+# scp masschroq* proteus:/var/www/apt/incoming
+# reprepro -Vb /var/www/apt processincoming default
+
+
+
+MESSAGE("configuring file ${masschroq_SOURCE_DIR}/src/config.h.cmake")
+
+configure_file (${masschroq_SOURCE_DIR}/src/config.h.cmake ${masschroq_SOURCE_DIR}/src/config.h)
+configure_file (${CMAKE_SOURCE_DIR}/doc/scripts/masschroq-condor.pl.cmake ${CMAKE_BINARY_DIR}/src/masschroq-condor.pl @ONLY)
+configure_file (${CMAKE_SOURCE_DIR}/doc/scripts/masschroq-split.py.cmake ${CMAKE_BINARY_DIR}/src/masschroq-split.py)
+
+configure_file (${CMAKE_SOURCE_DIR}/win64/masschroq-mingw64-win7+.iss.cmake ${CMAKE_SOURCE_DIR}/win64/masschroq-mingw64-win7+.iss)
+configure_file (${CMAKE_SOURCE_DIR}/win64/masschroq-mxe.iss.cmake ${CMAKE_SOURCE_DIR}/win64/masschroq-mxe.iss)
+
+
+SET(CPACK_PACKAGE_EXECUTABLES "masschroq" "masschroq")
+
+
+INCLUDE(CPack)
+
+# Recurse into the "src" subdirectories.  This does not actually
+# cause another cmake executable to run.  The same process will walk through
+# the project's entire directory structure.
+#MESSAGE("configuring debian/masschroq-common.install")
+#configure_file (${masschroq_SOURCE_DIR}/templates/debian/masschroq-common.install.cmake ${masschroq_SOURCE_DIR}/debian/masschroq-common.install)
+MESSAGE("configuring masschroq-gui.desktop")
+configure_file (${masschroq_SOURCE_DIR}/templates/share/applications/masschroq-gui.desktop.cmake ${masschroq_SOURCE_DIR}/templates/share/applications/masschroq-gui.desktop)
+MESSAGE("configuring masschroq-studio.desktop")
+configure_file (${masschroq_SOURCE_DIR}/templates/share/applications/masschroq-studio.desktop.cmake ${masschroq_SOURCE_DIR}/templates/share/applications/masschroq-studio.desktop)
+
+add_subdirectory (src)
+add_subdirectory (doc)
+
+#INSTALL library libmasschroq is in the src/CMakeLists file
+INSTALL(PROGRAMS ${masschroq_BINARY_DIR}/src/masschroq DESTINATION bin)
+
+IF (NOGUI)
+ELSE (NOGUI)
+  INSTALL(PROGRAMS ${masschroq_BINARY_DIR}/src/masschroq_gui DESTINATION bin)
+  INSTALL(PROGRAMS ${masschroq_BINARY_DIR}/src/masschroq_studio DESTINATION bin)
+  INSTALL(FILES ${masschroq_SOURCE_DIR}/templates/share/applications/masschroq-gui.desktop DESTINATION share/applications)
+  INSTALL(FILES ${masschroq_SOURCE_DIR}/templates/share/applications/masschroq-studio.desktop DESTINATION share/applications)
+ENDIF (NOGUI)
+
+INSTALL(PROGRAMS ${masschroq_BINARY_DIR}/src/masschroq-condor.pl DESTINATION bin)
+INSTALL(FILES ${masschroq_SOURCE_DIR}/doc/logo/masschroq.svg DESTINATION share/masschroq)
+INSTALL(FILES ${masschroq_SOURCE_DIR}/doc/man1/masschroq.1.gz DESTINATION share/man/man1)
+#INSTALL(FILES ${masschroq_SOURCE_DIR}/doc/manual/masschroq_manual.pdf DESTINATION share/doc/masschroq)
+#INSTALL(FILES ${masschroq_SOURCE_DIR}/doc/debian/changelog DESTINATION share/doc/masschroq)
+#INSTALL(FILES ${masschroq_SOURCE_DIR}/README DESTINATION share/doc/masschroq)
+
+#to apply the ignore file svnignores.txt recursively in a directory type
+#svn -R propset svn:ignore -F svnignores.txt .
+
+
+#cross compilation of qwt :
+# QMAKE_CXX = /usr/bin/i586-mingw32msvc-c++
+# QMAKE_LINK = /usr/bin/i586-mingw32msvc-ld
+
+
+
+add_custom_target(targz
+	cpack -G TGZ --config CPackSourceConfig.cmake && tar xvfz masschroq-${MASSCHROQ_VERSION}.tar.gz
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+	COMMENT "Creating .tar.gz" VERBATIM
+)
+
+
+add_custom_target(deb
+	cd masschroq-${MASSCHROQ_VERSION} && dpkg-buildpackage
+	DEPENDS targz
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+	COMMENT "Creating Debian package" VERBATIM
+)
+
+add_custom_target(debtmp
+	rm -rf /tmp/masschroq-${MASSCHROQ_VERSION} && cp -r masschroq-${MASSCHROQ_VERSION} /tmp && cd /tmp/masschroq-${MASSCHROQ_VERSION} && dpkg-buildpackage
+	DEPENDS targz
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+	COMMENT "Creating Debian package" VERBATIM
+)
--- a/CMakeStuff/modules/AlglibConfig.cmake
+++ b/CMakeStuff/modules/AlglibConfig.cmake
+#sudo apt install libalglib-dev
+ 
+# Look for the necessary header
+set(Alglib_INCLUDE_DIR /usr/include/libalglib)
+mark_as_advanced(Alglib_INCLUDE_DIR)
+
+# Look for the necessary library
+set(Alglib_LIBRARY /usr/lib/x86_64-linux-gnu/libalglib.so)
+mark_as_advanced(Alglib_LIBRARY)
+
+set(Alglib_FOUND 1)
+
+
+    set(Alglib_INCLUDE_DIRS ${Alglib_INCLUDE_DIR})
+    set(Alglib_LIBRARIES ${Alglib_LIBRARY})
+    if(NOT TARGET Alglib::Alglib)
+        add_library(Alglib::Alglib UNKNOWN IMPORTED)
+        set_target_properties(Alglib::Alglib PROPERTIES
+            IMPORTED_LOCATION             "${Alglib_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${Alglib_INCLUDE_DIR}")
+    endif()
--- a/CMakeStuff/modules/FindPappsoMSpp.cmake
+++ b/CMakeStuff/modules/FindPappsoMSpp.cmake
+# Copyright : Olivier Langella (CNRS)
+# License : GPL-3.0+
+# Authors : Olivier Langella, Filippo Rusconi
+
+find_path(PappsoMSpp_INCLUDE_DIRS pappsomspp/types.h
+	PATHS /usr/local/include /usr/include
+	PATH_SUFFIXES pappsomspp libpappsomspp ENV PATH)
+
+
+find_library(PappsoMSpp_LIBRARY NAMES pappsomspp)
+
+if(PappsoMSpp_INCLUDE_DIRS AND PappsoMSpp_LIBRARY)
+
+	mark_as_advanced(PappsoMSpp_INCLUDE_DIRS)
+	mark_as_advanced(PappsoMSpp_LIBRARY)
+
+	message(STATUS "~~~~~~~~~~~~~ ${PappsoMSpp_LIBRARY} ~~~~~~~~~~~~~~~")
+
+	set(PappsoMSpp_FOUND TRUE)
+
+endif()
+
+if(PappsoMSpp_FOUND)
+
+	if(NOT PappsoMSpp_FIND_QUIETLY)
+		message(STATUS "Found PappsoMSpp_LIBRARY: ${PappsoMSpp_LIBRARY}")
+	endif()
+
+	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()
+
+	find_library(PappsoMSppWidget_LIBRARY NAMES pappsomspp-widget)
+
+	if(PappsoMSpp_INCLUDE_DIRS AND PappsoMSppWidget_LIBRARY)
+
+		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()
+
+	endif()
+
+	if(NOT PappsoMSpp_FIND_QUIETLY)
+		message(STATUS "Found PappsoMSppWidget_LIBRARY: ${PappsoMSppWidget_LIBRARY}")
+	endif()
+
+else()
+
+	if(PappsoMSpp_FIND_REQUIRED)
+
+		message(FATAL_ERROR "Could not find libpappsomspp. Please do specify the
+		PappsoMSpp_INCLUDE_DIRS and PappsoMSpp_LIBRARY variables using cmake!")
+
+	endif()
+
+endif()
--- a/CMakeStuff/modules/UseLATEX.cmake
+++ b/CMakeStuff/modules/UseLATEX.cmake
--- a/CMakeStuff/modules/ZstdConfig.cmake
+++ b/CMakeStuff/modules/ZstdConfig.cmake
+#sudo apt install libzstd-dev
+ 
+# Look for the necessary header
+set(Zstd_INCLUDE_DIR /usr/include)
+mark_as_advanced(Zstd_INCLUDE_DIR)
+
+# Look for the necessary library
+set(Zstd_LIBRARY /usr/lib/x86_64-linux-gnu/libzstd.so)
+mark_as_advanced(Zstd_LIBRARY)
+
+set(Zstd_FOUND 1)
+
+
+    set(Zstd_INCLUDE_DIRS ${Zstd_INCLUDE_DIR})
+    set(Zstd_LIBRARIES ${Zstd_LIBRARY})
+    if(NOT TARGET Zstd::Zstd)
+        add_library(Zstd::Zstd UNKNOWN IMPORTED)
+        set_target_properties(Zstd::Zstd PROPERTIES
+            IMPORTED_LOCATION             "${Zstd_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${Zstd_INCLUDE_DIR}")
+    endif()
--- a/CMakeStuff/modules/convert_svg.bash
+++ b/CMakeStuff/modules/convert_svg.bash
+#!/bin/bash
+
+#for i in $@ ; do
+
+#FILES=*.svg
+FILES=$@
+
+for f in $FILES
+do
+  echo " file : $f"
+  inkscape --without-gui --export-pdf="${f%.svg}.pdf" $f
+done
--- a/CMakeStuff/outputColors.cmake
+++ b/CMakeStuff/outputColors.cmake
+# We want to use some colors for the message output.
+string(ASCII 27 Esc)
+set(ColourReset "${Esc}[m")
+set(ColourBold  "${Esc}[1m")
+set(Red         "${Esc}[31m")
+set(Green       "${Esc}[32m")
+set(Yellow      "${Esc}[33m")
+set(Blue        "${Esc}[34m")
+set(Magenta     "${Esc}[35m")
+set(Cyan        "${Esc}[36m")
+set(White       "${Esc}[37m")
+set(BoldRed     "${Esc}[1;31m")
+set(BoldGreen   "${Esc}[1;32m")
+set(BoldYellow  "${Esc}[1;33m")
+set(BoldBlue    "${Esc}[1;34m")
+set(BoldMagenta "${Esc}[1;35m")
+set(BoldCyan    "${Esc}[1;36m")
+set(BoldWhite   "${Esc}[1;37m")
--- a/CMakeStuff/systemUname.cmake
+++ b/CMakeStuff/systemUname.cmake
+# Ask that uname -s be performed and store the value in SYSTEM_UNAME_S for
+# later reference.
+
+macro(get_uname_string)
+
+execute_process(COMMAND uname -s OUTPUT_VARIABLE SYSTEM_UNAME_S) 
+
+if(${SYSTEM_UNAME_S} MATCHES "^.*MINGW64.*")
+	message(STATUS "System detected as Windows, setting WIN64")
+	set(WIN64 1)
+#else()
+	#message(STATUS "System is not Windows.")
+endif()
+
+endmacro()
+
+get_uname_string()
+
--- a/CMakeStuff/toolchains/mxe-toolchain-olivier.cmake
+++ b/CMakeStuff/toolchains/mxe-toolchain-olivier.cmake
+# This file should be included if the command line reads like this:
+# x86_64-w64-mingw32.shared-cmake -DCMAKE_BUILD_TYPE=Release -DMXE=1 ..
+
+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")
+
+set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES /media/langella/pappso/mxe/usr/x86_64-w64-mingw32.shared/include)
+set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES /media/langella/pappso/mxe/usr/x86_64-w64-mingw32.shared/include)
+
+
+if(WIN32 OR _WIN32)
+	message(STATUS "Building with WIN32 defined.")
+endif()
+
+
+set (QCustomPlot_FOUND TRUE)
+set (QCustomPlot_INCLUDES "/home/langella/developpement/git/qcustomplot")
+set (QCustomPlot_LIBRARIES "/home/langella/developpement/git/qcustomplot/wbuild/libqcustomplot.dll")
+
+
+#sudo apt install libc6-dev-i386
+   # QUAZIP_INCLUDE_DIR - Path to QuaZip include dir
+set (QUAZIP_INCLUDE_DIR "/home/langella/developpement/git/quazip")
+# QUAZIP_INCLUDE_DIRS- Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
+# QUAZIP_LIBRARIES   - List of QuaZip libraries
+set (QUAZIP_QT5_LIBRARIES "/home/langella/developpement/git/quazip/wbuild/libquazip5.dll")
+set (QUAZIP_LIBRARIES "/home/langella/developpement/git/quazip/wbuild/libquazip5.dll")
+# QUAZIP_ZLIB_INCLUDE_DIR- The include dir of zlib headers
+
+set(ODSSTREAM_QT5_FOUND 1)
+set(ODSSTREAM_INCLUDE_DIR "/home/langella/developpement/git/libodsstream/src")
+set(ODSSTREAM_QT5_LIBRARY "/home/langella/developpement/git/libodsstream/wbuild/src/libodsstream-qt5.dll")
+if(NOT TARGET OdsStream::Core)
+    add_library(OdsStream::Core UNKNOWN IMPORTED)
+        set_target_properties(OdsStream::Core PROPERTIES
+        IMPORTED_LOCATION "${ODSSTREAM_QT5_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${ODSSTREAM_INCLUDE_DIR}"
+    )
+endif()
+
+
+set(PAPPSOMSPP_QT5_FOUND 1)
+set(PAPPSOMSPP_WIDGET_QT5_FOUND 1)
+set(PAPPSOMSPP_INCLUDE_DIR "/home/langella/developpement/git/pappsomspp/src")
+mark_as_advanced(PAPPSOMSPP_INCLUDE_DIR)
+set(PAPPSOMSPP_QT5_LIBRARY "/home/langella/developpement/git/pappsomspp/wbuild/src/libpappsomspp-qt5.dll")
+mark_as_advanced(PAPPSOMSPP_QT5_LIBRARY)
+set(PAPPSOMSPP_WIDGET_QT5_LIBRARY "/home/langella/developpement/git/pappsomspp/wbuild/src/pappsomspp/widget/libpappsomspp-widget-qt5.dll")
+mark_as_advanced(PAPPSOMSPP_WIDGET_QT5_LIBRARY)
+
+if(NOT TARGET Pappso::Core)
+    add_library(Pappso::Core UNKNOWN IMPORTED)
+    set_target_properties(Pappso::Core PROPERTIES
+    IMPORTED_LOCATION "${PAPPSOMSPP_QT5_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${PAPPSOMSPP_INCLUDE_DIR}")
+endif()
+
+
+if(NOT TARGET Pappso::Widget)
+    add_library(Pappso::Widget UNKNOWN IMPORTED)
+    set_target_properties(Pappso::Widget PROPERTIES
+    IMPORTED_LOCATION "${PAPPSOMSPP_WIDGET_QT5_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${PAPPSOMSPP_INCLUDE_DIR}")
+endif()
+
+   
+
+set(Pwiz_FOUND 1)
+set(Pwiz_INCLUDE_DIR "/home/langella/developpement/git/custompwiz/src")
+set(Pwiz_LIBRARY "/home/langella/developpement/git/custompwiz/wbuild/src/libcustompwiz.dll")
+
+if(NOT TARGET Pwiz::Pwiz)
+    add_library(Pwiz::Pwiz UNKNOWN IMPORTED)
+    set_target_properties(Pwiz::Pwiz PROPERTIES
+    IMPORTED_LOCATION "${Pwiz_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${Pwiz_INCLUDE_DIR}")
+endif()
--- a/CMakeStuff/toolchains/mxe-toolchain.cmake
+++ b/CMakeStuff/toolchains/mxe-toolchain.cmake
+# File:///home/langella/developpement/git/pappsomspp/CMakeStuff/toolchains/mxe-toolchain.cmake# 
+# This file should be included if the command line reads like this:
+# x86_64-w64-mingw32.shared-cmake -DCMAKE_BUILD_TYPE=Release -DMXE=1 ..
+
+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")
+
+