Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
Takin
mag-core
Commits
da17074d
Commit
da17074d
authored
Jan 15, 2020
by
Tobias WEBER
Browse files
got everything to compile again on new build system
parent
1131599b
Changes
4
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
da17074d
...
...
@@ -23,5 +23,9 @@ add_subdirectory(tools/cif2xml)
add_subdirectory
(
tools/pol
)
# misc tools
add_subdirectory
(
tools/moldyn
)
# main GUI tool
add_subdirectory
(
tools/main
)
tools/cli/cliparser.y
View file @
da17074d
...
...
@@ -5,8 +5,8 @@
* @license see 'LICENSE' file
*/
//
%define parser_class_name { CliParser }
%define api.parser.class { CliParser }
%define parser_class_name { CliParser }
//
%define api.parser.class { CliParser }
%define api.value.type variant
%define api.token.constructor
//%error-verbose
...
...
tools/main/plot.h
View file @
da17074d
...
...
@@ -11,6 +11,7 @@
#include <QtCore/QSettings>
#include <QtWidgets/QWidget>
#include <QtWidgets/QMenu>
#include <memory>
#include "qcp/qcustomplot.h"
...
...
tools/structfact/CMakeLists.txt
View file @
da17074d
...
...
@@ -16,7 +16,7 @@ find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets OpenGL)
set
(
CMAKE_AUTOUIC TRUE
)
set
(
CMAKE_AUTOMOC TRUE
)
set
(
CMAKE_CXX_STANDARD
20
)
set
(
CMAKE_CXX_STANDARD
17
)
add_definitions
(
-std=c++2a -fconcepts
)
add_definitions
(
${
Boost_CXX_FLAGS
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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