Browse Source

ExternalProject: Simplify CMake command line generation

Append the source directory to the command line option in a separate
step instead of duplicating it with each possible generator.
Brad King 13 years ago
parent
commit
5b2fba5d40
1 changed files with 5 additions and 4 deletions
  1. 5 4
      Modules/ExternalProject.cmake

+ 5 - 4
Modules/ExternalProject.cmake

@@ -1586,15 +1586,16 @@ function(_ep_add_configure_command name)
 
     get_target_property(cmake_generator ${name} _EP_CMAKE_GENERATOR)
     if(cmake_generator)
-      list(APPEND cmd "-G${cmake_generator}" "${source_dir}")
+      list(APPEND cmd "-G${cmake_generator}")
     else()
       if(CMAKE_EXTRA_GENERATOR)
-        list(APPEND cmd "-G${CMAKE_EXTRA_GENERATOR} - ${CMAKE_GENERATOR}"
-          "${source_dir}")
+        list(APPEND cmd "-G${CMAKE_EXTRA_GENERATOR} - ${CMAKE_GENERATOR}")
       else()
-        list(APPEND cmd "-G${CMAKE_GENERATOR}" "${source_dir}")
+        list(APPEND cmd "-G${CMAKE_GENERATOR}")
       endif()
     endif()
+
+    list(APPEND cmd "${source_dir}")
   endif()
 
   # If anything about the configure command changes, (command itself, cmake