Skip to content

Commit 8188000

Browse files
authored
Update libsonata and Highfive to latest releases. Removes meshHDF5 (#349)
1 parent 9e248d6 commit 8188000

File tree

8 files changed

+49
-598
lines changed

8 files changed

+49
-598
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,5 @@ Pression/
4343
*.includes
4444
*.creator
4545
*.creator.user
46+
47+
.vscode/

brion/CMakeLists.txt

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Copyright (c) 2013-2017, EPFL/Blue Brain Project
2-
# Daniel Nachbaur <[email protected]>
2+
# Daniel Nachbaur <[email protected]>
33
#
44
# This file is part of Brion <https://github.com/BlueBrain/Brion>
55
#
@@ -13,7 +13,7 @@ if(CPPCHECK_VERSION VERSION_LESS 1.78)
1313
endif()
1414

1515
configure_file(version.h.in
16-
${CMAKE_BINARY_DIR}/include/brion/version.h)
16+
${CMAKE_BINARY_DIR}/include/brion/version.h)
1717

1818
set(BRION_PUBLIC_HEADERS
1919
api.h
@@ -43,15 +43,14 @@ set(BRION_PUBLIC_HEADERS
4343
log.h
4444
uint128_t.h
4545
uri.h
46-
)
46+
)
4747

4848
set(BRION_HEADERS
4949
constants.h
5050
detail/hdf5Mutex.h
5151
detail/json.hpp
5252
detail/mesh.h
5353
detail/meshBinary.h
54-
detail/meshHDF5.h
5554
detail/skipWhiteSpace.h
5655
detail/utils.h
5756
detail/utilsHDF5.h
@@ -72,7 +71,7 @@ set(BRION_HEADERS
7271
plugin/utilsHDF5.h
7372
serializable.h
7473
threadPool.h
75-
)
74+
)
7675

7776
set(BRION_SOURCES
7877
blueConfig.cpp
@@ -110,23 +109,24 @@ set(BRION_SOURCES
110109
uint128_t.cpp
111110
uri.cpp
112111
version.cpp
113-
)
112+
)
114113

115114
# Create library target
116115
add_library(Brion SHARED ${BRION_PUBLIC_HEADERS} ${BRION_HEADERS} ${BRION_SOURCES})
117116

118117
# Compile options (CMake/CompileOptions.cmake)
119118
compile_options(Brion)
120-
#target_compile_options(Brion PRIVATE -Werror -O3)# -fno-strict-aliasing)
119+
120+
# target_compile_options(Brion PRIVATE -Werror -O3)# -fno-strict-aliasing)
121121
if(MSVC)
122122
target_compile_definitions(Brion PUBLIC /wd4251) # missing dll-interface for H5::Exception
123123
endif()
124124

125125
# Include directories
126126
# Normal includes
127127
target_include_directories(Brion PUBLIC
128-
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR};${PROJECT_SOURCE_DIR}/brion/plugin;${CMAKE_BINARY_DIR}/include>"
129-
"$<INSTALL_INTERFACE:include;include/brion>")
128+
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR};${PROJECT_SOURCE_DIR}/brion/plugin;${CMAKE_BINARY_DIR}/include>"
129+
"$<INSTALL_INTERFACE:include;include/brion>")
130130
target_include_directories(Brion SYSTEM PUBLIC ${Boost_INCLUDE_DIRS})
131131

132132
# Link libraries
@@ -137,33 +137,33 @@ target_link_libraries(Brion PRIVATE ${Boost_FILESYSTEM_LIBRARIES})
137137
target_link_libraries(Brion PRIVATE ${Boost_REGEX_LIBRARIES})
138138
target_link_libraries(Brion PRIVATE ${Boost_IOSTREAMS_LIBRARIES})
139139
target_link_libraries(Brion PRIVATE ${CMAKE_THREADS_LIB_INIT})
140+
140141
if(UNIX AND NOT APPLE)
141-
target_link_libraries(Brion PRIVATE dl)
142-
target_link_libraries(Brion PRIVATE rt)
142+
target_link_libraries(Brion PRIVATE dl)
143+
target_link_libraries(Brion PRIVATE rt)
143144
endif()
144145

145146
set_target_properties(Brion
146-
PROPERTIES
147-
VERSION ${BRION_VERSION_STRING}
148-
SOVERSION ${BRION_VERSION_MAJOR}.${BRION_VERSION_MINOR}
147+
PROPERTIES
148+
VERSION ${BRION_VERSION_STRING}
149+
SOVERSION ${BRION_VERSION_MAJOR}.${BRION_VERSION_MINOR}
149150
)
150151

151152
# Export target
152153
install(TARGETS Brion
153-
EXPORT Brion-targets
154-
LIBRARY DESTINATION lib
155-
ARCHIVE DESTINATION lib
156-
INCLUDES DESTINATION include
154+
EXPORT Brion-targets
155+
LIBRARY DESTINATION lib
156+
ARCHIVE DESTINATION lib
157+
INCLUDES DESTINATION include
157158
)
158159

159160
install(FILES ${CMAKE_BINARY_DIR}/include/brion/version.h
160-
DESTINATION include/brion)
161+
DESTINATION include/brion)
161162

162163
install(DIRECTORY ${PROJECT_SOURCE_DIR}/brion
163-
DESTINATION include
164-
FILES_MATCHING PATTERN "*.h")
164+
DESTINATION include
165+
FILES_MATCHING PATTERN "*.h")
165166

166167
install(DIRECTORY ${PROJECT_SOURCE_DIR}/brion
167-
DESTINATION include
168-
FILES_MATCHING PATTERN "*.ipp")
169-
168+
DESTINATION include
169+
FILES_MATCHING PATTERN "*.ipp")

0 commit comments

Comments
 (0)