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
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Julien Cabieces
otb
Commits
e0f3db1e
Commit
e0f3db1e
authored
9 years ago
by
Rashad Kanavath
Browse files
Options
Downloads
Patches
Plain Diff
PKG: fixup mxe gcc dir and list of system dlls exceptions
parent
9808e5f6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMake/MinGWPackage.cmake
+35
-33
35 additions, 33 deletions
CMake/MinGWPackage.cmake
with
35 additions
and
33 deletions
CMake/MinGWPackage.cmake
+
35
−
33
View file @
e0f3db1e
...
...
@@ -15,6 +15,8 @@ macro(package_mingw)
set
(
MXE_OBJDUMP
"
${
PACKAGE_MXEROOT
}
/usr/bin/x86_64-w64-mingw32.shared-objdump"
)
endif
()
file
(
GLOB MXE_GCC_LIB_DIR
"
${
MXE_BIN_DIR
}
/gcc*"
)
list
(
APPEND PACKAGE_SEARCHDIRS
${
MXE_GCC_LIB_DIR
}
)
list
(
APPEND PACKAGE_SEARCHDIRS
${
MXE_BIN_DIR
}
)
list
(
APPEND PACKAGE_SEARCHDIRS
"
${
MXE_BIN_DIR
}
/../qt/bin"
)
#Qt
list
(
APPEND PACKAGE_SEARCHDIRS
"
${
MXE_BIN_DIR
}
/../qt/lib"
)
#Qwt
...
...
@@ -42,39 +44,35 @@ macro(package_mingw)
endmacro
(
package_mingw
)
SET
(
SYSTEM_DLLS
set
(
SYSTEM_DLLS
msvc.*dll
USER
32.dll
GDI
32.dll
SHELL32.DLL
KERNEL
32.dll
ADVAPI
32.dll
CRYPT
32.dll
WS
2_32.dll
user
32.dll
gdi
32.dll
shell32.dll
kernel
32.dll
advapi
32.dll
crypt
32.dll
ws
2_32.dll
wldap32.dll
ole32.dll
OPENGL32.DLL
GLU32.DLL
COMDLG32.DLL
IMM32.DLL
OLEAUT32.dll
COMCTL32.DLL
WINMM.DLL
SHELL32.dll
WLDAP32.dll
OPENGL32.dll
GLU32.dll
opengl32.dll
glu32.dll
comdlg32.dll
IMM32.dll
WINMM.dll
WINSPOOL.DRV
)
## http://www.cmake.org/Wiki/CMakeMacroListOperations
macro
(
IS_SYSTEM_DLL matched value
)
imm32.dll
oleaut32.dll
comctl32.dll
winmm.dll
shfolder.dll
secur32.dll
wsock32.dll
winspool.drv
)
macro
(
is_system_dll matched value
)
set
(
${
matched
}
)
string
(
TOLOWER
${
value
}
value_
)
foreach
(
pattern
${
SYSTEM_DLLS
}
)
if
(
${
value
}
MATCHES
${
pattern
}
)
string
(
TOLOWER
${
pattern
}
pattern_
)
if
(
${
value_
}
MATCHES
${
pattern_
}
)
set
(
${
matched
}
TRUE
)
endif
()
endforeach
()
...
...
@@ -90,9 +88,7 @@ macro(list_contains var value)
endmacro
()
function
(
process_deps infile
)
get_filename_component
(
bn
${
infile
}
NAME
)
list_contains
(
contains
"
${
bn
}
"
"
${
alldlls
}
"
)
if
(
NOT contains
)
set
(
DLL_FOUND FALSE
)
...
...
@@ -100,14 +96,20 @@ function(process_deps infile)
if
(
NOT DLL_FOUND
)
if
(
EXISTS
${
SEARCHDIR
}
/
${
infile
}
)
set
(
DLL_FOUND TRUE
)
else
()
string
(
TOLOWER
${
infile
}
infile_lower
)
if
(
EXISTS
${
SEARCHDIR
}
/
${
infile_lower
}
)
set
(
DLL_FOUND TRUE
)
set
(
infile
${
infile_lower
}
)
endif
()
endif
()
if
(
DLL_FOUND
)
message
(
STATUS
"Processing
${
SEARCHDIR
}
/
${
infile
}
"
)
if
(
NOT
"
${
infile
}
"
MATCHES
"otbapp"
)
install
(
FILES
"
${
SEARCHDIR
}
/
${
infile
}
"
install
(
FILES
"
${
SEARCHDIR
}
/
${
infile
}
"
DESTINATION
${
PACKAGE_PREFIX_DIR
}
/bin
)
else
()
##message(STATUS "skipping..${infile}")
endif
()
if
(
NOT EXISTS
${
MXE_OBJDUMP
}
)
message
(
FATAL_ERROR
"objdump executable not found. please check MXE_OBJDUMP is set to correct cross compiled executable"
)
...
...
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