Commit 497bdba0 authored by Renne Thomas's avatar Renne Thomas
Browse files

Merge branch 'renne' of...

Merge branch 'renne' of git+ssh://git.renater.fr:2222/scmrepos/git/xtandempipeline/xtandempipeline into renne
parents 478e8319 f63e4a1e
......@@ -264,7 +264,13 @@ MESSAGE("XTPCPP_SRCS: ${XTPCPP_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} ${Boost_INCLUDE_DIRS} ${QCustomPlot_INCLUDES} ${QUAZIP_INCLUDE_DIR})
target_include_directories (xtpcpp PUBLIC
${Pwiz_INCLUDE_DIR}
${ODSSTREAM_INCLUDE_DIR}
${Boost_INCLUDE_DIRS}
${QCustomPlot_INCLUDES}
${QUAZIP_INCLUDE_DIR}
)
target_compile_definitions(xtpcpp PUBLIC ${QT_DEFINITIONS})
SET_TARGET_PROPERTIES(xtpcpp
......@@ -290,8 +296,19 @@ if (MINGW)
${ZLIB_LIBRARIES}
Qt5::Gui Qt5::Xml Qt5::Svg Qt5::PrintSupport Qt5::Network)
else (MINGW)
TARGET_LINK_LIBRARIES(xtpcpp ${PAPPSOMSPP_QT5_LIBRARY} ${PAPPSOMSPP_WIDGET_QT5_LIBRARY} ${Pwiz_LIBRARY} ${ODSSTREAM_QT5_LIBRARY} ${QCustomPlot_LIBRARIES}
Qt5::Gui Qt5::Xml Qt5::Svg Qt5::PrintSupport Qt5::Network)
TARGET_LINK_LIBRARIES(xtpcpp
Pappso::Core
Pappso::Widget
${Pwiz_LIBRARY}
${ODSSTREAM_QT5_LIBRARY}
${QCustomPlot_LIBRARIES}
Qt5::Core
Qt5::Gui
Qt5::Xml
Qt5::Svg
Qt5::PrintSupport
Qt5::Network
)
endif (MINGW)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xtpcpp DESTINATION bin)
......
......@@ -12,3 +12,19 @@ set(PAPPSOMSPP_INCLUDE_DIR "/home/olivier/eclipse/git/pappsomspp/src")
set(PAPPSOMSPP_QT5_LIBRARY "/home/olivier/eclipse/git/pappsomspp/cbuild/src/libpappsomspp-qt5.so")
set(PAPPSOMSPP_WIDGET_QT5_LIBRARY "/home/olivier/eclipse/git/pappsomspp/cbuild/src/pappsomspp/widget/libpappsomspp-widget-qt5.so")
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()
......@@ -12,3 +12,19 @@ set(PAPPSOMSPP_INCLUDE_DIR "/home/trenne/developpement/git/pappsomspp/src")
set(PAPPSOMSPP_QT5_LIBRARY "/home/trenne/developpement/git/pappsomspp/cbuild/src/libpappsomspp-qt5.so")
set(PAPPSOMSPP_WIDGET_QT5_LIBRARY "/home/trenne/developpement/git/pappsomspp/cbuild/src/pappsomspp/widget/libpappsomspp-widget-qt5.so")
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()
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