Skip to content

Commit e46176a

Browse files
committed
Add retrocompatibility for CMake versions between 2.8.0 and 2.8.12.
1 parent c1d16a6 commit e46176a

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ MARK_AS_ADVANCED ( CI_DIR )
4646
###############################################################################
4747
SET (CMAKE_RELEASE_VERSION_MAJOR "5" )
4848
SET (CMAKE_RELEASE_VERSION_MINOR "3" )
49-
SET (CMAKE_RELEASE_VERSION_PATCH "1" )
49+
SET (CMAKE_RELEASE_VERSION_PATCH "2" )
5050
SET (CMAKE_RELEASE_DATE "Apr. 10, 2017" )
5151

5252
SET (CMAKE_RELEASE_VERSION

cmake/modules/macros.cmake

+19-5
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,13 @@ MACRO ( ADD_AND_INSTALL_LIBRARY
9595

9696
ADD_LIBRARY ( ${target_name} ${target_type} ${sources} )
9797

98-
TARGET_INCLUDE_DIRECTORIES ( ${target_name} PRIVATE
99-
${COMMON_BINARY_DIR} ${COMMON_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include )
98+
IF ( CMAKE_VERSION VERSION_LESS 2.8.12 )
99+
INCLUDE_DIRECTORIES ( ${target_name} PRIVATE
100+
${COMMON_BINARY_DIR} ${COMMON_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include )
101+
ELSE ( )
102+
TARGET_INCLUDE_DIRECTORIES ( ${target_name} PRIVATE
103+
${COMMON_BINARY_DIR} ${COMMON_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include )
104+
ENDIF ( )
100105

101106
SET_TARGET_PROPERTIES ( ${target_name}
102107
PROPERTIES OUTPUT_NAME ${output_name} )
@@ -140,8 +145,13 @@ MACRO ( ADD_AND_INSTALL_EXECUTABLE
140145
my_add_link_flags ( ${exec_name} "/SAFESEH:NO")
141146
ENDIF ( )
142147

143-
TARGET_INCLUDE_DIRECTORIES ( ${exec_name} PUBLIC
144-
${COMMON_BINARY_DIR} ${COMMON_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include )
148+
IF ( CMAKE_VERSION VERSION_LESS 2.8.12 )
149+
INCLUDE_DIRECTORIES ( ${exec_name} PUBLIC
150+
${COMMON_BINARY_DIR} ${COMMON_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include )
151+
ELSE ( )
152+
TARGET_INCLUDE_DIRECTORIES ( ${exec_name} PUBLIC
153+
${COMMON_BINARY_DIR} ${COMMON_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include )
154+
ENDIF ( )
145155

146156
TARGET_LINK_LIBRARIES ( ${exec_name} ${LIBRARIES} )
147157

@@ -214,7 +224,11 @@ MACRO ( ADD_LIBRARY_TEST target_name main_path target_dependency lib_name )
214224
ADD_EXECUTABLE ( ${target_name} ${main_path} )
215225
ADD_DEPENDENCIES( ${target_name} ${target_dependency} )
216226

217-
TARGET_INCLUDE_DIRECTORIES ( ${target_name} PUBLIC ${CMAKE_BINARY_DIR}/include )
227+
IF ( CMAKE_VERSION VERSION_LESS 2.8.12 )
228+
INCLUDE_DIRECTORIES ( ${target_name} PUBLIC ${CMAKE_BINARY_DIR}/include )
229+
ELSE ( )
230+
TARGET_INCLUDE_DIRECTORIES ( ${target_name} PUBLIC ${CMAKE_BINARY_DIR}/include )
231+
ENDIF ( )
218232

219233
IF ( WIN32 AND ((NOT MINGW) AND USE_SCOTCH) )
220234
MY_ADD_LINK_FLAGS ( ${target_name} "/SAFESEH:NO" )

0 commit comments

Comments
 (0)