File tree Expand file tree Collapse file tree 3 files changed +3
-57
lines changed Expand file tree Collapse file tree 3 files changed +3
-57
lines changed Original file line number Diff line number Diff line change @@ -162,22 +162,6 @@ function(find_external_library)
162
162
# cmake-format: on
163
163
# Or enable NS3_VERBOSE to print the searched paths
164
164
165
- # Print tested paths to the searched library and if it was found
166
- if (${NS3_VERBOSE} AND (${CMAKE_VERSION} VERSION_LESS "3.17.0" ))
167
- log_find_searched_paths (
168
- TARGET_TYPE
169
- Library
170
- TARGET_NAME
171
- ${library}
172
- SEARCH_RESULT
173
- ${name} _library_internal_${library}
174
- SEARCH_PATHS
175
- ${library_search_paths}
176
- SEARCH_SUFFIXES
177
- ${suffixes}
178
- )
179
- endif ()
180
-
181
165
# After searching the library, the internal variable should have either the
182
166
# absolute path to the library or the name of the variable appended with
183
167
# -NOTFOUND
@@ -260,22 +244,6 @@ function(find_external_library)
260
244
PATH_SUFFIXES ${suffixes}
261
245
)
262
246
263
- # Print tested paths to the searched header and if it was found
264
- if (${NS3_VERBOSE} AND (${CMAKE_VERSION} VERSION_LESS "3.17.0" ))
265
- log_find_searched_paths (
266
- TARGET_TYPE
267
- Header
268
- TARGET_NAME
269
- ${header}
270
- SEARCH_RESULT
271
- ${name} _header_internal_${header}
272
- SEARCH_PATHS
273
- ${header_search_paths}
274
- SEARCH_SUFFIXES
275
- ${suffixes}
276
- )
277
- endif ()
278
-
279
247
# If the header file was not found, append to the not-found list
280
248
if ("${${name} _header_internal_${header} }" STREQUAL
281
249
"${name} _header_internal_${header} -NOTFOUND"
Original file line number Diff line number Diff line change @@ -530,14 +530,7 @@ macro(process_options)
530
530
531
531
set (ENABLE_SQLITE False )
532
532
if (${NS3_SQLITE} )
533
- # find_package(SQLite3 QUIET) # unsupported in CMake 3.10 We emulate the
534
- # behavior of find_package below
535
- find_external_library (
536
- DEPENDENCY_NAME SQLite3
537
- HEADER_NAME sqlite3.h
538
- LIBRARY_NAME sqlite3
539
- OUTPUT_VARIABLE "ENABLE_SQLITE_REASON"
540
- )
533
+ find_package (SQLite3 QUIET )
541
534
542
535
if (${SQLite3_FOUND} )
543
536
set (ENABLE_SQLITE True )
@@ -1230,7 +1223,7 @@ macro(process_options)
1230
1223
${HIGHLIGHTED_STATUS}
1231
1224
"Clang-tidy is incompatible with precompiled headers. Continuing without them."
1232
1225
)
1233
- elseif ( ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0" )
1226
+ else ( )
1234
1227
# If ccache is not enable or was not found, we can continue with
1235
1228
# precompiled headers
1236
1229
if ((NOT ${NS3_CCACHE} ) OR ("${CCACHE} " STREQUAL "CCACHE-NOTFOUND" ))
@@ -1260,11 +1253,6 @@ macro(process_options)
1260
1253
)
1261
1254
endif ()
1262
1255
endif ()
1263
- else ()
1264
- message (
1265
- STATUS
1266
- "CMake ${CMAKE_VERSION} does not support precompiled headers. Continuing without them"
1267
- )
1268
1256
endif ()
1269
1257
endif ()
1270
1258
Original file line number Diff line number Diff line change @@ -40,17 +40,7 @@ function(create_scratch source_files)
40
40
string (REPLACE "/" "_" scratch_dirname "${scratch_dirname} " )
41
41
42
42
# Get source name
43
- if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14.0" )
44
- get_filename_component (scratch_name ${scratch_src} NAME_WLE )
45
- else ()
46
- get_filename_component (scratch_name ${scratch_src} NAME )
47
- string (FIND "${scratch_name} " "." ext_position REVERSE )
48
- if (${ext_position} EQUAL -1 )
49
- message (FATAL_ERROR "Source file has no extension: ${scratch_src} " )
50
- else ()
51
- string (SUBSTRING "${scratch_name} " 0 ${ext_position} scratch_name )
52
- endif ()
53
- endif ()
43
+ get_filename_component (scratch_name ${scratch_src} NAME_WLE )
54
44
55
45
set (target_prefix scratch_ )
56
46
if (scratch_dirname )
You can’t perform that action at this time.
0 commit comments