Merge pull request #47 from OPM/ertCompileFix

Fix for error message "Loading libecl fails"
This commit is contained in:
Magne Sjaastad 2013-09-02 05:59:59 -07:00
commit e0138a4c4f
2 changed files with 8 additions and 3 deletions

View File

@ -1,7 +1,7 @@
set(CMAKE_MAJOR_VERSION 0)
set(CMAKE_MINOR_VERSION 9)
set(CMAKE_PATCH_VERSION 23)
set(CMAKE_PATCH_VERSION 24)
set(PRODUCTVER ${CMAKE_MAJOR_VERSION},${CMAKE_MINOR_VERSION},0,${CMAKE_PATCH_VERSION})
set(STRPRODUCTVER ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION})

View File

@ -49,8 +49,13 @@ if (MSVC)
set( LIBRARY_TYPE STATIC )
set( SHARED_LIB OFF )
else()
set( LIBRARY_TYPE SHARED )
set( SHARED_LIB ON )
if (INSTALL_ERT)
set( LIBRARY_TYPE SHARED )
set( SHARED_LIB ON )
else()
set( LIBRARY_TYPE STATIC )
set( SHARED_LIB OFF )
endif(INSTALL_ERT)
endif()