Commit 964a99ee authored by Filippo Rusconi's avatar Filippo Rusconi
Browse files

Merge branch 'master' of forgemia.inra.fr:pappso/masschroq

parents 6780bdae 78b6ceb0
......@@ -14,18 +14,3 @@ endif (NOT OdsStream_FOUND)
if (NOT PappsoMSpp_FOUND)
find_package ( PappsoMSpp REQUIRED )
endif (NOT PappsoMSpp_FOUND)
#find_package( Boost COMPONENTS iostreams thread filesystem chrono REQUIRED )
find_package( Boost COMPONENTS thread filesystem iostreams REQUIRED )
set(Alglib_DIR ${CMAKE_MODULE_PATH})
find_package(Alglib REQUIRED)
find_package( ZLIB REQUIRED )
set(Zstd_DIR ${CMAKE_MODULE_PATH})
find_package(Zstd REQUIRED)
......@@ -222,9 +222,6 @@ target_link_libraries(masschroq_main ${MASSCHROQ_LIB_NAME}
PappsoMSpp::Core
PappsoMSpp::Widget
OdsStream::Core
Boost::thread
Boost::filesystem
Boost::iostreams
Qt5::Core
)
set_target_properties(masschroq_main PROPERTIES OUTPUT_NAME masschroq)
......@@ -243,9 +240,6 @@ else (NOGUI)
Qt5::Core
Qt5::Gui
Qt5::Widgets
Boost::thread
Boost::filesystem
Boost::iostreams
)
add_executable(masschroq_studio gui/parameterGui.cpp ${STUDIO_SRCS} ${STUDIO_MOC_SRCS})
......@@ -257,10 +251,7 @@ else (NOGUI)
Qt5::Gui
Qt5::Widgets
Qt5::PrintSupport
${QCustomPlot_LIBRARIES}
Boost::thread
Boost::filesystem
Boost::iostreams
${QCustomPlot_LIBRARIES}
)
endif (NOGUI)
......
Markdown is supported
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