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

Fixed default location for ERT lib files for Windows

Browse Source
This commit is contained in:
Magne Sjaastad
2012-09-13 11:51:03 +02:00
parent bf8a006c0e
commit 8a8fd5a0d0
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/CMakeLists.txt
View File

@@ -86,10 +86,10 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
${ERT_ROOT_PATH}/lib/libwell.a ) ${ERT_ROOT_PATH}/lib/libwell.a )
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set( ERT_LIBRARY_LIST set( ERT_LIBRARY_LIST
${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/ecl.lib ${ERT_ROOT_PATH}/lib/ecl.lib
${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/ert_util.lib ${ERT_ROOT_PATH}/lib/ert_util.lib
${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/geometry.lib ${ERT_ROOT_PATH}/lib/geometry.lib
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/well.lib ) ${ERT_ROOT_PATH}/lib/well.lib )
endif() endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")

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

@@ -55,10 +55,10 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
${ERT_ROOT_PATH}/lib/libwell.a ) ${ERT_ROOT_PATH}/lib/libwell.a )
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set( ERT_LIBRARY_LIST set( ERT_LIBRARY_LIST
${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/ecl.lib ${ERT_ROOT_PATH}/lib/ecl.lib
${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/ert_util.lib ${ERT_ROOT_PATH}/lib/ert_util.lib
${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/geometry.lib ${ERT_ROOT_PATH}/lib/geometry.lib
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/well.lib ) ${ERT_ROOT_PATH}/lib/well.lib )
endif() endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")