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

Replace tabs with spaces

Browse Source
This commit is contained in:
Magne Sjaastad
2020-06-16 09:58:21 +02:00
parent d2ccc684a5
commit 08723f403f
1 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
CMakeLists.txt
View File

@@ -20,7 +20,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_definitions(-DCVF_OSX) add_definitions(-DCVF_OSX)
elseif(MSVC) elseif(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /std:c++14") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /std:c++14")
endif() endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -114,7 +114,7 @@ if (RESINSIGHT_ERT_EXTERNAL_LIB_ROOT OR RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT)
) )
list(APPEND ERT_LIBRARIES list(APPEND ERT_LIBRARIES
${RESINSIGHT_ERT_EXTERNAL_LIB_ROOT}/libecl.so ${RESINSIGHT_ERT_EXTERNAL_LIB_ROOT}/libecl.so
) )
else() else()
@@ -157,7 +157,7 @@ else()
set_property(TARGET set_property(TARGET
catch2 catch2
PROPERTY FOLDER "Thirdparty" PROPERTY FOLDER "Thirdparty"
) )
# Restore original state # Restore original state
@@ -181,18 +181,18 @@ endif(GSL_ENABLE)
############################################### ###############################################
find_package(Git QUIET) find_package(Git QUIET)
if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
# Update submodules as needed # Update submodules as needed
option(GIT_SUBMODULE "Check submodules during build" ON) option(GIT_SUBMODULE "Check submodules during build" ON)
if(GIT_SUBMODULE) if(GIT_SUBMODULE)
foreach (SUBMODULE ${THIRD_PARTY_SUBMODULES}) foreach (SUBMODULE ${THIRD_PARTY_SUBMODULES})
set (SUBDIR "${PROJECT_SOURCE_DIR}/ThirdParty/${SUBMODULE}") set (SUBDIR "${PROJECT_SOURCE_DIR}/ThirdParty/${SUBMODULE}")
message(STATUS "Initializing GIT submodules") message(STATUS "Initializing GIT submodules")
execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive -- ${SUBDIR} execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive -- ${SUBDIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
RESULT_VARIABLE GIT_SUBMOD_RESULT) RESULT_VARIABLE GIT_SUBMOD_RESULT)
if(NOT GIT_SUBMOD_RESULT EQUAL "0") if(NOT GIT_SUBMOD_RESULT EQUAL "0")
message(FATAL_ERROR "git submodule update --init failed for ${SUBMODULE} with ${GIT_SUBMOD_RESULT}, please checkout submodules") message(FATAL_ERROR "git submodule update --init failed for ${SUBMODULE} with ${GIT_SUBMOD_RESULT}, please checkout submodules")
endif() endif()
endforeach() endforeach()
endif() endif()
endif() endif()
@@ -235,31 +235,31 @@ endif()
if(MSVC) if(MSVC)
if(NOT ${RESINSIGHT_HDF5_DIR} EQUAL "") if(NOT ${RESINSIGHT_HDF5_DIR} EQUAL "")
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
) )
set(RESINSIGHT_FOUND_HDF5 1) set(RESINSIGHT_FOUND_HDF5 1)
message( STATUS "Using HDF5 from : ${RESINSIGHT_HDF5_DIR}" ) message( STATUS "Using HDF5 from : ${RESINSIGHT_HDF5_DIR}" )
else() else()
message( WARNING "Use of HDF5 is enabled, but RESINSIGHT_HDF5_DIR is empty. Specify RESINSIGHT_HDF5_DIR to be able to use HDF5" ) message( WARNING "Use of HDF5 is enabled, but RESINSIGHT_HDF5_DIR is empty. Specify RESINSIGHT_HDF5_DIR to be able to use HDF5" )
endif() endif()
else() else()
find_package(HDF5 COMPONENTS CXX) find_package(HDF5 COMPONENTS CXX)
if (HDF5_FOUND) if (HDF5_FOUND)
list(APPEND EXTERNAL_LINK_LIBRARIES list(APPEND EXTERNAL_LINK_LIBRARIES
${HDF5_LIBRARIES} ${HDF5_LIBRARIES}
) )
set(RESINSIGHT_FOUND_HDF5 1) set(RESINSIGHT_FOUND_HDF5 1)
message( STATUS "Using HDF5 libraries : ${HDF5_LIBRARIES}" ) message( STATUS "Using HDF5 libraries : ${HDF5_LIBRARIES}" )
option (RESINSIGHT_HDF5_BUNDLE_LIBRARIES "Bundle HDF5 libraries" OFF) option (RESINSIGHT_HDF5_BUNDLE_LIBRARIES "Bundle HDF5 libraries" OFF)
mark_as_advanced(FORCE RESINSIGHT_HDF5_BUNDLE_LIBRARIES) mark_as_advanced(FORCE RESINSIGHT_HDF5_BUNDLE_LIBRARIES)
if (RESINSIGHT_HDF5_BUNDLE_LIBRARIES) if (RESINSIGHT_HDF5_BUNDLE_LIBRARIES)
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." )
@@ -296,7 +296,7 @@ list(APPEND OPM_LIBRARIES
set_property(TARGET set_property(TARGET
${OPM_LIBRARIES} ${OPM_LIBRARIES}
PROPERTY FOLDER "Thirdparty/OPM" PROPERTY FOLDER "Thirdparty/OPM"
) )
################################################################################ ################################################################################
@@ -362,28 +362,28 @@ list(APPEND THIRD_PARTY_LIBRARIES
################################################################################ ################################################################################
set_property(TARGET set_property(TARGET
${THIRD_PARTY_LIBRARIES} ${THIRD_PARTY_LIBRARIES}
PROPERTY FOLDER "Thirdparty" PROPERTY FOLDER "Thirdparty"
) )
################################################################################ ################################################################################
# GNU GSL # GNU GSL
################################################################################ ################################################################################
if(GSL_ENABLE) if(GSL_ENABLE)
if (NOT EXISTS "${PROJECT_SOURCE_DIR}/ThirdParty/gsl/CMakeLists.txt") if (NOT EXISTS "${PROJECT_SOURCE_DIR}/ThirdParty/gsl/CMakeLists.txt")
message(FATAL_ERROR "The GSL submodule was not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.") message(FATAL_ERROR "The GSL submodule was not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.")
endif() endif()
option(GSL_DISABLE_TESTS "Disable the GSL tests" ON) option(GSL_DISABLE_TESTS "Disable the GSL tests" ON)
set(GSL_INSTALL OFF) set(GSL_INSTALL OFF)
add_subdirectory(ThirdParty/gsl) add_subdirectory(ThirdParty/gsl)
add_definitions(-DUSE_GSL) add_definitions(-DUSE_GSL)
list(APPEND THIRD_PARTY_LIBRARIES gsl) list(APPEND THIRD_PARTY_LIBRARIES gsl)
# set this property manually for all GSL projects, as they are put into a separate folder # set this property manually for all GSL projects, as they are put into a separate folder
set_property(TARGET set_property(TARGET
gsl gsl
gslcblas gslcblas
copy-headers copy-headers
PROPERTY FOLDER "Thirdparty/GSL" PROPERTY FOLDER "Thirdparty/GSL"
) )
endif() endif()
@@ -429,7 +429,7 @@ list(APPEND VIZ_FWK_LIBRARIES
set_property(TARGET set_property(TARGET
${VIZ_FWK_LIBRARIES} ${VIZ_FWK_LIBRARIES}
PROPERTY FOLDER "VizFwk" PROPERTY FOLDER "VizFwk"
) )
@@ -479,8 +479,8 @@ list(APPEND APP_FWK_LIBRARIES
set_property(TARGET set_property(TARGET
${APP_FWK_LIBRARIES} ${APP_FWK_LIBRARIES}
cafHexInterpolator cafHexInterpolator
PROPERTY FOLDER "AppFwk" PROPERTY FOLDER "AppFwk"
) )
option (RESINSIGHT_INCLUDE_APPFWK_TESTS "Enable AppFwk Tests" OFF) option (RESINSIGHT_INCLUDE_APPFWK_TESTS "Enable AppFwk Tests" OFF)
@@ -543,12 +543,12 @@ if (RESINSIGHT_HDF5_BUNDLE_LIBRARIES)
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
# find all file names with text hdf5 # find all file names with text hdf5
# use file globbing to also copy the symlinks to make sure the dependencies from ResInsight runtime is correct # use file globbing to also copy the symlinks to make sure the dependencies from ResInsight runtime is correct
foreach (FILE_TO_COPY ${HDF5_LIBRARIES}) foreach (FILE_TO_COPY ${HDF5_LIBRARIES})
STRING( FIND ${FILE_TO_COPY} "hdf5" POS_IN_STRING ) STRING( FIND ${FILE_TO_COPY} "hdf5" POS_IN_STRING )
if(${POS_IN_STRING} GREATER -1) if(${POS_IN_STRING} GREATER -1)
file(GLOB FILE_AND_SYMLINKS ${FILE_TO_COPY}*) file(GLOB FILE_AND_SYMLINKS ${FILE_TO_COPY}*)
install(FILES ${FILE_AND_SYMLINKS} DESTINATION ${RESINSIGHT_INSTALL_FOLDER} ) install(FILES ${FILE_AND_SYMLINKS} DESTINATION ${RESINSIGHT_INSTALL_FOLDER} )
endif() endif()
endforeach() endforeach()
endif() endif()
endif (RESINSIGHT_HDF5_BUNDLE_LIBRARIES) endif (RESINSIGHT_HDF5_BUNDLE_LIBRARIES)
@@ -582,8 +582,8 @@ if(RESINSIGHT_BUILD_DOCUMENTATION)
${PROJECT_BINARY_DIR}/Doxyfile @ONLY IMMEDIATE) ${PROJECT_BINARY_DIR}/Doxyfile @ONLY IMMEDIATE)
#-- Add a custom target to run Doxygen when ever the project is built #-- Add a custom target to run Doxygen when ever the project is built
add_custom_target (Docs add_custom_target (Docs
COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
SOURCES ${PROJECT_BINARY_DIR}/Doxyfile) SOURCES ${PROJECT_BINARY_DIR}/Doxyfile)
# IF you do NOT want the documentation to be generated EVERY time you build the project # IF you do NOT want the documentation to be generated EVERY time you build the project
# then leave out the 'ALL' keyword from the above command. # then leave out the 'ALL' keyword from the above command.
endif(RESINSIGHT_BUILD_DOCUMENTATION) endif(RESINSIGHT_BUILD_DOCUMENTATION)