From 5d40b087372281adf69a98c480fb88d980cfcde8 Mon Sep 17 00:00:00 2001
From: Jean-Francois Rey <jean-francois.rey@paca.inra.fr>
Date: Tue, 7 Aug 2018 16:27:31 +0200
Subject: [PATCH] bugfix packaging memm
---
CMakeLists.txt | 13 +++++++------
INSTALL.md | 10 +++++-----
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d89b3bf..f2478a8 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,6 +190,7 @@ if(BUILD_GUI)
add_definitions(${Qt5Widgets_DEFINITIONS})
include_directories (${Qt5Widgets_INCLUDE_DIRS})
set_target_properties(Qt5::Core PROPERTIES MAP_IMPORTED_CONFIG_COVERAGE "RELEASE")
+ SET(Qt5_PATH "${Qt5_DIR}/../../../")
if(BUILD_STATIC)
MESSAGE("Cannot compile GUI as static ? : run cmake with -DBUILD_GUI=OFF or use QT compiled as static")
#SET(QT_USE_QTPLUGIN TRUE)
@@ -201,7 +202,7 @@ if(BUILD_GUI)
if(UNIX AND NOT APPLE)
#target_link_libraries(MEMM_GUI -L${QT5_PATH}/plugins/platforms/ libQt5PlatformSupport.a libqxcb.a -L${QT5_PATH}/lib/ libqtharfbuzzng.a -Wl,-Bstatic -lpng -Wl,-Bstatic -ljpeg -Wl,-Bdynamic -lc -Wl,-Bdynamic -lglib-2.0 -Wl,-Bdynamic -lGL -Wl,-Bdynamic -lpthread -Wl,-Bdynamic -lglib-2.0 -Wl,-Bdynamic -ldl )
#OK ca marche bien !
- target_link_libraries(MEMM_GUI ${Qt5_DIR}/plugins/platforms/libqxcb.a -lX11-xcb -lXi -lSM -lICE -lxcb -L${Qt5_DIR}/lib/ -lxcb-static -lQt5PlatformSupport -lfontconfig -lfreetype -lXrender -lXext -lX11 -ludev -lmtdev -lEGL -lQt5Gui -ljpeg -lpng -lqtharfbuzzng -lQt5DBus -lQt5Core -lz -lm -ldl -pthread -lgthread-2.0 -lglib-2.0 -lrt -lGL -lpthread)
+ target_link_libraries(MEMM_GUI ${Qt5_PATH}/plugins/platforms/libqxcb.a -lX11-xcb -lXi -lSM -lICE -lxcb -L${Qt5_PATH}/lib/ -lxcb-static -lQt5PlatformSupport -lfontconfig -lfreetype -lXrender -lXext -lX11 -ludev -lmtdev -lEGL -lQt5Gui -ljpeg -lpng -lqtharfbuzzng -lQt5DBus -lQt5Core -lz -lm -ldl -pthread -lgthread-2.0 -lglib-2.0 -lrt -lGL -lpthread)
endif(UNIX AND NOT APPLE)
endif(BUILD_STATIC)
#qt5_use_modules(MEMM_GUI Widgets Core Gui)
@@ -306,7 +307,7 @@ if(WIN32 AND NOT UNIX)
DESTINATION data )
INSTALL(FILES R/MCMCVisu.R DESTINATION R)
INSTALL(FILES MEMM.ico DESTINATION images)
- INSTALL(FILES LICENSE AUTHORS doc/ReadMe_v2_0.pdf
+ INSTALL(FILES LICENSE AUTHORS doc/ReadMe_v3_0.pdf
DESTINATION doc
COMPONENT applications)
SET (MEMM_DATA_FILES_PATH "${CMAKE_INSTALL_PREFIX}/data/")
@@ -342,7 +343,7 @@ else(WIN32 AND NOT UNIX)
SET (MEMM_DATA_FILES_PATH "${CMAKE_INSTALL_PREFIX}/share/memm/")
add_definitions(-DMEMM_DATA_PATH="${MEMM_DATA_FILES_PATH}")
- INSTALL(FILES LICENSE AUTHORS doc/ReadMe_v2_0.pdf
+ INSTALL(FILES LICENSE AUTHORS doc/ReadMe_v3_0.pdf
DESTINATION share/doc/memm/
COMPONENT applications)
@@ -356,13 +357,13 @@ if(APPLE)
#install(TARGETS MEMMLIB DESTINATION lib)
#endif(NOT BUILD_STATIC)
if(BUILD_DIST)
- install(DIRECTORY "${Qt5_DIR}/lib/QtPrintSupport.framework" "${Qt5_DIR}/lib/QtCore.framework" "${Qt5_DIR}/lib/QtWidgets.framework" "${Qt5_DIR}/lib/QtGUI.framework"
+ install(DIRECTORY "${Qt5_PATH}/lib/QtPrintSupport.framework" "${Qt5_PATH}/lib/QtCore.framework" "${Qt5_PATH}/lib/QtWidgets.framework" "${Qt5_PATH}/lib/QtGUI.framework"
DESTINATION ../Frameworks
FILES_MATCHING
PATTERN "*"
PATTERN "Headers/*" EXCLUDE
PATTERN "*_debug" EXCLUDE)
- install(DIRECTORY "${Qt5_DIR}/plugins/platforms/"
+ install(DIRECTORY "${Qt5_PATH}/plugins/platforms/"
DESTINATION ../Plugins/platforms/
FILES_MATCHING
PATTERN "*.dylib"
@@ -376,7 +377,7 @@ endif(APPLE)
#--------------------------------------
if(BUILD_DIST)
SET(CPACK_PACKAGE_CONTACT "Jean-François Rey<jean-francois.rey@paca.inra.fr>")
- SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "This computer program is a bayesian estiamtion of pollen dispersal kernel and the variance in male fecundity from spatial and genetic data (microsatellites) concerning adult plants and sampled seeds (see Klein et al. 2008 Molecular Ecology).")
+ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "This computer program is a bayesian estimation of pollen dispersal kernel and the variance in male fecundity from spatial and genetic data (microsatellites) concerning adult plants and sampled seeds (see Klein et al. 2008 Molecular Ecology).")
SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
SET(CPACK_PACKAGE_VERSION "${MEMM_VERSION_MAJOR}.${MEMM_VERSION_MINOR}.0")
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${ARCH}")
diff --git a/INSTALL.md b/INSTALL.md
index e045aca..8a8fbbc 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -18,7 +18,7 @@ Package installation is available for tags versions and some from continious del
3. Configuration (32 bits) :
```bash
- cmake . -G "MSYS Makefiles" -DBUILD_STATIC=ON -DBUILD_GUI=ON -DBUILD_DIST=OFF -DCMAKE_BUILD_TYPE=Release -DARCH=i686 -DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32 -DLIBXML_STATIC" -DQt5Widgets_DIR=/mingw32/qt5-static/lib/cmake/Qt5Widgets/
+ cmake . -G "MSYS Makefiles" -DBUILD_STATIC=ON -DBUILD_GUI=ON -DBUILD_DIST=OFF -DCMAKE_BUILD_TYPE=Release -DARCH=i686 -DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32 -DLIBXML_STATIC" -DQt5_DIR=/mingw32/qt5-static/lib/cmake/Qt5/
```
4. Compilation :
@@ -41,7 +41,7 @@ pacman -S mingw32/mingw-w64-i686-nsis
* step 3 :
```bash
-cmake . -G "MSYS Makefiles" -DBUILD_STATIC=ON -DBUILD_GUI=ON -DBUILD_DIST=ON -DCMAKE_BUILD_TYPE=Release -DARCH=i686 -DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32 -DLIBXML_STATIC" -DQt5Widgets_DIR=/mingw32/qt5-static/lib/cmake/Qt5Widgets/
+cmake . -G "MSYS Makefiles" -DBUILD_STATIC=ON -DBUILD_GUI=ON -DBUILD_DIST=ON -DCMAKE_BUILD_TYPE=Release -DARCH=i686 -DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32 -DLIBXML_STATIC" -DQt5_DIR=/mingw32/qt5-static/lib/cmake/Qt5/
```
* step 5 :
@@ -86,7 +86,7 @@ cpack -G NSIS
4. Configure :
```bash
- export MACOSX_DEPLOYMENT_TARGET=10.9 && cmake . -DBOOST_ROOT=/Path/to/boost/ -DQt5Widgets_DIR=/Path/to/Qt/5.x.x/clang_64/lib/cmake/Qt5Widgets -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=ON -DBUILD_DIST=ON -DBUILD_STATIC=OFF -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9
+ export MACOSX_DEPLOYMENT_TARGET=10.9 && cmake . -DBOOST_ROOT=/Path/to/boost/ -DQt5_DIR=/Path/to/Qt/5.x.x/clang_64/lib/cmake/Qt5/ -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=ON -DBUILD_DIST=ON -DBUILD_STATIC=OFF -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9
```
5. Compilation :
@@ -113,7 +113,7 @@ brew install cmake boost qt
2. Configure and install project
```bash
-export MACOSX_DEPLOYMENT_TARGET=10.9 && cmake . -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=ON -DBUILD_DIST=ON -DBUILD_STATIC=OFF -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DQt5Widgets_DIR=/usr/local/opt/qt/lib/cmake/Qt5Widgets/
+export MACOSX_DEPLOYMENT_TARGET=10.9 && cmake . -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=ON -DBUILD_DIST=ON -DBUILD_STATIC=OFF -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DQt5_DIR=/usr/local/opt/qt/lib/cmake/Qt5/
make
sudo make install
# create bundle
@@ -162,7 +162,7 @@ sudo apt-get install g++ \
2. Configuration, compilation and installation
```bash
-cmake . -DBUILD_GUI=ON -DBUILD_STATIC=ON -DBUILD_DIST=OFF -DCMAKE_BUILD_TYPE=Release
+cmake . -DBUILD_GUI=ON -DBUILD_STATIC=OFF -DBUILD_DIST=OFF -DCMAKE_BUILD_TYPE=Release
make
sudo make install
```
--
GitLab