Verified Commit 84dc4d91 authored by Tobias WEBER's avatar Tobias WEBER
Browse files

scanbrowser: removed external qcp lib

parent 375485d3
......@@ -31,14 +31,12 @@ GEMMI_LOCAL=${GEMMI##*[/\\]}
# cleans externals
function clean_dirs()
{
rm -rf tlibs
rm -rf qcp
rm -rf gemmi
}
function clean_files()
{
rm -f ${TLIBS_LOCAL}
rm -f ${QCP_LOCAL}
rm -f ${GEMMI_LOCAL}
}
......@@ -46,24 +44,6 @@ function clean_files()
# -----------------------------------------------------------------------------
function dl_tlibs()
{
if ! ${WGET} ${TLIBS}
then
echo -e "Error downloading tlibs.";
exit -1;
fi
if ! ${TAR} xjvf ${TLIBS_LOCAL}
then
echo -e "Error extracting tlibs.";
exit -1;
fi
mv tlibs-master tlibs
}
function dl_qcp()
{
if ! ${WGET} ${QCP}
......@@ -113,15 +93,10 @@ clean_files
echo -e "--------------------------------------------------------------------------------\n"
#echo -e "\n--------------------------------------------------------------------------------"
#echo -e "Installing external tlibs library...\n"
#dl_tlibs
#echo -e "Installing external qcustomplot library...\n"
#dl_qcp
#echo -e "--------------------------------------------------------------------------------\n"
echo -e "\n--------------------------------------------------------------------------------"
echo -e "Installing external qcustomplot library...\n"
dl_qcp
echo -e "--------------------------------------------------------------------------------\n"
echo -e "\n--------------------------------------------------------------------------------"
echo -e "Installing external Gemmi library...\n"
dl_gemmi
......
......@@ -35,6 +35,9 @@ find_package(Qt5PrintSupport REQUIRED)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
# qcp
find_package(QCP REQUIRED)
# Minuit
find_package(Minuit2 REQUIRED)
find_package(Threads REQUIRED)
......@@ -70,11 +73,12 @@ set_property(SOURCE
include_directories(
"${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/ext"
"${PROJECT_SOURCE_DIR}/../.." "${PROJECT_SOURCE_DIR}/../../ext"
"${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/ext" "${PROJECT_SOURCE_DIR}/ext/qcp"
"${PROJECT_SOURCE_DIR}/../.." "${PROJECT_SOURCE_DIR}/../../ext" "${PROJECT_SOURCE_DIR}/../../ext/qcp"
"${PROJECT_SOURCE_DIR}/cli"
"${Boost_INCLUDE_DIRS}" "${Boost_INCLUDE_DIRS}/.."
"${PROJECT_BINARY_DIR}/parser"
"${QCP_INCLUDE_DIRS}"
)
......@@ -95,13 +99,14 @@ add_executable(scanbrowser
../../libs/log.cpp
../../ext/qcp/qcustomplot.cpp ../../ext/qcp/qcustomplot.h
# ../../ext/qcp/qcustomplot.cpp ../../ext/qcp/qcustomplot.h
)
target_link_libraries(scanbrowser
${Boost_LIBRARIES}
Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport
${QCP_LIBRARIES}
${Minuit2_LIBRARIES} Threads::Threads OpenMP::OpenMP_CXX
-ldl
)
......@@ -13,7 +13,7 @@
#include <QtWidgets/QMenu>
#include <memory>
#include "qcp/qcustomplot.h"
#include "qcustomplot.h"
#include "data.h"
......
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