Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
libcifpp
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open
libcifpp
Commits
974cb40a
Commit
974cb40a
authored
Oct 10, 2022
by
Maarten L. Hekkelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
for gcc 9.4
parent
08dd9dd5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
cmake/AddGitSubmodule.cmake
+9
-4
include/cif++/model.hpp
+1
-1
No files found.
cmake/AddGitSubmodule.cmake
View file @
974cb40a
cmake_minimum_required
(
VERSION 3.19
)
cmake_minimum_required
(
VERSION 3.1
6..3.1
9
)
function
(
add_git_submodule dir
)
function
(
add_git_submodule dir
)
# add a Git submodule directory to CMake, assuming the
# add a Git submodule directory to CMake, assuming the
...
@@ -11,9 +11,14 @@ function(add_git_submodule dir)
...
@@ -11,9 +11,14 @@ function(add_git_submodule dir)
find_package
(
Git REQUIRED
)
find_package
(
Git REQUIRED
)
if
(
NOT EXISTS
${
dir
}
/CMakeLists.txt
)
if
(
NOT EXISTS
${
dir
}
/CMakeLists.txt
)
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
submodule update --init --recursive --
${
dir
}
if
(
CMAKE_VERSION VERSION_GREATER_EQUAL 3.19
)
WORKING_DIRECTORY
${
PROJECT_SOURCE_DIR
}
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
submodule update --init --recursive --
${
dir
}
COMMAND_ERROR_IS_FATAL ANY
)
WORKING_DIRECTORY
${
PROJECT_SOURCE_DIR
}
COMMAND_ERROR_IS_FATAL ANY
)
else
()
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
submodule update --init --recursive --
${
dir
}
WORKING_DIRECTORY
${
PROJECT_SOURCE_DIR
}
)
endif
()
endif
()
endif
()
set
(
ENABLE_TESTING OFF
)
set
(
ENABLE_TESTING OFF
)
...
...
include/cif++/model.hpp
View file @
974cb40a
...
@@ -137,7 +137,7 @@ class atom
...
@@ -137,7 +137,7 @@ class atom
{
{
auto
s
=
get_property
(
name
);
auto
s
=
get_property
(
name
);
std
::
from_chars_result
r
=
std
::
from_chars
(
s
.
data
(),
s
.
data
()
+
s
.
length
(),
result
);
std
::
from_chars_result
r
=
cif
::
from_chars
(
s
.
data
(),
s
.
data
()
+
s
.
length
(),
result
);
if
(
r
.
ec
!=
std
::
errc
()
and
VERBOSE
>
0
)
if
(
r
.
ec
!=
std
::
errc
()
and
VERBOSE
>
0
)
std
::
cerr
<<
"Error converting "
<<
s
<<
" to number for property "
<<
name
<<
std
::
endl
;
std
::
cerr
<<
"Error converting "
<<
s
<<
" to number for property "
<<
name
<<
std
::
endl
;
}
}
...
...
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