Commit 6b4f8fca authored by Rashad Kanavath's avatar Rashad Kanavath
Browse files

PKG: unix: set different INSTALL_PREFIX to same value

parent 9f5d455f
......@@ -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:
......
......@@ -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
......
......@@ -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}\")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment