Verified Commit f9c91b94 authored by Tobias WEBER's avatar Tobias WEBER
Browse files

adapted to tlibs changes

parent e4d86a50
...@@ -42,11 +42,13 @@ if(BUILD_LIB) ...@@ -42,11 +42,13 @@ if(BUILD_LIB)
add_definitions(-DBUILD_LIB) add_definitions(-DBUILD_LIB)
add_library(takin_magstructfact SHARED add_library(takin_magstructfact SHARED
magstructfact.cpp magstructfact.h magstructfact.cpp magstructfact.h
../../tlibs2/libs/glplot.cpp ../../tlibs2/libs/glplot.h) ../../tlibs2/libs/qt/gl.cpp ../../tlibs2/libs/qt/gl.h
../../tlibs2/libs/qt/glplot.cpp ../../tlibs2/libs/qt/glplot.h)
else() else()
add_executable(takin_magstructfact add_executable(takin_magstructfact
magstructfact.cpp magstructfact.h magstructfact.cpp magstructfact.h
../../tlibs2/libs/glplot.cpp ../../tlibs2/libs/glplot.h) ../../tlibs2/libs/qt/gl.cpp ../../tlibs2/libs/qt/gl.h
../../tlibs2/libs/qt/glplot.cpp ../../tlibs2/libs/qt/glplot.h)
endif() endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <sstream> #include <sstream>
#include <complex> #include <complex>
#include "tlibs2/libs/glplot.h" #include "tlibs2/libs/qt/glplot.h"
#include "tlibs2/libs/math20.h" #include "tlibs2/libs/math20.h"
#include "tlibs2/libs/numerictablewidgetitem.h" #include "tlibs2/libs/numerictablewidgetitem.h"
......
...@@ -44,6 +44,7 @@ include_directories( ...@@ -44,6 +44,7 @@ include_directories(
add_executable(takin_moldyn add_executable(takin_moldyn
moldyn.cpp moldyn.h moldyn.cpp moldyn.h
../../tlibs2/libs/glplot.cpp ../../tlibs2/libs/glplot.h) ../../tlibs2/libs/qt/gl.cpp ../../tlibs2/libs/qt/gl.h
../../tlibs2/libs/qt/glplot.cpp ../../tlibs2/libs/qt/glplot.h)
target_link_libraries(takin_moldyn ${Boost_LIBRARIES} ${Qhull_LIBRARIES} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL) target_link_libraries(takin_moldyn ${Boost_LIBRARIES} ${Qhull_LIBRARIES} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <vector> #include <vector>
#include <tuple> #include <tuple>
#include "tlibs2/libs/glplot.h" #include "tlibs2/libs/qt/glplot.h"
#include "tlibs2/libs/math20.h" #include "tlibs2/libs/math20.h"
#include "moldyn-loader.h" #include "moldyn-loader.h"
......
...@@ -53,10 +53,12 @@ if(BUILD_LIB) ...@@ -53,10 +53,12 @@ if(BUILD_LIB)
add_definitions(-DBUILD_LIB) add_definitions(-DBUILD_LIB)
add_library(takin_pol SHARED pol.cpp add_library(takin_pol SHARED pol.cpp
../../tlibs2/libs/glplot.cpp ../../tlibs2/libs/glplot.h) ../../tlibs2/libs/qt/gl.cpp ../../tlibs2/libs/qt/gl.h
../../tlibs2/libs/qt/glplot.cpp ../../tlibs2/libs/qt/glplot.h)
else() else()
add_executable(takin_pol pol.cpp add_executable(takin_pol pol.cpp
../../tlibs2/libs/glplot.cpp ../../tlibs2/libs/glplot.h) ../../tlibs2/libs/qt/gl.cpp ../../tlibs2/libs/qt/gl.h
../../tlibs2/libs/qt/glplot.cpp ../../tlibs2/libs/qt/glplot.h)
endif() endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <string> #include <string>
#include <optional> #include <optional>
#include "tlibs2/libs/glplot.h" #include "tlibs2/libs/qt/glplot.h"
#include "tlibs2/libs/math20.h" #include "tlibs2/libs/math20.h"
#include "tlibs2/libs/str.h" #include "tlibs2/libs/str.h"
#include "tlibs2/libs/helper.h" #include "tlibs2/libs/helper.h"
......
...@@ -44,11 +44,13 @@ if(BUILD_LIB) ...@@ -44,11 +44,13 @@ if(BUILD_LIB)
add_definitions(-DBUILD_LIB) add_definitions(-DBUILD_LIB)
add_library(takin_structfact SHARED add_library(takin_structfact SHARED
structfact.cpp structfact.h structfact.cpp structfact.h
../../tlibs2/libs/glplot.cpp ../../tlibs2/libs/glplot.h) ../../tlibs2/libs/qt/gl.cpp ../../tlibs2/libs/qt/gl.h
../../tlibs2/libs/qt/glplot.cpp ../../tlibs2/libs/qt/glplot.h)
else() else()
add_executable(takin_structfact add_executable(takin_structfact
structfact.cpp structfact.h structfact.cpp structfact.h
../../tlibs2/libs/glplot.cpp ../../tlibs2/libs/glplot.h) ../../tlibs2/libs/qt/gl.cpp ../../tlibs2/libs/qt/gl.h
../../tlibs2/libs/qt/glplot.cpp ../../tlibs2/libs/qt/glplot.h)
endif() endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <sstream> #include <sstream>
#include <complex> #include <complex>
#include "tlibs2/libs/glplot.h" #include "tlibs2/libs/qt/glplot.h"
#include "tlibs2/libs/math20.h" #include "tlibs2/libs/math20.h"
#include "tlibs2/libs/qt/numerictablewidgetitem.h" #include "tlibs2/libs/qt/numerictablewidgetitem.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