OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

System : Move include and compiler defs to ApplicationCode

Browse Source
This commit is contained in:
Magne Sjaastad 2019-09-16 13:29:44 +02:00
parent 8c189922e0
commit 8a7dee705a
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/CMakeLists.txt
View File

@ -237,9 +237,21 @@ if (RESINSIGHT_FOUND_HDF5)
FileInterface/RifHdf5Reader.cpp FileInterface/RifHdf5Reader.cpp
) )
add_definitions(-DUSE_HDF5)
if(MSVC)
add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB)
include_directories(${RESINSIGHT_HDF5_DIR}/include)
else()
add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB)
add_definitions(${HDF5_DEFINITIONS})
include_directories(${HDF5_INCLUDE_DIRS})
endif() # MSVC
source_group( "FileInterface" FILES FileInterface/RifHdf5Reader.h FileInterface/RifHdf5Reader.cpp ) source_group( "FileInterface" FILES FileInterface/RifHdf5Reader.h FileInterface/RifHdf5Reader.cpp )
add_definitions(-DUSE_HDF5)
endif() endif()
if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING) if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)

9
CMakeLists.txt
View File

@ -164,10 +164,6 @@ mark_as_advanced(FORCE RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING) if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
if(MSVC) if(MSVC)
if(NOT ${RESINSIGHT_HDF5_DIR} EQUAL "") if(NOT ${RESINSIGHT_HDF5_DIR} EQUAL "")
add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB)
include_directories(${RESINSIGHT_HDF5_DIR}/include)
list(APPEND EXTERNAL_LINK_LIBRARIES list(APPEND EXTERNAL_LINK_LIBRARIES
${RESINSIGHT_HDF5_DIR}/lib/hdf5.lib ${RESINSIGHT_HDF5_DIR}/lib/hdf5.lib
${RESINSIGHT_HDF5_DIR}/lib/hdf5_cpp.lib ${RESINSIGHT_HDF5_DIR}/lib/hdf5_cpp.lib
@ -181,10 +177,6 @@ if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
else() else()
find_package(HDF5 COMPONENTS CXX) find_package(HDF5 COMPONENTS CXX)
if (HDF5_FOUND) if (HDF5_FOUND)
add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB)
add_definitions(${HDF5_DEFINITIONS})
include_directories(${HDF5_INCLUDE_DIRS})
list(APPEND EXTERNAL_LINK_LIBRARIES list(APPEND EXTERNAL_LINK_LIBRARIES
${HDF5_LIBRARIES} ${HDF5_LIBRARIES}
) )
@ -198,7 +190,6 @@ if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
message( STATUS "Bundling of HDF5 libraries is enabled" ) message( STATUS "Bundling of HDF5 libraries is enabled" )
endif() # RESINSIGHT_HDF5_BUNDLE_LIBRARIES endif() # RESINSIGHT_HDF5_BUNDLE_LIBRARIES
else() else()
message( WARNING "Use of HDF5 is enabled, but no HDF5 is found." ) message( WARNING "Use of HDF5 is enabled, but no HDF5 is found." )
endif() # HDF5_FOUND endif() # HDF5_FOUND