Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
Takin
mag-core
Commits
f9c91b94
Verified
Commit
f9c91b94
authored
Apr 29, 2021
by
Tobias WEBER
Browse files
adapted to tlibs changes
parent
e4d86a50
Changes
8
Hide whitespace changes
Inline
Side-by-side
tools/magstructfact/CMakeLists.txt
View file @
f9c91b94
...
...
@@ -42,11 +42,13 @@ if(BUILD_LIB)
add_definitions
(
-DBUILD_LIB
)
add_library
(
takin_magstructfact SHARED
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
()
add_executable
(
takin_magstructfact
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
()
if
(
CMAKE_SYSTEM_NAME STREQUAL
"Darwin"
)
...
...
tools/magstructfact/magstructfact.h
View file @
f9c91b94
...
...
@@ -25,7 +25,7 @@
#include
<sstream>
#include
<complex>
#include
"tlibs2/libs/glplot.h"
#include
"tlibs2/libs/
qt/
glplot.h"
#include
"tlibs2/libs/math20.h"
#include
"tlibs2/libs/numerictablewidgetitem.h"
...
...
tools/moldyn/CMakeLists.txt
View file @
f9c91b94
...
...
@@ -44,6 +44,7 @@ include_directories(
add_executable
(
takin_moldyn
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
)
tools/moldyn/moldyn.h
View file @
f9c91b94
...
...
@@ -20,7 +20,7 @@
#include
<vector>
#include
<tuple>
#include
"tlibs2/libs/glplot.h"
#include
"tlibs2/libs/
qt/
glplot.h"
#include
"tlibs2/libs/math20.h"
#include
"moldyn-loader.h"
...
...
tools/pol/CMakeLists.txt
View file @
f9c91b94
...
...
@@ -53,10 +53,12 @@ if(BUILD_LIB)
add_definitions
(
-DBUILD_LIB
)
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
()
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
()
if
(
CMAKE_SYSTEM_NAME STREQUAL
"Darwin"
)
...
...
tools/pol/pol.cpp
View file @
f9c91b94
...
...
@@ -20,7 +20,7 @@
#include
<string>
#include
<optional>
#include
"tlibs2/libs/glplot.h"
#include
"tlibs2/libs/
qt/
glplot.h"
#include
"tlibs2/libs/math20.h"
#include
"tlibs2/libs/str.h"
#include
"tlibs2/libs/helper.h"
...
...
tools/structfact/CMakeLists.txt
View file @
f9c91b94
...
...
@@ -44,11 +44,13 @@ if(BUILD_LIB)
add_definitions
(
-DBUILD_LIB
)
add_library
(
takin_structfact SHARED
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
()
add_executable
(
takin_structfact
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
()
if
(
CMAKE_SYSTEM_NAME STREQUAL
"Darwin"
)
...
...
tools/structfact/structfact.h
View file @
f9c91b94
...
...
@@ -25,7 +25,7 @@
#include
<sstream>
#include
<complex>
#include
"tlibs2/libs/glplot.h"
#include
"tlibs2/libs/
qt/
glplot.h"
#include
"tlibs2/libs/math20.h"
#include
"tlibs2/libs/qt/numerictablewidgetitem.h"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment