Prechádzať zdrojové kódy

Merge topic 'fix-external-project-generator'

a704098d ExternalProject: fix the build command for generator overrides
Brad King 10 rokov pred
rodič
commit
7910cb7cfb
1 zmenil súbory, kde vykonal 4 pridanie a 1 odobranie
  1. 4 1
      Modules/ExternalProject.cmake

+ 4 - 1
Modules/ExternalProject.cmake

@@ -1197,7 +1197,10 @@ function(_ep_get_build_command name step cmd_var)
         else()
           set(cmd "${CMAKE_COMMAND}")
         endif()
-        set(args --build ${binary_dir} --config ${CMAKE_CFG_INTDIR})
+        set(args --build ".")
+        if (CMAKE_CFG_INTDIR AND NOT CMAKE_CFG_INTDIR STREQUAL ".")
+          list(APPEND args --config "${CMAKE_CFG_INTDIR}")
+        endif ()
         if(step STREQUAL "INSTALL")
           list(APPEND args --target install)
         endif()