Skip to content

Commit 70d9b70

Browse files
mgronckijenkins
authored andcommitted
QPR-11793 update cmake commonSettings
1 parent 86042bc commit 70d9b70

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

cmake/commonSettings.cmake

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
3535
set(CMAKE_BUILD_TYPE "RelWithDebInfo")
3636
endif()
3737

38-
# add build/QuantLib as first include directory to make sure we include QL's cmake-configured files
39-
include_directories("${PROJECT_BINARY_DIR}/QuantLib")
40-
41-
# similar if QuantLib is build separately
42-
include_directories("${CMAKE_CURRENT_LIST_DIR}/../QuantLib/build")
38+
if(NOT DONT_SET_QL_INCLUDE_DIR_FIRST)
39+
# add build/QuantLib as first include directory to make sure we include QL's cmake-configured files
40+
include_directories("${PROJECT_BINARY_DIR}/QuantLib")
41+
endif()
4342

4443
if(MSVC)
4544
set(BUILD_SHARED_LIBS OFF)
@@ -156,6 +155,10 @@ else()
156155
# disable warnings from boost
157156
add_compiler_flag("--system-header-prefix=boost/" supportsSystemHeaderPrefixBoost)
158157

158+
# add build/QuantLib as first include directory to make sure we include QL's cmake-configured files
159+
# if QuantLib is build separately
160+
include_directories("${CMAKE_CURRENT_LIST_DIR}/../QuantLib/build")
161+
159162

160163
endif()
161164

0 commit comments

Comments
 (0)