Commit 9ae84043 authored by Olivier Langella's avatar Olivier Langella
Browse files

compiles using mingw64

parent 14d87fb2
......@@ -28,9 +28,9 @@ if (NOT PAPPSOMSPP_DIR)
# FIND_PACKAGE( Pappsomspp REQUIRED )
endif (NOT PAPPSOMSPP_DIR)
#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_QT4_LIBRARY "${PAPPSOMSPP_DIR}/build/src/libpappsomspp-qt4.so")
# SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp")
# SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src")
# SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/build/src/libpappsomspp-qt4.so")
INCLUDE_DIRECTORIES( ${PAPPSOMSPP_INCLUDE_DIR})
......@@ -234,12 +234,12 @@ ELSE (NOGUI)
INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR})
ELSE (NOQWT)
set(Qwt5_DIR ${masschroq_SOURCE_DIR}/Modules)
FIND_PACKAGE(Qwt5 REQUIRED)
#FIND_PACKAGE(Qwt5 REQUIRED)
# and finally this will run moc:
QT4_WRAP_CPP( STUDIO_MOC_SRCS ${STUDIO_MOC_HDRS} )
# we need this to be able to include headers produced by uic in our code
# (CMAKE_BINARY_DIR holds a path to the build directory, while INCLUDE_DIRECTORIES() works just like INCLUDEPATH from qmake)
INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${Qwt5_INCLUDE_DIR})
INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${QWT_INCLUDE_DIR})
ENDIF (NOQWT)
# this command will generate rules that will run rcc on all files from SAMPLE_RCS
......@@ -272,7 +272,7 @@ IF (MINGW32)
IF (NOQWT)
ELSE (NOQWT)
ADD_EXECUTABLE(masschroq_studio gui/parameterGui.cpp ${STUDIO_SRCS} ${STUDIO_MOC_SRCS} ${MASSCHROQ_LIB_SRCS} ${MASSCHROQ_LIB_MOC_SRCS} ${SAXLIB_SRCS} ${OBIWARP_SRCS})
TARGET_LINK_LIBRARIES(masschroq_studio ${QT_LIBRARIES} ${Qwt5_Qt4_LIBRARY} ${PAPPSOMSPP_QT4_LIBRARY} ${ODSSTREAM_QT4_LIBRARY})
TARGET_LINK_LIBRARIES(masschroq_studio ${QT_LIBRARIES} ${QWT_LIBRARY} ${PAPPSOMSPP_QT4_LIBRARY} ${ODSSTREAM_QT4_LIBRARY})
SET_TARGET_PROPERTIES(masschroq_studio PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import -Wl,--subsystem,windows ${ADD_MINGW_EXE_LINKER_FLAGS}")
ENDIF (NOQWT)
......
......@@ -5,7 +5,7 @@
# cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../win64/Toolchain-mingw64.cmake ..
SET (NOGUI 0)
SET (NOQWT 1)
SET (NOQWT 0)
# scp index.html tryphon@bioinformatics.org:~/public_html/populations
#
SET (MINGW32 1)
......@@ -27,10 +27,13 @@ SET(QT_PREFIX ${WINDAUBE_ENV_PATH}/Qt64-4.8.6)
#SET(QWT_PREFIX /usr/local/src/mingw32_f15/qwt-5.2.1/i686-pc-mingw32/sys-root/mingw)
#SET(QWT_PREFIX /usr/local/src/mingw_qwt/usr/i686-pc-mingw32/sys-root/mingw)
SET(QWT_PREFIX ${WINDAUBE_ENV_PATH}/qwt-5.2.2)
SET(QWT_PREFIX ${WINDAUBE_ENV_PATH}/qwt-6.1.2)
SET(QT_PREFIX ${WINDAUBE_ENV_PATH}/qt-4.8.7)
SET(QT5_PREFIX ${WINDAUBE_ENV_PATH}/qt-5.6.0)
SET (QWT_INCLUDE_DIR "${QWT_PREFIX}/include/qwt")
SET (QWT_LIBRARY "${QWT_PREFIX}/bin/qwt.dll")
SET (ZLIB_INCLUDE_DIR "/home/langella/opt/zlib-1.2.8/include")
SET (QUAZIP_INCLUDE_DIR "/home/langella/opt/quazip-0.7.2")
SET (MASSCHROQ_LIB_NAME "libmasschroq.dll")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment