Skip to content

Commit 9f3f5e5

Browse files
committed
Merge branch 'github-200' into 'master'
Github 200 See merge request qs/ore-github!21
2 parents 830531a + 150cb3b commit 9f3f5e5

5 files changed

Lines changed: 9 additions & 3 deletions

File tree

CMakePresets.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@
158158
"QL_BUILD_TEST_SUITE": false,
159159
"QL_BUILD_BENCHMARK": false,
160160
"QL_ENABLE_SESSIONS": true,
161-
"ORE_BUILD_DOC": false
161+
"ORE_BUILD_DOC": false,
162+
"BUILD_SHARED_LIBS": false
162163
},
163164
"condition": {
164165
"type": "equals",

OREAnalytics/test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@ add_test(NAME orea-test-suite WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} COMMAN
3737
install(TARGETS orea-test-suite
3838
RUNTIME DESTINATION bin
3939
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
40+
OPTIONAL
4041
)

OREData/test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,5 @@ add_test(NAME ored-test-suite WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} COMMAN
8686
install(TARGETS ored-test-suite
8787
RUNTIME DESTINATION bin
8888
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
89+
OPTIONAL
8990
)

QuantExt/test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,5 @@ add_test(NAME quantext-test-suite COMMAND quantext-test-suite WORKING_DIRECTORY
8989
install(TARGETS quantext-test-suite
9090
RUNTIME DESTINATION bin
9191
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
92+
OPTIONAL
9293
)

cmake/commonSettings.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,10 @@ if(MSVC)
130130
endif()
131131

132132
else()
133-
# build shared libs always
134-
set(BUILD_SHARED_LIBS ON)
133+
if (NOT DEFINED BUILD_SHARED_LIBS)
134+
# build shared libs always
135+
set(BUILD_SHARED_LIBS ON)
136+
endif()
135137

136138
# link against dynamic boost libraries
137139
add_definitions(-DBOOST_ALL_DYN_LINK)

0 commit comments

Comments
 (0)