diff --git a/build-support/macros-and-definitions.cmake b/build-support/macros-and-definitions.cmake index 997db6933..18825092b 100644 --- a/build-support/macros-and-definitions.cmake +++ b/build-support/macros-and-definitions.cmake @@ -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 diff --git a/ns3 b/ns3 index fd27bfa59..8a87363d4 100755 --- a/ns3 +++ b/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)