[vlc-commits] contrib: soxr/openjpeg: don't explicitely set CMAKE_BUILD_TYPE.

Konstantin Pavlov git at videolan.org
Tue Dec 5 12:03:45 CET 2017


vlc/vlc-3.0 | branch: master | Konstantin Pavlov <thresh at videolan.org> | Tue Dec  5 10:55:50 2017 +0300| [30f556edc2454e2ff94c2dece72c2b4ff76ad732] | committer: Jean-Baptiste Kempf

contrib: soxr/openjpeg: don't explicitely set CMAKE_BUILD_TYPE.

(cherry picked from commit 40489baa4fb9e410c815c47ef9907a285d1ed5d3)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=30f556edc2454e2ff94c2dece72c2b4ff76ad732
---

 contrib/src/openjpeg/rules.mak | 2 +-
 contrib/src/soxr/rules.mak     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/src/openjpeg/rules.mak b/contrib/src/openjpeg/rules.mak
index f9b860008b..4a87bc1dcd 100644
--- a/contrib/src/openjpeg/rules.mak
+++ b/contrib/src/openjpeg/rules.mak
@@ -21,7 +21,7 @@ endif
 
 .openjpeg: openjpeg
 	cd $< && $(HOSTVARS) $(CMAKE) \
-		-DBUILD_SHARED_LIBS:bool=off -DBUILD_PKGCONFIG_FILES=ON -DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_SHARED_LIBS:bool=off -DBUILD_PKGCONFIG_FILES=ON \
 		.
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/soxr/rules.mak b/contrib/src/soxr/rules.mak
index 5c503ef998..8bc9d8f42e 100644
--- a/contrib/src/soxr/rules.mak
+++ b/contrib/src/soxr/rules.mak
@@ -23,7 +23,6 @@ soxr: soxr-$(SOXR_VERSION)-Source.tar.xz .sum-soxr
 .soxr: soxr toolchain.cmake
 	cd $< && $(HOSTVARS_PIC) $(CMAKE) \
 		-DBUILD_SHARED_LIBS=OFF \
-		-DCMAKE_BUILD_TYPE=Release \
 		-DBUILD_EXAMPLES=OFF \
 		-DBUILD_TESTS=OFF \
 		-DWITH_LSR_BINDINGS=OFF \



More information about the vlc-commits mailing list