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

Fixes for Visual Studio

Browse Source
This commit is contained in:
Magne Sjaastad 2012-09-10 11:34:11 +02:00
parent e1d669ec65
commit 2bbd48588e
3 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/CMakeLists.txt
View File

@ -72,11 +72,19 @@ set( ERT_INCLUDE_LIST
${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/include ) ${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/include )
# Link to these ERT libraries # Link to these ERT libraries
set( ERT_LIBRARY_LIST if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/libecl.a set( ERT_LIBRARY_LIST
${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/libutil.a ${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/libecl.a
${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/libgeometry.a ${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/libutil.a
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/libwell.a ) ${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/libgeometry.a
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/libwell.a )
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
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()
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)

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

@ -41,11 +41,19 @@ set( ERT_INCLUDE_LIST
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/include ) ${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/include )
# Link to these ERT libraries # Link to these ERT libraries
set( ERT_LIBRARY_LIST if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/libecl.a set( ERT_LIBRARY_LIST
${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/libutil.a ${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/libecl.a
${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/libgeometry.a ${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/libutil.a
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/libwell.a ) ${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/libgeometry.a
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/libwell.a )
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
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()
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)

9
ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/CMakeLists.txt
View File

@ -52,10 +52,11 @@ add_executable( ${ProjectName}
) )
set( EXTERNAL_LINK_LIBRARIES IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
pthread set( EXTERNAL_LINK_LIBRARIES
) pthread
)
ENDIF()
target_link_libraries( ${ProjectName} ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES}) target_link_libraries( ${ProjectName} ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES})