File tree Expand file tree Collapse file tree 5 files changed +9
-8
lines changed Expand file tree Collapse file tree 5 files changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -47,9 +47,10 @@ else()
47
47
option (ENABLE_OPENMP "Enables OpenMP compiler support" ON )
48
48
endif ()
49
49
50
+ #option( BUILD_SHARED_LIBS "" ON )
51
+ #option( ENABLE_SHARED_LIBS "" ON )
50
52
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)
53
54
#blt_append_custom_compiler_flag(FLAGS_VAR CMAKE_CXX_FLAGS DEFAULT -rdynamic)
54
55
#set(CMAKE_EXE_LINKER_FLAGS "-rdynamic")
55
56
Original file line number Diff line number Diff line change @@ -23,7 +23,6 @@ add_subdirectory(core)
23
23
add_subdirectory (cxx-utilities/src)
24
24
25
25
file (GLOB children RELATIVE ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR} /*)
26
- set (componentlist geosx_core cxx-utilities)
27
26
foreach (child ${children} )
28
27
if (IS_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} /${child} )
29
28
if ( NOT ( ${child} STREQUAL "core" OR
@@ -38,6 +37,7 @@ foreach(child ${children})
38
37
endif ()
39
38
endif ()
40
39
endforeach ()
40
+ list ( APPEND componentlist geosx_core )
41
41
42
42
set (componentlistlink "" )
43
43
Original file line number Diff line number Diff line change @@ -54,9 +54,9 @@ blt_add_library( NAME geosx_core
54
54
HEADERS ${geosx_headers}
55
55
DEPENDS_ON optionparser cxx-utilities pugixml
56
56
${extraComponentsListLink}
57
- ${thirdPartyLibs} )
58
-
59
- # DEPENDS_ON optionparser cxx-utilities pugixml silo hdf5 trilinos ${extraComponentsListLink} ${thirdPartyLibs} )
57
+ ${thirdPartyLibs}
58
+ SHARED TRUE
59
+ )
60
60
61
61
geosx_add_code_checks(PREFIX core )
62
62
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ set(gtest_geosx_tests
9
9
#
10
10
# Add gtest C++ based tests
11
11
#
12
- set (componentlist geosx_core cxx-utilities PhysicsSolverPackage1 )
12
+ set (componentlist PhysicsSolverPackage1 geosx_core )
13
13
set (componentlistlink "" )
14
14
foreach (component ${componentlist} )
15
15
set ( componentlistlink ${componentlistlink} ${GEOSX_LINK_PREPEND_FLAG} ${component} ${GEOSX_LINK_POSTPEND_FLAG} )
You can’t perform that action at this time.
0 commit comments