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
b5b8940d
Commit
b5b8940d
authored
9 years ago
by
Rashad Kanavath
Browse files
Options
Downloads
Patches
Plain Diff
copy otbgui* scripts into mingw package
parent
11e0d7f2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMake/MinGWPackage.cmake
+5
-5
5 additions, 5 deletions
CMake/MinGWPackage.cmake
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
with
7 additions
and
7 deletions
CMake/MinGWPackage.cmake
+
5
−
5
View file @
b5b8940d
macro
(
package_mingw
)
cmake_parse_arguments
(
PACKAGE
""
"PREFIX_DIR;ARCH;MXEROOT;
USE_QT4
"
"SEARCHDIRS;PEFILES"
${
ARGN
}
)
cmake_parse_arguments
(
PACKAGE
""
"PREFIX_DIR;ARCH;MXEROOT;
WITH_OTBGUI
"
"SEARCHDIRS;PEFILES"
${
ARGN
}
)
list
(
APPEND PACKAGE_PEFILES
${
CMAKE_INSTALL_PREFIX
}
/bin/otbApplicationLauncherCommandLine.exe
)
list
(
APPEND PACKAGE_PEFILES
${
CMAKE_INSTALL_PREFIX
}
/bin/otbTestDriver.exe
)
if
(
PACKAGE_
USE_QT4
)
if
(
PACKAGE_
WITH_OTBGUI
)
list
(
APPEND PACKAGE_PEFILES
${
CMAKE_INSTALL_PREFIX
}
/bin/otbApplicationLauncherQt.exe
)
endif
()
...
...
@@ -21,7 +21,7 @@ macro(package_mingw)
list
(
APPEND PACKAGE_SEARCHDIRS
"
${
CMAKE_INSTALL_PREFIX
}
/bin"
)
#mvd
list
(
APPEND PACKAGE_SEARCHDIRS
"
${
CMAKE_INSTALL_PREFIX
}
/lib/otb/applications"
)
#otb apps
install_common
()
install_common
(
${
PACKAGE_WITH_OTBGUI
}
)
file
(
GLOB otbapps_list
${
CMAKE_INSTALL_PREFIX
}
/lib/otb/applications/otbapp_*dll
)
# /lib/otb
list
(
APPEND PACKAGE_PEFILES
${
otbapps_list
}
)
...
...
@@ -136,7 +136,7 @@ function(process_deps infile)
endif
()
endfunction
()
function
(
install_common
)
function
(
install_common
with_otbgui
)
set
(
APP_PREFIX_DIR
"
${
PACKAGE_PREFIX_DIR
}
"
)
set
(
APP_BIN_DIR
"
${
APP_PREFIX_DIR
}
/bin"
)
set
(
APP_OTBLIBS_DIR
"
${
APP_PREFIX_DIR
}
/lib/otb"
)
...
...
@@ -172,7 +172,7 @@ function(install_common)
DESTINATION
${
APP_BIN_DIR
}
)
endforeach
()
if
(
OTB_USE_QT4
)
if
(
with_otbgui
)
file
(
GLOB GUI_SCRIPTS
${
CMAKE_INSTALL_PREFIX
}
/bin/otbgui*
)
foreach
(
GUI_SCRIPT
${
GUI_SCRIPTS
}
)
install
(
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
2
−
2
View file @
b5b8940d
...
...
@@ -439,7 +439,7 @@ if(WIN32 AND CMAKE_CROSSCOMPILING)
MXEROOT
\"
${
mxeroot
}
\"
PREFIX_DIR
\"
${
archive_name
}
\"
PEFILES
\"
${
pefiles
}
\"
USE_QT4
1
WITH_OTBGUI
1
SEARCHDIRS
\"\"
)"
)
add_custom_target
(
configure-mingw
...
...
@@ -456,7 +456,7 @@ if(WIN32 AND CMAKE_CROSSCOMPILING)
find_program
(
ZIP_EXECUTABLE zip
)
if
(
ZIP_EXECUTABLE
)
add_custom_target
(
package
-mingw
add_custom_target
(
package
s
COMMAND
${
ZIP_EXECUTABLE
}
"-r"
"
${
CMAKE_BINARY_DIR
}
/
${
archive_name
}
.zip"
"
${
archive_name
}
"
WORKING_DIRECTORY
"
${
CMAKE_INSTALL_PREFIX
}
"
DEPENDS prepare-mingw
)
...
...
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