@@ -95,8 +95,13 @@ MACRO ( ADD_AND_INSTALL_LIBRARY
95
95
96
96
ADD_LIBRARY ( ${target_name} ${target_type} ${sources} )
97
97
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 ( )
100
105
101
106
SET_TARGET_PROPERTIES ( ${target_name}
102
107
PROPERTIES OUTPUT_NAME ${output_name} )
@@ -140,8 +145,13 @@ MACRO ( ADD_AND_INSTALL_EXECUTABLE
140
145
my_add_link_flags ( ${exec_name} "/SAFESEH:NO" )
141
146
ENDIF ( )
142
147
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 ( )
145
155
146
156
TARGET_LINK_LIBRARIES ( ${exec_name} ${LIBRARIES} )
147
157
@@ -214,7 +224,11 @@ MACRO ( ADD_LIBRARY_TEST target_name main_path target_dependency lib_name )
214
224
ADD_EXECUTABLE ( ${target_name} ${main_path} )
215
225
ADD_DEPENDENCIES ( ${target_name} ${target_dependency} )
216
226
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 ( )
218
232
219
233
IF ( WIN32 AND ((NOT MINGW) AND USE_SCOTCH) )
220
234
MY_ADD_LINK_FLAGS ( ${target_name} "/SAFESEH:NO" )
0 commit comments