Move cmd to secondary step

VIAME · Aug 1, 2023 · 3c86d10 · 3c86d10
1 parent d23b20b
commit 3c86d10
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/cmake/add_project_viame.cmake b/cmake/add_project_viame.cmake
@@ -36,13 +36,6 @@ ExternalProject_Add(viame
   SOURCE_DIR ${CMAKE_SOURCE_DIR}
   BINARY_DIR ${VIAME_BUILD_PLUGINS_DIR}
   USES_TERMINAL_BUILD 1
-  PATCH_COMMAND ${CMAKE_COMMAND}
-    -DVIAME_CMAKE_DIR:PATH=${VIAME_CMAKE_DIR}
-    -DVIAME_INSTALL_PREFIX:PATH=${VIAME_INSTALL_PREFIX}
-    -DPYTHON_VERSION_STRING=${VIAME_PYTHON_STRING}
-    -DPYTHON_MAJOR_VERSION=${Python_VERSION_MAJOR}
-    -DPYTHON_MINOR_VERSION=${Python_VERSION_MINOR}
-    -P ${VIAME_SOURCE_DIR}/cmake/custom_patch_viame.cmake
   CMAKE_GENERATOR ${gen}
   CMAKE_CACHE_ARGS
     ${VIAME_ARGS_COMMON}
@@ -73,6 +66,19 @@ ExternalProject_Add(viame
   INSTALL_DIR ${VIAME_INSTALL_PREFIX}
   )
 
+ExternalProject_Add_Step(viame restructure_python
+  WORKING_DIRECTORY ${VIAME_PACKAGES_DIR}/viame
+  COMMAND ${CMAKE_COMMAND}
+    -DVIAME_CMAKE_DIR:PATH=${VIAME_CMAKE_DIR}
+    -DVIAME_INSTALL_PREFIX:PATH=${VIAME_INSTALL_PREFIX}
+    -DPYTHON_VERSION_STRING=${VIAME_PYTHON_STRING}
+    -DPYTHON_MAJOR_VERSION=${Python_VERSION_MAJOR}
+    -DPYTHON_MINOR_VERSION=${Python_VERSION_MINOR}
+    -P ${VIAME_SOURCE_DIR}/cmake/custom_patch_viame.cmake
+  COMMENT "Patching VIAME python dependency install directories"
+  DEPENDEES build
+  )
+
 #if ( VIAME_FORCEBUILD )
 ExternalProject_Add_Step(viame forcebuild
   COMMAND ${CMAKE_COMMAND}

diff --git a/cmake/custom_patch_viame.cmake b/cmake/custom_patch_viame.cmake
@@ -1,4 +1,4 @@
-message( "Patching VIAME python dependency install directories" )
+#message( "Patching VIAME python dependency install directories" )
 
 # Move any misinstalled python files
 if( PYTHON_VERSION_STRING )