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 BUILD_SHARED_LIBS related build sytem problems on linux. Now working with both on and off.

Browse Source
This commit is contained in:
Jacob Støren
2016-06-12 02:03:48 +02:00
parent b714882a16
commit 64aea7285d
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/GeoMech/OdbReader/CMakeLists.txt
View File

@@ -6,7 +6,7 @@ if (MSVC)
add_definitions(-DHKS_NT) add_definitions(-DHKS_NT)
add_definitions(-DABQ_WIN86_64) add_definitions(-DABQ_WIN86_64)
else() else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -c -fPIC -w -Wno-deprecated") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -w -Wno-deprecated")
add_definitions(-DTYPENAME=typename) add_definitions(-DTYPENAME=typename)
add_definitions(-D_LINUX_SOURCE) add_definitions(-D_LINUX_SOURCE)

2
CMakeLists.txt
View File

@@ -84,8 +84,6 @@ if(MSVC)
endif() endif()
else() else()
set(BUILD_SHARED_LIBS ON)
set(Boost_USE_STATIC_LIBS OFF)
find_package(Boost 1.44.0 COMPONENTS filesystem date_time system regex REQUIRED) find_package(Boost 1.44.0 COMPONENTS filesystem date_time system regex REQUIRED)
endif() endif()