Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build fixes #7

Merged
merged 6 commits into from
Sep 1, 2012
Merged

Build fixes #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b0c60f0
Fix libQtCore link failure because of missing libz
Aug 27, 2012
543dce2
Add link to librt in VisualizationModules/LibCore
Aug 27, 2012
85c96b5
Add libpthread link to unit tests that require it.
Aug 27, 2012
bfb2a75
Add libz to unit test that requires it.
Aug 27, 2012
047ca6d
Add libpthread link to ReservoirDataModel_UnitTests
Aug 27, 2012
94d00b4
Replace tabs with spaces in conformance with style
Aug 31, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ApplicationCode/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert/geometry/lib/libgeometry.a
${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert/well/lib/libwell.a
lapack
z # In case libz is not included in libQtCore
)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set ( EXTERNAL_LINK_LIBRARIES
Expand Down
2 changes: 2 additions & 0 deletions ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert/geometry/lib/libgeometry.a
${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert/well/lib/libwell.a
lapack
pthread
z # In case libz is not included in libQtCore
)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set ( EXTERNAL_LINK_LIBRARIES
Expand Down
7 changes: 6 additions & 1 deletion ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ add_executable( ${ProjectName}
)


target_link_libraries( ${ProjectName} ${LINK_LIBRARIES})
set( EXTERNAL_LINK_LIBRARIES
pthread
)


target_link_libraries( ${ProjectName} ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES})


1 change: 1 addition & 0 deletions ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert/util/lib/libutil.a
${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert/well/lib/libwell.a
lapack
pthread
)

# Linux specific code
Expand Down
10 changes: 10 additions & 0 deletions VisualizationModules/LibCore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,13 @@ cvfVector4.cpp

add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES})


if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set ( EXTERNAL_LINK_LIBRARIES
rt
)
endif()


target_link_libraries(LibCore ${EXTERNAL_LINK_LIBRARIES})