Bladeren bron

Fixed parallel build for generators with EXTRA.

Fixed parallel build for projects using generators that have the
CMAKE_EXTRA_GENERATOR as well as CMAKE_GENERATOR. Thanks to Bill Hoffman
for helping me to track this one down, I missed parallel builds.
Marcus D. Hanwell 15 jaren geleden
bovenliggende
commit
beeca11c9b
1 gewijzigde bestanden met toevoegingen van 1 en 2 verwijderingen
  1. 1 2
      Modules/ExternalProject.cmake

+ 1 - 2
Modules/ExternalProject.cmake

@@ -597,8 +597,7 @@ function(_ep_get_build_command name step cmd_var)
       # CMake project.  Select build command based on generator.
       get_target_property(cmake_generator ${name} _EP_CMAKE_GENERATOR)
       if("${CMAKE_GENERATOR}" MATCHES "Make" AND
-          ("${cmake_generator}" STREQUAL "${CMAKE_GENERATOR}" OR
-          NOT cmake_generator))
+         ("${cmake_generator}" MATCHES "Make" OR NOT cmake_generator))
         # The project uses the same Makefile generator.  Use recursive make.
         set(cmd "$(MAKE)")
         if(step STREQUAL "INSTALL")