Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Main Repositories
otb
Commits
274c85f8
Commit
274c85f8
authored
Dec 02, 2021
by
Thibaut ROMAIN
Browse files
BUG: fix proj and gdal not correctly built on windows
parent
6fecb97f
Pipeline
#9248
failed with stages
in 127 minutes and 32 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
SuperBuild/CMake/External_proj.cmake
View file @
274c85f8
...
...
@@ -28,11 +28,11 @@ ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(PROJ SQLITE TIFF CURL)
if
(
WIN32
)
set
(
PROJ_URL
"https://download.osgeo.org/proj/proj-6.2.1.tar.gz"
)
set
(
PROJ_MD5 9f874e227d221daf95f7858dc55dfa3e
)
set
(
PROJ_FLAGS -DVERSIONED_OUTPUT:BOOL=FALSE -DPROJ_TESTS:BOOL=OFF
)
set
(
PROJ_FLAGS
-DBUILD_LIBPROJ_SHARED:BOOL=TRUE
-DVERSIONED_OUTPUT:BOOL=FALSE -DPROJ_TESTS:BOOL=OFF
)
else
()
set
(
PROJ_URL
"https://download.osgeo.org/proj/proj-8.1.1.tar.gz"
)
set
(
PROJ_MD5 f017fd7d35311b0d65b2cf0503844690
)
set
(
PROJ_FLAGS -DBUILD_
TESTING:BOOL=OFF
)
set
(
PROJ_FLAGS -DBUILD_
SHARED_LIBS:BOOL=TRUE -DBUILD_TESTING:BOOL=OFF -DENABLE_TIFF:BOOL=ON -DENABLE_CURL:BOOL=ON
)
endif
()
ExternalProject_Add
(
PROJ
...
...
@@ -45,12 +45,9 @@ ExternalProject_Add(PROJ
DOWNLOAD_DIR
${
DOWNLOAD_LOCATION
}
CMAKE_CACHE_ARGS
${
SB_CMAKE_CACHE_ARGS
}
-DBUILD_SHARED_LIBS:BOOL=TRUE
-DBUILD_FRAMEWORKS_AND_BUNDLE:BOOL=FALSE
-DPROJ_LIB_SUBDIR:STRING=lib
-DPROJ_INCLUDE_SUBDIR:STRING=include
-DENABLE_TIFF:BOOL=ON
-DENABLE_CURL:BOOL=ON
${
PROJ_FLAGS
}
CMAKE_COMMAND
${
SB_CMAKE_COMMAND
}
LOG_DOWNLOAD 1
...
...
SuperBuild/patches/GDAL/gdal-1-nmake-win.diff
View file @
274c85f8
--- gdal-3.4.0_orig/nmake.opt 2021-11-04 12:55:37.000000000 +0100
+++ gdal-3.4.0/nmake.opt 2021-11-22 16:22:46.247741400 +0100
@@ -307,9 +307,9 @@
# This will enable 12bit libjpeg, using internal IJG libjpeg-6b in 12-bit mode
# Note: it is possible to have 12bit JPEG support with this internal IJG libjpeg-6b
# and 8bit JPEG support through an external libjpeg, such as libjpeg-turbo
diff -burN gdal-2.4.1_orig/nmake.opt gdal-2.4.1/nmake.opt
--- gdal-2.4.1_orig/nmake.opt 2019-03-15 13:30:03.000000000 +0100
+++ gdal-2.4.1/nmake.opt 2019-04-02 10:57:50.712191315 +0200
@@ -276,9 +276,9 @@
!ENDIF
# This will enable 12bit libjpeg - use only with internal jpeg builds.
-!IFNDEF JPEG12_SUPPORTED
-JPEG12_SUPPORTED = 1
-!ENDIF
...
...
@@ -12,4 +13,4 @@
+#!ENDIF
#if using an external jpeg library uncomment the following lines
#
libjpeg-turbo is also supported (and recommended for better performance)
#
JPEG_EXTERNAL_LIB = 1
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment