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

Added CACHE settings to the ERT_ROOT_PATH variable

Browse Source
This commit is contained in:
Joakim Hove
2012-09-22 15:59:15 +02:00
parent c4e5d9e842
commit c002720509
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/CMakeLists.txt
View File

@@ -32,16 +32,16 @@ include_directories(
# variable you can point to a different ERT distribution. # variable you can point to a different ERT distribution.
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert") set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert" CACHE DIRECTORY "Root path for ERT installation to build against")
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
if (CMAKE_CL_64) if (CMAKE_CL_64)
set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert-windows-x64") set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert-windows-x64" CACHE DIRECTORY "Root path for ERT installation to build against")
else() else()
set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert-windows") set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert-windows" CACHE DIRECTORY "Root path for ERT installation to build against")
endif() endif()
endif() endif()
# The ERT binary distribution consists of four libraries, libwell, libecl, # The ERT binary distribution consists of four libraries, libwell, libecl,
# libutil and libgeometry and their accompanying header files. There has been a # libutil and libgeometry and their accompanying header files. There has been a
# bit of mess of how this has been organized; either it has been on per # bit of mess of how this has been organized; either it has been on per
@@ -94,7 +94,7 @@ endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
list(APPEND ERT_LIBRARY_LIST lapack z) list(APPEND ERT_LIBRARY_LIST lapack z)
endif() endif()
include_directories( ${ERT_INCLUDE_LIST} ) include_directories( ${ERT_INCLUDE_LIST} )
# Ert configuration complete # Ert configuration complete
@@ -128,7 +128,7 @@ list( APPEND CPP_SOURCES
) )
list( APPEND CPP_SOURCES list( APPEND CPP_SOURCES
FileInterface/RifEclipseInputFileTools.cpp FileInterface/RifEclipseInputFileTools.cpp
FileInterface/RifEclipseOutputFileTools.cpp FileInterface/RifEclipseOutputFileTools.cpp
FileInterface/RifEclipseRestartFilesetAccess.cpp FileInterface/RifEclipseRestartFilesetAccess.cpp
FileInterface/RifEclipseRestartDataAccess.cpp FileInterface/RifEclipseRestartDataAccess.cpp
@@ -206,7 +206,7 @@ set ( QT_MOC_HEADERS
UserInterface/RIResultInfoPanel.h UserInterface/RIResultInfoPanel.h
UserInterface/RIViewer.h UserInterface/RIViewer.h
UserInterface/RIProcessMonitor.h UserInterface/RIProcessMonitor.h
SocketInterface/RiaSocketServer.h SocketInterface/RiaSocketServer.h
) )
qt4_wrap_cpp( MOC_FILES_CPP ${QT_MOC_HEADERS} ) qt4_wrap_cpp( MOC_FILES_CPP ${QT_MOC_HEADERS} )
@@ -279,7 +279,7 @@ add_executable(ResInsight
${CPP_SOURCES} ${CPP_SOURCES}
${MOC_FILES_CPP} ${MOC_FILES_CPP}
${QRC_FILES_CPP} ${QRC_FILES_CPP}
${HEADER_FILES} ${HEADER_FILES}
) )
@@ -378,8 +378,8 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "No_Linux")
install(CODE " install(CODE "
set (INSTALLFILE_LIST set (INSTALLFILE_LIST
${CMAKE_CURRENT_BINARY_DIR}/ResInsight ${CMAKE_CURRENT_BINARY_DIR}/ResInsight
${CMAKE_CURRENT_SOURCE_DIR}/Adm/LicenseInformation.txt ${CMAKE_CURRENT_SOURCE_DIR}/Adm/LicenseInformation.txt
${CMAKE_CURRENT_SOURCE_DIR}/Adm/gplLicense.txt ${CMAKE_CURRENT_SOURCE_DIR}/Adm/gplLicense.txt
${QT_LIBRARY_DIR}/libQtCore.so.4 ${QT_LIBRARY_DIR}/libQtCore.so.4
${QT_LIBRARY_DIR}/libQtGui.so.4 ${QT_LIBRARY_DIR}/libQtGui.so.4
${QT_LIBRARY_DIR}/libQtOpenGL.so.4 ${QT_LIBRARY_DIR}/libQtOpenGL.so.4

11
ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt
View File

@@ -25,17 +25,18 @@ include_directories(
) )
#----------------------------------------------------------------- #-----------------------------------------------------------------
# Ert configuration
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(ERT_ROOT_PATH "${ResInsight_SOURCE_DIR}/ThirdParty/Ert") set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert" CACHE DIRECTORY "Root path for ERT installation to build against")
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
if (CMAKE_CL_64) if (CMAKE_CL_64)
set(ERT_ROOT_PATH "${ResInsight_SOURCE_DIR}/ThirdParty/Ert-windows-x64") set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert-windows-x64" CACHE DIRECTORY "Root path for ERT installation to build against")
else() else()
set(ERT_ROOT_PATH "${ResInsight_SOURCE_DIR}/ThirdParty/Ert-windows") set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert-windows" CACHE DIRECTORY "Root path for ERT installation to build against")
endif() endif()
endif() endif()
set( ERT_ECL_PREFIX "ecl" CACHE STRING "Prefix path to use for ecl code in ert") set( ERT_ECL_PREFIX "ecl" CACHE STRING "Prefix path to use for ecl code in ert")
set( ERT_UTIL_PREFIX "util" CACHE STRING "Prefix path to use for util code in ert") set( ERT_UTIL_PREFIX "util" CACHE STRING "Prefix path to use for util code in ert")
set( ERT_WELL_PREFIX "well" CACHE STRING "Prefix path to use for well code in ert") set( ERT_WELL_PREFIX "well" CACHE STRING "Prefix path to use for well code in ert")
@@ -63,7 +64,7 @@ endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
list(APPEND ERT_LIBRARY_LIST lapack z) list(APPEND ERT_LIBRARY_LIST lapack z)
endif() endif()
#----------------------------------------------------------------- #-----------------------------------------------------------------
include_directories( ${ERT_INCLUDE_LIST} ) include_directories( ${ERT_INCLUDE_LIST} )