Skip to content

Commit b41fd78

Browse files
committed
Merge remote-tracking branch 'model-validation/bugfix/fix-compile-ubuntu-20.04' into gh_179_180_182_183
2 parents 2c0f71c + e32ebd2 commit b41fd78

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

cmake/commonSettings.cmake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
include(CheckCXXCompilerFlag)
2-
include(CheckLinkerFlag)
2+
if(CMAKE_MINOR_VERSION GREATER 18 OR CMAKE_MINOR_VERSION EQUAL 18)
3+
include(CheckLinkerFlag)
4+
endif()
35

46
option(MSVC_LINK_DYNAMIC_RUNTIME "Link against dynamic runtime" ON)
57
option(MSVC_PARALLELBUILD "Use flag /MP" ON)
@@ -145,7 +147,9 @@ else()
145147

146148
# add pthread flag
147149
add_compiler_flag("-pthread" usePThreadCompilerFlag)
148-
add_linker_flag("-pthread" usePThreadLinkerFlag)
150+
if(CMAKE_MINOR_VERSION GREATER 18 OR CMAKE_MINOR_VERSION EQUAL 18)
151+
add_linker_flag("-pthread" usePThreadLinkerFlag)
152+
endif()
149153

150154
if(QL_USE_PCH)
151155
# see https://ccache.dev/manual/4.8.3.html#_precompiled_headers

0 commit comments

Comments
 (0)