Skip to content
Snippets Groups Projects
Commit 83c9b00d authored by Guillaume Pasero's avatar Guillaume Pasero
Browse files

Merge branch 'fix_itk_packaging' into 'release-6.6'

Fix itk packaging

See merge request !83
parents 49722223 fdc5da4c
No related branches found
No related tags found
1 merge request!83Fix itk packaging
......@@ -34,7 +34,6 @@ function(install_importlibs)
#required .lib files in install directory.
file(GLOB import_lib_files
"${SUPERBUILD_INSTALL_DIR}/lib/*.lib"
"${SUPERBUILD_INSTALL_DIR}/bin/itk*.dll"
)
foreach( import_lib_file ${import_lib_files})
install_rule(${import_lib_file})
......
......@@ -89,6 +89,17 @@ function(prepare_file_list file_list_result)
list(APPEND file_list ${otb_test_exe_name})
endif()
endforeach()
# find ITK targets
set(_itk_targets_path
"${SUPERBUILD_INSTALL_DIR}/lib/cmake/ITK-${PKG_ITK_SB_VERSION}")
file(GLOB _itk_targets_config_files "${_itk_targets_path}/ITKTargets-*.cmake")
foreach(f ${_itk_targets_config_files})
file(STRINGS ${f} _f_content REGEX " IMPORTED_LOCATION_[A-Z]+ ")
string(REGEX REPLACE " +IMPORTED_LOCATION_[A-Z]+ \"([^\"]+)\"" "\\1;" _filtered ${_f_content})
string(CONFIGURE "${_filtered}" _configured)
list(APPEND file_list "${_configured}")
endforeach()
# special case for msvc: ucrtbase.dll must be explicitly vetted.
# for proj.dll, see Mantis-1424
......
......@@ -43,6 +43,12 @@ function(process_file_recurse input_file)
message(FATAL_ERROR "${input_file} not found. searched in ${PKG_SEARCHDIRS}")
endif()
get_filename_component(bn_name ${input_file_full_path} NAME)
if(${bn_name}_RESOLVED)
# item already resolved
return()
endif()
if(NOT PKG_DEBUG)
message("Processing ${input_file_full_path}")
endif()
......@@ -67,7 +73,6 @@ function(process_file_recurse input_file)
string(REPLACE ";" "\\;" candidates "${loader_ov}")
string(REPLACE "\n" "${LOADER_REGEX_EOL};" candidates "${candidates}")
get_filename_component(bn_name ${input_file_full_path} NAME)
set(${bn_name}_USED TRUE CACHE INTERNAL "")
if(PKG_DEBUG)
......
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