diff --git a/CMakeLists.txt b/CMakeLists.txt
index 064a2ae4c4e917ec0dd5568d0067c706d402c8c5..7522fa01f3406cb29c04f842def46f990e735036 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,14 @@
# Global parameters
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(xtpcpp CXX)
+
+
+# Find includes in corresponding build directories
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+# Instruct CMake to run moc automatically when needed.
+set(CMAKE_AUTOMOC ON)
+
+
IF(NOT CMAKE_BUILD_TYPE)
# SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
# "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
@@ -30,7 +38,14 @@ IF(CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")
ENDIF( CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo" )
#SET(CMAKE_CXX_FLAGS "-Wall -Weffc++ -Wshadow -Wconversion")
-set(CMAKE_CXX_STANDARD 14)
+#set(CMAKE_CXX_STANDARD 14)
+if (CMAKE_VERSION VERSION_LESS "3.1")
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+ set (CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
+ endif ()
+ else ()
+ set (CMAKE_CXX_STANDARD 11)
+ endif ()
#depending on libpappsomspp version :
SET(LIBPAPPSOMSPP_VERSION "0.3.3-3")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d4345f46e1b941560e1544f3ba147559e4ee10e8..c53c024176de150f02f47e7e8bc2b8733c48aa81 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,13 +27,10 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5
#sudo apt-get install libpappsomspp-dev
-#FIND_PACKAGE( Pappsomspp REQUIRED )
- SET (PAPPSOMSPP_DIR "/home/olivier/eclipse/git/pappsomspp")
-# SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp")
- SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src")
- SET (PAPPSOMSPP_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt5.so")
- SET (PAPPSOMSPP_WIDGET_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/pappsomspp/widget/libpappsomspp-widget-qt5.so")
-# SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so")
+if (PAPPSOMSPP_QT5_FOUND)
+else (PAPPSOMSPP_QT5_FOUND)
+ FIND_PACKAGE( Pappsomspp REQUIRED )
+endif (PAPPSOMSPP_QT5_FOUND)
IF (PAPPSOMSPP_QT5_FOUND)
ELSE (PAPPSOMSPP_QT5_FOUND)
MESSAGE("PAPPSOms++ library not found")
@@ -198,55 +195,15 @@ SET (GUI_UIS
./gui/xic_view/xic_window.ui
)
-SET(XTPCPP_MOC_HDRS
- ./gui/about_dialog/aboutdialog.h
- ./gui/choose_modification_dialog/choosemodificationdialog.h
- ./gui/edit_label_methods/editlabelmethods.h
- ./gui/edit_modifications/editmodifications.h
- ./gui/edit_tandem_preset_dialog/edittandempresetdialog.h
- ./gui/export_spreadsheet_dialog/exportspreadsheetdialog.h
- ./gui/load_results_dialog/loadresultsdialog.h
- ./gui/mainwindow.h
- ./gui/peptide_detail_view/peptidewindow.h
- ./gui/peptide_list_view/peptidelistwindow.h
- ./gui/peptide_list_view/peptidetablemodel.h
- ./gui/peptide_list_view/peptidetableproxymodel.h
- ./gui/project_view/identification_group_widget/identificationgroupwidget.h
- ./gui/project_view/projectwindow.h
- ./gui/protein_list_view/proteinlistwindow.h
- ./gui/protein_list_view/proteintablemodel.h
- ./gui/protein_list_view/proteintableproxymodel.h
- ./gui/protein_view/proteinwindow.h
- ./gui/ptm_island_list_view/ptmislandlistwindow.h
- ./gui/ptm_island_list_view/ptmislandtablemodel.h
- ./gui/ptm_island_list_view/ptmislandproxymodel.h
- ./gui/ptm_peptide_list_view/ptmpeptidelistwindow.h
- ./gui/ptm_peptide_list_view/ptmpeptidetablemodel.h
- ./gui/ptm_peptide_list_view/ptmpeptidetableproxymodel.h
- ./gui/ptm_peptide_list_view/ptmsequencedelegate.h
- ./gui/tandem_run_dialog/tandemrundialog.h
- ./gui/waiting_message_dialog/waitingmessagedialog.h
- ./gui/widgets/automatic_filter_widget/automaticfilterwidget.h
- ./gui/widgets/contaminant_widget/contaminantwidget.h
- ./gui/widgets/massitemdelegate.h
- ./gui/xic_view/xic_box/xicbox.h
- ./gui/xic_view/xicwindow.h
- ./gui/xic_view/xicworkerthread.h
- ./gui/workerthread.h
- ./utils/workmonitor.h
-)
-
# this will run uic on .ui files:
QT5_WRAP_UI( GUI_UI_HDRS ${GUI_UIS} )
-QT5_WRAP_CPP( XTPCPP_MOC_SRCS ${XTPCPP_MOC_HDRS} )
-
MESSAGE("XTPCPP_SRCS: ${XTPCPP_SRCS}")
-ADD_EXECUTABLE(xtpcpp main.cpp ${CPP_FILES} ${XTPCPP_SRCS} ${GUI_UI_HDRS} ${XTPCPP_MOC_SRCS} ${xtpcpp_RCC_SRCS})
+ADD_EXECUTABLE(xtpcpp main.cpp ${CPP_FILES} ${XTPCPP_SRCS} ${GUI_UI_HDRS} ${xtpcpp_RCC_SRCS})
target_include_directories (xtpcpp PUBLIC ${Pwiz_INCLUDE_DIR} ${PAPPSOMSPP_INCLUDE_DIR} ${ODSSTREAM_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
diff --git a/win64/Toolchain-mingw64.cmake b/win64/Toolchain-mingw64.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..d7db4d3c12dd85578bf4c39628af1906a6fe90f2
--- /dev/null
+++ b/win64/Toolchain-mingw64.cmake
@@ -0,0 +1,33 @@
+#download Qt5 mingw64 environment from :
+#http://www.rpmfind.net//linux/RPM/fedora/21/x86_64/m/mingw64-qt5-qtbase-5.3.2-1.fc21.noarch.html
+#ftp://195.220.108.108/linux/sourceforge/p/ps/pspp4windows/used-repositories/2015-06-19/win64/src/mingw64-zlib-1.2.8-8.13.src.rpm
+#http://rpm.pbone.net/index.php3/stat/4/idpl/24061932/dir/opensuse_12.x/com/mingw64-quazip-0.4.4-2.39.noarch.rpm.html
+
+# cd buildwin64
+# cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../win64/Toolchain-mingw64.cmake ..
+
+
+SET (USEQT5 1)
+set (MINGW 1)
+set (MAKE_TEST 0)
+
+set(CMAKE_CXX_COMPILER "/mingw64/bin/g++.exe")
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+# QUAZIP_INCLUDE_DIR - Path to QuaZip include dir
+set (QUAZIP_INCLUDE_DIR "/home/polipo/devel/quazip-0.7.3")
+# 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/polipo/devel/quazip-0.7.3/quazip/release/quazip.dll")
+# QUAZIP_ZLIB_INCLUDE_DIR - The include dir of zlib headers
+
+set (QCustomPlot_INCLUDES "/home/polipo/devel/qcustomplot-1.3.2+dfsg1")
+set (QCustomPlot_LIBRARIES "/home/polipo/devel/qcustomplot-1.3.2+dfsg1/build/libqcustomplot.dll")
+
+set(PAPPSOMSPP_QT5_FOUND 1)
+set(PAPPSOMSPP_WIDGET_QT5_FOUND 1)
+set(PAPPSOMSPP_INCLUDE_DIR "/home/polipo/devel/pappsomspp/src")
+set(PAPPSOMSPP_QT5_LIBRARY "/home/polipo/devel/pappsomspp/build/")
+set(PAPPSOMSPP_WIDGET_QT5_LIBRARY "/home/polipo/devel/pappsomspp/build/")
+