Skip to content
Snippets Groups Projects
Commit a78143b9 authored by Tristan Laurent's avatar Tristan Laurent
Browse files

CI: force XDK_INSTALL_PATH cmake option for windows build

parent 1ba6ebfc
No related branches found
No related tags found
1 merge request!1053Remove/update old windows files and remove travis ones
Pipeline #16375 passed
......@@ -37,3 +37,12 @@ OTB_USE_OPENCV:BOOL=ON
OTB_USE_OPENMP:BOOL=OFF
OTB_USE_SHARK:BOOL=ON
")
# As windows have a dumb dynamic linkage system, we need to use
# the XDK_INSTALL_PATH option to ensure dlls are copied from xdk to otb bin
# folder
if(XDK_INSTALL_PATH)
set(site_option
"XDK_INSTALL_PATH=${XDK_INSTALL_PATH}
${site_option}")
endif()
......@@ -394,12 +394,6 @@ if(XDK_INSTALL_PATH)
DESTINATION .
USE_SOURCE_PERMISSIONS
COMPONENT Core)
if (WIN32)
install(DIRECTORY ${XDK_INSTALL_PATH}/bin
DESTINATION ${OTB_INSTALL_PREFIX}
USE_SOURCE_PERMISSIONS
COMPONENT Core)
endif()
install(DIRECTORY ${XDK_INSTALL_PATH}/cmake
DESTINATION ./lib
USE_SOURCE_PERMISSIONS
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment