Commit fe2f4a50 authored by jbrossar's avatar jbrossar
Browse files

[WIP] Remove GEOTIFF_CSV var

parent 042e4ba7
Pipeline #7057 canceled with stage
...@@ -97,7 +97,7 @@ if(NOT EXISTS "${GDAL_DATA}/epsg.wkt") ...@@ -97,7 +97,7 @@ if(NOT EXISTS "${GDAL_DATA}/epsg.wkt")
message(FATAL_ERROR "espg.wkt not found in '${GDAL_DATA}'") message(FATAL_ERROR "espg.wkt not found in '${GDAL_DATA}'")
endif() endif()
set(GEOTIFF_CSV ${GDAL_INSTALL_DIR}/share/epsg_csv) #set(GEOTIFF_CSV ${GDAL_INSTALL_DIR}/share/epsg_csv)
#for build tree #for build tree
set(MY_MAJA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}) set(MY_MAJA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
...@@ -129,7 +129,7 @@ install(FILES ${MAJA_BINARY_DIR}/bin/majaenv_install_tree.sh ...@@ -129,7 +129,7 @@ install(FILES ${MAJA_BINARY_DIR}/bin/majaenv_install_tree.sh
set(MY_MAJA_INSTALL_DIR "OUT_DIR") set(MY_MAJA_INSTALL_DIR "OUT_DIR")
set(GDAL_INSTALL_DIR "OUT_DIR") set(GDAL_INSTALL_DIR "OUT_DIR")
set(GDAL_DATA "OUT_DIR/share/gdal") set(GDAL_DATA "OUT_DIR/share/gdal")
set(GEOTIFF_CSV "OUT_DIR/share/epsg_csv") #set(GEOTIFF_CSV "OUT_DIR/share/epsg_csv")
set(MY_MAJA_APP_DIR "${MAJA_INSTALL_DIR}/lib/applications") set(MY_MAJA_APP_DIR "${MAJA_INSTALL_DIR}/lib/applications")
set(MY_MAJA_PYTHON_DIR "${MAJA_INSTALL_DIR}/lib/python") set(MY_MAJA_PYTHON_DIR "${MAJA_INSTALL_DIR}/lib/python")
set(MY_MAJA_LIB_DIR "${MAJA_INSTALL_DIR}/lib") set(MY_MAJA_LIB_DIR "${MAJA_INSTALL_DIR}/lib")
......
...@@ -50,7 +50,7 @@ export PATH=@MY_MAJA_PATH_DIRS@:$PATH ...@@ -50,7 +50,7 @@ export PATH=@MY_MAJA_PATH_DIRS@:$PATH
export LC_NUMERIC=C export LC_NUMERIC=C
export GDAL_DATA=@GDAL_DATA@ export GDAL_DATA=@GDAL_DATA@
export GEOTIFF_CSV=@GEOTIFF_CSV@ #export GEOTIFF_CSV=@GEOTIFF_CSV@
export GDAL_DRIVER_PATH=disable export GDAL_DRIVER_PATH=disable
export MAJA_INSTALL_DIR=@MY_MAJA_INSTALL_DIR@ export MAJA_INSTALL_DIR=@MY_MAJA_INSTALL_DIR@
......
...@@ -35,7 +35,7 @@ function(install_share_dirs) ...@@ -35,7 +35,7 @@ function(install_share_dirs)
install_without_message("${GDAL_DATA_DIR}" "share" ) install_without_message("${GDAL_DATA_DIR}" "share" )
####################### install GeoTIFF data ######################## ####################### install GeoTIFF data ########################
install_without_message("${PKG_SHARE_SOURCE_DIR}/epsg_csv" "share" ) #install_without_message("${PKG_SHARE_SOURCE_DIR}/epsg_csv" "share" )
####################### install OSSIM data ########################## ####################### install OSSIM data ##########################
install_without_message("${PKG_SHARE_SOURCE_DIR}/ossim" "share" ) install_without_message("${PKG_SHARE_SOURCE_DIR}/ossim" "share" )
......
...@@ -33,7 +33,7 @@ macro(installer_files) ...@@ -33,7 +33,7 @@ macro(installer_files)
set(GDAL_INSTALL_DIR "OUT_DIR") set(GDAL_INSTALL_DIR "OUT_DIR")
set(MY_MAJA_INSTALL_DIR "OUT_DIR") set(MY_MAJA_INSTALL_DIR "OUT_DIR")
set(GDAL_DATA "OUT_DIR/share/gdal") set(GDAL_DATA "OUT_DIR/share/gdal")
set(GEOTIFF_CSV "OUT_DIR/share/epsg_csv") #set(GEOTIFF_CSV "OUT_DIR/share/epsg_csv")
set(MY_MAJA_APP_DIR "OUT_DIR/lib/applications") set(MY_MAJA_APP_DIR "OUT_DIR/lib/applications")
set(MY_MAJA_PYTHON_DIR "OUT_DIR//lib/python") set(MY_MAJA_PYTHON_DIR "OUT_DIR//lib/python")
set(MY_MAJA_LIB_DIR "OUT_DIR//lib") set(MY_MAJA_LIB_DIR "OUT_DIR//lib")
......
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