Modify SVM DLL copy to SMQTK post install

VIAME · Aug 2, 2023 · f79f32e · f79f32e
1 parent f80eec8
commit f79f32e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/cmake/add_project_smqtk.cmake b/cmake/add_project_smqtk.cmake
@@ -63,6 +63,7 @@ ExternalProject_Add_Step(smqtk install_cleanup
   WORKING_DIRECTORY ${VIAME_PACKAGES_DIR}/smqtk
   COMMAND ${CMAKE_COMMAND}
     -DVIAME_CMAKE_DIR:PATH=${VIAME_CMAKE_DIR}
+    -DVIAME_PACKAGES_DIR:PATH=${VIAME_PACKAGES_DIR}
     -DVIAME_BUILD_PREFIX:PATH=${VIAME_BUILD_PREFIX}
     -DVIAME_INSTALL_PREFIX:PATH=${VIAME_INSTALL_PREFIX}
     -DVIAME_ENABLE_SMQTK=${VIAME_ENABLE_SMQTK}

diff --git a/cmake/build_server_windows.bat b/cmake/build_server_windows.bat
@@ -56,10 +56,7 @@ REM ----------------------------------------------------------------------------
 REM Final Install Generation Hacks Until Handled Better in VIAME CMake
 REM -------------------------------------------------------------------------------------------------------
 
-SET MISSING_SVM_DLL=%VIAME_SOURCE_DIR%\packages\smqtk\TPL\libsvm-3.1-custom\libsvm.dll
 SET MISSING_DNET_EXE=%VIAME_BUILD_DIR%\build\src\darknet-build\Release\darknet.exe
-
-MOVE "%MISSING_SVM_DLL%" %VIAME_INSTALL_DIR%\bin
 MOVE "%MISSING_DNET_EXE%" %VIAME_INSTALL_DIR%\bin
 
 COPY "%WIN32_ROOT%\msvcr100.dll" %VIAME_INSTALL_DIR%\bin

diff --git a/cmake/build_server_windows_cpu.bat b/cmake/build_server_windows_cpu.bat
@@ -53,10 +53,7 @@ REM ----------------------------------------------------------------------------
 REM Final Install Generation Hacks Until Handled Better in VIAME CMake
 REM -------------------------------------------------------------------------------------------------------
 
-SET MISSING_SVM_DLL=%VIAME_SOURCE_DIR%\packages\smqtk\TPL\libsvm-3.1-custom\libsvm.dll
 SET MISSING_DNET_EXE=%VIAME_BUILD_DIR%\build\src\darknet-build\Release\darknet.exe
-
-MOVE %MISSING_SVM_DLL% %VIAME_INSTALL_DIR%\bin
 MOVE %MISSING_DNET_EXE% %VIAME_INSTALL_DIR%\bin
 
 COPY %WIN32_ROOT%\msvcr100.dll %VIAME_INSTALL_DIR%\bin

diff --git a/cmake/build_server_windows_msi.bat b/cmake/build_server_windows_msi.bat
@@ -49,9 +49,6 @@ git submodule update --init --recursive
 
 "%CMAKE_ROOT%\bin\ctest.exe" -S jenkins_dashboard.cmake -VV
 
-SET MISSING_SVM_DLL=%VIAME_SOURCE_DIR%\packages\smqtk\TPL\libsvm-3.1-custom\libsvm.dll
-MOVE "%MISSING_SVM_DLL%" %VIAME_INSTALL_DIR%\bin
-
 COPY "%WIN32_ROOT%\msvcr100.dll" %VIAME_INSTALL_DIR%\bin
 COPY "%WIN32_ROOT%\vcruntime140_1.dll" %VIAME_INSTALL_DIR%\bin
 COPY "%WIN64_ROOT%\vcomp140.dll" %VIAME_INSTALL_DIR%\bin

diff --git a/cmake/custom_install_smqtk.cmake b/cmake/custom_install_smqtk.cmake
@@ -26,4 +26,11 @@ if( NOT WIN32 )
                  "${VIAME_INSTALL_PREFIX}/lib/libsvm.so" )
 endif()
 
+set( SVM_DLL_FILE "${VIAME_PACKAGES_DIR}/smqtk/TPL/libsvm-3.1-custom/libsvm.dll" )
+
+if( EXISTS "${SVM_DLL_FILE}" )
+  file( COPY ${SVM_DLL_FILE} DESTINATION ${VIAME_INSTALL_PREFIX}/bin )
+  file( REMOVE "${SVM_DLL_FILE}" )
+endif()
+
 message("Done")