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
Antoine Belvire
otb
Commits
adc8bb49
Commit
adc8bb49
authored
9 years ago
by
Rashad Kanavath
Browse files
Options
Downloads
Patches
Plain Diff
COMP: another incorrect OTB_DIR in Packaging/Windows
parent
de971e71
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
Packaging/Windows/CMakeLists.txt
+6
-7
6 additions, 7 deletions
Packaging/Windows/CMakeLists.txt
with
6 additions
and
7 deletions
Packaging/Windows/CMakeLists.txt
+
6
−
7
View file @
adc8bb49
...
@@ -51,14 +51,14 @@ if(NOT OTB_APPS_LIST)
...
@@ -51,14 +51,14 @@ if(NOT OTB_APPS_LIST)
message
(
FATAL_ERROR
"No OTB-applications detected"
)
message
(
FATAL_ERROR
"No OTB-applications detected"
)
endif
()
endif
()
# Install the applications
# Install the applications
install
(
FILES
${
OTB_APPS_LIST
}
install
(
FILES
${
OTB_APPS_LIST
}
DESTINATION lib/otb/applications
DESTINATION lib/otb/applications
COMPONENT Runtime
)
COMPONENT Runtime
)
# Retrieve the name of all the applications available
# Retrieve the name of all the applications available
foreach
(
APP
${
OTB_APPS_LIST
}
)
foreach
(
APP
${
OTB_APPS_LIST
}
)
string
(
REPLACE
${
OTB_DIR
}
/applications/
""
APP_NAME
${
APP
}
)
string
(
REPLACE
${
OTB_DIR
}
/
../../otb/
applications/
""
APP_NAME
${
APP
}
)
list
(
APPEND OTB_APPS_NAME_LIST
${
APP_NAME
}
)
list
(
APPEND OTB_APPS_NAME_LIST
${
APP_NAME
}
)
endforeach
(
APP
)
endforeach
(
APP
)
...
@@ -67,7 +67,7 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/BundleFixing.cmake.in
...
@@ -67,7 +67,7 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/BundleFixing.cmake.in
${
CMAKE_CURRENT_BINARY_DIR
}
/BundleFixing.cmake
${
CMAKE_CURRENT_BINARY_DIR
}
/BundleFixing.cmake
@ONLY
)
@ONLY
)
#Use the configured file with the list of apps
#Use the configured file with the list of apps
# Gather all dlls from which Monteverdi depends, and put them aside the executable
# Gather all dlls from which Monteverdi depends, and put them aside the executable
# For this to work, the necessary DLL must be in PATH
# For this to work, the necessary DLL must be in PATH
install
(
SCRIPT
${
CMAKE_CURRENT_BINARY_DIR
}
/BundleFixing.cmake
install
(
SCRIPT
${
CMAKE_CURRENT_BINARY_DIR
}
/BundleFixing.cmake
...
@@ -88,7 +88,7 @@ set(MVD2_ADDITIONNAL_DLLS
...
@@ -88,7 +88,7 @@ set(MVD2_ADDITIONNAL_DLLS
${
OSGEO4W_ROOT
}
/bin/msvcp71.dll
${
OSGEO4W_ROOT
}
/bin/msvcp71.dll
${
OSGEO4W_ROOT
}
/bin/msvcr71.dll
${
OSGEO4W_ROOT
}
/bin/msvcr71.dll
${
OSGEO4W_ROOT
}
/bin/msvcrt.dll
)
${
OSGEO4W_ROOT
}
/bin/msvcrt.dll
)
# Since an upgrade in OSGeo4W-32bit of libpq (around 2013/10)
# Since an upgrade in OSGeo4W-32bit of libpq (around 2013/10)
# libpq depends on two additional libs that cmake
# libpq depends on two additional libs that cmake
# surprisingly miss during package generation
# surprisingly miss during package generation
...
@@ -118,7 +118,7 @@ install(DIRECTORY ${GDAL_DATA}
...
@@ -118,7 +118,7 @@ install(DIRECTORY ${GDAL_DATA}
install
(
FILES
${
QT_TRANSLATIONS_FILES
}
install
(
FILES
${
QT_TRANSLATIONS_FILES
}
DESTINATION share/qt4/translations
DESTINATION share/qt4/translations
COMPONENT Resources
)
COMPONENT Resources
)
install
(
FILES
${
QT_PLUGINS_DIR
}
/sqldrivers/qsqlite4.dll
install
(
FILES
${
QT_PLUGINS_DIR
}
/sqldrivers/qsqlite4.dll
DESTINATION lib/qt4/plugins/sqldrivers/
DESTINATION lib/qt4/plugins/sqldrivers/
COMPONENT Runtime
)
COMPONENT Runtime
)
...
@@ -126,8 +126,7 @@ install(FILES ${QT_PLUGINS_DIR}/sqldrivers/qsqlite4.dll
...
@@ -126,8 +126,7 @@ install(FILES ${QT_PLUGINS_DIR}/sqldrivers/qsqlite4.dll
install
(
FILES qt.conf
install
(
FILES qt.conf
DESTINATION bin
DESTINATION bin
COMPONENT Resources
)
COMPONENT Resources
)
install
(
FILES
${
Monteverdi2_SOURCE_DIR
}
/Packaging/Windows/monteverdi2.bat
install
(
FILES
${
Monteverdi2_SOURCE_DIR
}
/Packaging/Windows/monteverdi2.bat
DESTINATION bin
DESTINATION bin
COMPONENT Runtime
)
COMPONENT Runtime
)
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