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

Updated ERT to SVN revision 4077 for Windows 32/x64

Browse Source
This commit is contained in:
Magne Sjaastad
2012-09-13 11:41:48 +02:00
parent 5b136d9822
commit bf8a006c0e
200 changed files with 7456 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,19 +54,11 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
${ERT_ROOT_PATH}/lib/libgeometry.a
${ERT_ROOT_PATH}/lib/libwell.a )
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
if (${CMAKE_SIZEOF_VOID_P} MATCHES "8" )
set( ERT_LIBRARY_LIST
${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/ecl.lib
${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/ert_util.lib
${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/geometry.lib
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/well.lib )
else()
set( ERT_LIBRARY_LIST
${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/libecl.lib
${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/libutil.lib
${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/libgeometry.lib
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/libwell.lib )
endif()
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -153,19 +145,19 @@ if (MSVC)
# DLLs ERT depends on
add_custom_command(TARGET ${ProjectName} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
"${PROJECT_SOURCE_DIR}/../../../ThirdParty/Ert-windows/bin/"
${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>)
# add_custom_command(TARGET ${ProjectName} POST_BUILD
# COMMAND ${CMAKE_COMMAND} -E copy_directory
# "${PROJECT_SOURCE_DIR}/../../../ThirdParty/Ert-windows/bin/"
# ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>)
# ERT DLLs
set (ERT_MODULES ecl geometry util well)
foreach (ert_module ${ERT_MODULES})
add_custom_command(TARGET ${ProjectName} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert-windows/${ert_module}/lib/lib${ert_module}.dll"
${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>)
endforeach()
# set (ERT_MODULES ecl geometry util well)
# foreach (ert_module ${ERT_MODULES})
# add_custom_command(TARGET ${ProjectName} POST_BUILD
# COMMAND ${CMAKE_COMMAND} -E copy_if_different
# "${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert-windows/${ert_module}/lib/lib${ert_module}.dll"
# ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>)
# endforeach()
endif(MSVC)