Skip to content

Commit 6b79e25

Browse files
committed
changed dependency order to fix linking issues when using dynamic linking
update PhysicsSolverPackage1 submodule
1 parent b37ea59 commit 6b79e25

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

src/cmake/geosxOptions.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ else()
4747
option(ENABLE_OPENMP "Enables OpenMP compiler support" ON)
4848
endif()
4949

50+
#option( BUILD_SHARED_LIBS "" ON )
51+
#option( ENABLE_SHARED_LIBS "" ON )
5052

51-
set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
52-
set(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL "" FORCE)
53+
#set(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL "" FORCE)
5354
#blt_append_custom_compiler_flag(FLAGS_VAR CMAKE_CXX_FLAGS DEFAULT -rdynamic)
5455
#set(CMAKE_EXE_LINKER_FLAGS "-rdynamic")
5556

src/components/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ add_subdirectory(core)
2323
add_subdirectory(cxx-utilities/src)
2424

2525
file(GLOB children RELATIVE ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}/*)
26-
set(componentlist geosx_core cxx-utilities)
2726
foreach(child ${children})
2827
if(IS_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/${child})
2928
if( NOT ( ${child} STREQUAL "core" OR
@@ -38,6 +37,7 @@ foreach(child ${children})
3837
endif()
3938
endif()
4039
endforeach()
40+
list( APPEND componentlist geosx_core )
4141

4242
set(componentlistlink "")
4343

src/components/core/src/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ blt_add_library( NAME geosx_core
5454
HEADERS ${geosx_headers}
5555
DEPENDS_ON optionparser cxx-utilities pugixml
5656
${extraComponentsListLink}
57-
${thirdPartyLibs} )
58-
59-
# DEPENDS_ON optionparser cxx-utilities pugixml silo hdf5 trilinos ${extraComponentsListLink} ${thirdPartyLibs} )
57+
${thirdPartyLibs}
58+
SHARED TRUE
59+
)
6060

6161
geosx_add_code_checks(PREFIX core )
6262

src/components/core/tests/xmlTests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set(gtest_geosx_tests
99
#
1010
# Add gtest C++ based tests
1111
#
12-
set(componentlist geosx_core cxx-utilities PhysicsSolverPackage1 )
12+
set(componentlist PhysicsSolverPackage1 geosx_core )
1313
set(componentlistlink "")
1414
foreach(component ${componentlist})
1515
set( componentlistlink ${componentlistlink} ${GEOSX_LINK_PREPEND_FLAG} ${component} ${GEOSX_LINK_POSTPEND_FLAG} )

0 commit comments

Comments
 (0)