[vlc-commits] contrib: cmake: set the Debug/Release target for all operating systems.

[Konstantin Pavlov]

vlc/vlc-3.0 | branch: master | Konstantin Pavlov <thresh at videolan.org> | Tue Dec  5 11:17:54 2017 +0300| [d9315fcbc21f194c3af280f9c8f5555c314e4218] | committer: Jean-Baptiste Kempf

contrib: cmake: set the Debug/Release target for all operating systems.

Previously it was under HAVE_WIN32, which is probably not what was
intended.

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

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

 contrib/src/main.mak | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 7fb8f9bff4..e423b1641f 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -458,6 +458,11 @@ help:
 # CMake toolchain
 toolchain.cmake:
 	$(RM) $@
+ifndef WITH_OPTIMIZATION
+	echo "set(CMAKE_BUILD_TYPE Debug)" >> $@
+else
+	echo "set(CMAKE_BUILD_TYPE Release)" >> $@
+endif
 ifdef HAVE_WIN32
 ifdef HAVE_WINDOWSPHONE
 	echo "set(CMAKE_SYSTEM_NAME WindowsPhone)" >> $@
@@ -468,11 +473,6 @@ else
 	echo "set(CMAKE_SYSTEM_NAME Windows)" >> $@
 endif
 endif
-ifndef WITH_OPTIMIZATION
-	echo "set(CMAKE_BUILD_TYPE Debug)" >> $@
-else
-	echo "set(CMAKE_BUILD_TYPE Release)" >> $@
-endif
 ifdef HAVE_CROSS_COMPILE
 	echo "set(CMAKE_RC_COMPILER $(HOST)-windres)" >> $@
 endif