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
@CSSI_OTB
otb
Commits
6b4f8fca
Commit
6b4f8fca
authored
9 years ago
by
Rashad Kanavath
Browse files
Options
Downloads
Patches
Plain Diff
PKG: unix: set different INSTALL_PREFIX to same value
parent
9f5d455f
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
SuperBuild/CMake/PackageHelper.cmake
+3
-3
3 additions, 3 deletions
SuperBuild/CMake/PackageHelper.cmake
SuperBuild/CMake/Package_Macro.cmake
+3
-3
3 additions, 3 deletions
SuperBuild/CMake/Package_Macro.cmake
SuperBuild/Packaging/CMakeLists.txt
+1
-0
1 addition, 0 deletions
SuperBuild/Packaging/CMakeLists.txt
with
7 additions
and
6 deletions
SuperBuild/CMake/PackageHelper.cmake
+
3
−
3
View file @
6b4f8fca
...
...
@@ -156,7 +156,7 @@ function(install_common include_mvd)
install
(
FILES
${
ENV_SOURCE_FILE
}
DESTINATION
${
PKG_STAGE_DIR
}
)
endif
()
endforeach
()
set
(
PKG_OTB_SHARE_SOURCE_DIR
"
${
CMAKE
_INSTALL_PREFIX
}
/share"
)
set
(
PKG_OTB_SHARE_SOURCE_DIR
"
${
PKG
_INSTALL_PREFIX
}
/share"
)
endif
()
####################### install cli and gui scripts ###########################
file
(
GLOB PKG_APP_SCRIPTS
...
...
@@ -288,8 +288,8 @@ function(install_monteverdi_files)
endfunction
()
macro
(
empty_package_staging_directory
)
message
(
STATUS
"Empty package staging directory:
${
CMAKE
_INSTALL_PREFIX
}
/
${
PKG_STAGE_DIR
}
"
)
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-E remove_directory
"
${
CMAKE
_INSTALL_PREFIX
}
/
${
PKG_STAGE_DIR
}
"
)
message
(
STATUS
"Empty package staging directory:
${
PKG
_INSTALL_PREFIX
}
/
${
PKG_STAGE_DIR
}
"
)
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-E remove_directory
"
${
PKG
_INSTALL_PREFIX
}
/
${
PKG_STAGE_DIR
}
"
)
endmacro
()
#NOTE:
...
...
This diff is collapsed.
Click to expand it.
SuperBuild/CMake/Package_Macro.cmake
+
3
−
3
View file @
6b4f8fca
...
...
@@ -15,8 +15,8 @@ macro(superbuild_package)
include
(
GetPrerequisites
)
set
(
DEPENDENCIES_INSTALL_DIR
${
SB
_INSTALL_PREFIX
}
)
set
(
OTB_INSTALL_DIR
${
SB
_INSTALL_PREFIX
}
)
set
(
DEPENDENCIES_INSTALL_DIR
${
PKG
_INSTALL_PREFIX
}
)
set
(
OTB_INSTALL_DIR
${
PKG
_INSTALL_PREFIX
}
)
set
(
PKG_SEARCHDIRS
)
set
(
OTB_APPLICATIONS_DIR
"
${
OTB_INSTALL_DIR
}
/lib/otb/applications"
)
...
...
@@ -58,7 +58,7 @@ macro(superbuild_package)
if
(
UNIX
)
if
(
NOT APPLE
)
####################### install patchelf #####################
install
(
FILES
${
SB
_INSTALL_PREFIX
}
/tools/patchelf
install
(
FILES
${
PKG
_INSTALL_PREFIX
}
/tools/patchelf
DESTINATION
${
PKG_STAGE_DIR
}
/tools
PERMISSIONS
OWNER_EXECUTE OWNER_WRITE OWNER_READ
...
...
This diff is collapsed.
Click to expand it.
SuperBuild/Packaging/CMakeLists.txt
+
1
−
0
View file @
6b4f8fca
...
...
@@ -76,6 +76,7 @@ foreach(PACKAGE ${PACKAGE_LIST})
file
(
WRITE
"
${
PACKAGE_PROJECT_DIR
}
/src/PACKAGE-
${
PACKAGE
}
/CMakeLists.txt"
"cmake_minimum_required(VERSION 2.6)
include(CMakeParseArguments)
set(PKG_INSTALL_PREFIX
\"
${
SB_INSTALL_PREFIX
}
\"
)
set(CMAKE_INSTALL_PREFIX
\"
${
SB_INSTALL_PREFIX
}
\"
)
set(DOWNLOAD_LOCATION
\"
${
DOWNLOAD_LOCATION
}
\"
)
set(PACKAGE_SUPPORT_FILES_DIR
\"
${
CMAKE_CURRENT_SOURCE_DIR
}
\"
)
...
...
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