build: remove unnecessary CMake version check
This commit is contained in:
@@ -245,7 +245,7 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
|
||||
)
|
||||
endif()
|
||||
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.1.0")
|
||||
AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "12.3.2")
|
||||
AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "12.3.2")
|
||||
)
|
||||
# Disable warnings-as-errors for certain versions of GCC when C++20 is
|
||||
# enabled https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105545
|
||||
|
||||
2
ns3
2
ns3
@@ -878,7 +878,7 @@ def cmake_build(current_cmake_cache_folder, output, jobs, target=None, dry_run=F
|
||||
cmake, version = cmake_check_version()
|
||||
|
||||
# Older CMake versions don't accept the number of jobs directly
|
||||
jobs_part = ("-j %d" % jobs) if parse_version(version) >= parse_version("3.12.0") else ""
|
||||
jobs_part = ("-j %d" % jobs)
|
||||
target_part = (" --target %s" % target) if target else ""
|
||||
cmake_build_command = "%s --build . %s%s" % (cmake, jobs_part, target_part)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user