Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-06 04:16:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation

Browse Source
This commit is contained in:
johltn
2021-02-12 15:30:10 +01:00
parent ec04644c54
commit 6a3390dbb6
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/CMakeLists.txt
+20 -8
View File
@@ -391,23 +391,35 @@ if(HDF5_SUPPORT)
ElSE()
SET(HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIR}" CACHE FILEPATH "HDF5 header files")
ENDIF()
MESSAGE(STATUS "---------------------------------------------------------------------------------------------------------------------------")
MESSAGE(STATUS HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIR}")
IF("${HDF5_LIBRARY_DIR}" STREQUAL "")
MESSAGE(STATUS "No HDF5 library directory specified")
ElSE()
SET(HDF5_LIBRARY_DIR "${HDF5_LIBRARY_DIR}" CACHE FILEPATH "HDF5 library files")
ENDIF()
MESSAGE(STATUS HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIR}")
IF(WIN32)
MESSAGE(STATUS "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")
MESSAGE(STATUS HDF5_LIBRARY_DIR_DIR "${HDF5_LIBRARY_DIR}")
# An additional lib- prefix is added by HDF5 to denote static libraries
SET(HDF5_LIBRARIES
"${HDF5_LIBRARY_DIR}/libhdf5_cpp"
"${HDF5_LIBRARY_DIR}/libhdf5"
"${HDF5_LIBRARY_DIR}/libzlib")
"${HDF5_LIBRARY_DIR}/libhdf5_cpp.lib"
"${HDF5_LIBRARY_DIR}/libhdf5.lib"
"${HDF5_LIBRARY_DIR}/libzlib.lib"
"${HDF5_LIBRARY_DIR}/libsz.lib"
"${HDF5_LIBRARY_DIR}/libaec.lib")
ELSE()
MESSAGE(STATUS "NOT WIN 32 :)")
SET(HDF5_LIBRARIES
"${HDF5_LIBRARY_DIR}/hdf5_cpp"
"${HDF5_LIBRARY_DIR}/hdf5"
"${HDF5_LIBRARY_DIR}/hdf5_cpp.lib"
"${HDF5_LIBRARY_DIR}/hdf5.lib"
"${HDF5_LIBRARY_DIR}/libzlib.lib"
"${HDF5_LIBRARY_DIR}/libsz.lib"
"${HDF5_LIBRARY_DIR}/libaec.lib"
zlib)
ENDIF()
endif()
@@ -653,7 +665,7 @@ set(IFCCONVERT_FILES ${IFCCONVERT_CPP_FILES} ${IFCCONVERT_H_FILES})
ADD_EXECUTABLE(IfcConvert ${IFCCONVERT_FILES})
set_target_properties(IfcConvert PROPERTIES COMPILE_FLAGS "${CONVERT_PRECISION}")
TARGET_LINK_LIBRARIES(IfcConvert ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${OPENCOLLADA_LIBRARIES})
TARGET_LINK_LIBRARIES(IfcConvert ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${OPENCOLLADA_LIBRARIES} ${HDF5_LIBRARIES})
if ((NOT WIN32) AND BUILD_SHARED_LIBS)
# Only set RPATHs when building shared libraries (i.e. IfcParse and