Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main Repositories
otb
Commits
83c9b00d
Commit
83c9b00d
authored
6 years ago
by
Guillaume Pasero
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix_itk_packaging' into 'release-6.6'
Fix itk packaging See merge request
!83
parents
49722223
fdc5da4c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!83
Fix itk packaging
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Packaging/install_importlibs.cmake
+0
-1
0 additions, 1 deletion
Packaging/install_importlibs.cmake
Packaging/prepare_file_list.cmake
+11
-0
11 additions, 0 deletions
Packaging/prepare_file_list.cmake
Packaging/process_file_recurse.cmake
+6
-1
6 additions, 1 deletion
Packaging/process_file_recurse.cmake
with
17 additions
and
2 deletions
Packaging/install_importlibs.cmake
+
0
−
1
View file @
83c9b00d
...
...
@@ -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
}
)
...
...
This diff is collapsed.
Click to expand it.
Packaging/prepare_file_list.cmake
+
11
−
0
View file @
83c9b00d
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Packaging/process_file_recurse.cmake
+
6
−
1
View file @
83c9b00d
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment