Move install command to function

ManiVaultStudio · Sep 24, 2024 · 18d7973 · 18d7973
1 parent 9371b1d
commit 18d7973
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/ExampleDependencies/CMakeLists.txt b/ExampleDependencies/CMakeLists.txt
@@ -109,9 +109,6 @@ install(TARGETS ${PROJECT_NAME}
     LIBRARY DESTINATION Plugins COMPONENT PLUGINS # Linux/Mac .so
 )
 
-include(cmake/install_dependencies_utils.cmake)
-install_dependencies(${PROJECT_NAME} "hwy" "hwy_contrib")
-
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E echo "Installing: Plugin files"
     COMMAND "${CMAKE_COMMAND}"
@@ -120,15 +117,11 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
         --component PLUGINS
         --prefix ${ManiVault_INSTALL_DIR}/$<CONFIGURATION>
         --verbose
-    COMMAND ${CMAKE_COMMAND} -E echo "Installing: Plugin dependencies"
-    COMMAND "${CMAKE_COMMAND}"
-        --install ${CMAKE_CURRENT_BINARY_DIR}
-        --config $<CONFIGURATION>
-        --component DEP_PLUGIN_PRINT
-        --prefix ${ManiVault_INSTALL_DIR}/$<CONFIGURATION>
-        --verbose
 )
 
+include(cmake/install_dependencies_utils.cmake)
+install_dependencies(${PROJECT_NAME} "hwy" "hwy_contrib")
+
 # -----------------------------------------------------------------------------
 # Miscellaneous
 # -----------------------------------------------------------------------------

diff --git a/ExampleDependencies/cmake/install_dependencies.cmake.in b/ExampleDependencies/cmake/install_dependencies.cmake.in
@@ -1,7 +1,7 @@
 install(CODE [[
 
     if(WIN32)
-        set(PRE_EXCLUDE ".*[\\/]api-ms.*" ".*[\\/]ext-ms.*" ".*[\\/]hvsi.*" ".*[\\/]pdmutilities.*" ".*[\\/]wpaxholder.*" ".*[\\/]dxgi.*" ".*[\\/]uxtheme.*" ".*[\\/]d3d11.*" ".*[\\/]winmm.*" ".*[\\/]wldp.*")
+        set(PRE_EXCLUDE ".*[\\/]qt.*" ".*[\\/]api-ms.*" ".*[\\/]ext-ms.*" ".*[\\/]hvsi.*" ".*[\\/]pdmutilities.*" ".*[\\/]wpaxholder.*" ".*[\\/]dxgi.*" ".*[\\/]uxtheme.*" ".*[\\/]d3d11.*" ".*[\\/]winmm.*" ".*[\\/]wldp.*")
         set(POST_EXCLUDE ".*[\\/]system32[\\/].*\\.dll")
     elseif(APPLE)
         set(PRE_EXCLUDE "/usr/lib" "/System/")
@@ -36,6 +36,9 @@ install(CODE [[
 
     foreach(FILE ${RESOLVED_DEPS})
         message(STATUS "Resolved: ${FILE}")
+    endforeach()
+
+    foreach(FILE ${RESOLVED_DEPS})
         install_deps(${FILE})
     endforeach()
 
@@ -51,5 +54,5 @@ install(CODE [[
     endif()
 
     ]]
-    COMPONENT DEP_PLUGIN_PRINT
+    COMPONENT PLUGIN_DEPENDENCIES
 )
diff --git a/ExampleDependencies/cmake/install_dependencies_utils.cmake b/ExampleDependencies/cmake/install_dependencies_utils.cmake
@@ -10,4 +10,15 @@ function(install_dependencies main_target)
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/install_dependencies.cmake.in" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/install_dependencies.cmake" @ONLY)
 
     include(cmake/install_dependencies.cmake)
+
+    add_custom_command(TARGET ${main_target} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E echo "Installing: Plugin dependencies"
+    COMMAND "${CMAKE_COMMAND}"
+        --install ${CMAKE_CURRENT_BINARY_DIR}
+        --config $<CONFIGURATION>
+        --component PLUGIN_DEPENDENCIES
+        --prefix ${ManiVault_INSTALL_DIR}/$<CONFIGURATION>
+        --verbose
+    )
+
 endfunction()