[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:46:01 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=8cf3504
The following commit has been merged in the master branch:
commit 8cf3504093ce4036b1aaedda2e78cd9464aa9429
Author: Robin Mills <robin at clanmills.com>
Date: Wed Dec 9 19:22:08 2015 +0000
#1041. Changes to ensure cmakeBuild.cmd selects win32/x64 correctly.
---
contrib/cmake/msvc/cmakeBuild.cmd | 31 +++++++++++++++++++------------
contrib/cmake/msvc/vcvars.bat | 1 -
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/contrib/cmake/msvc/cmakeBuild.cmd b/contrib/cmake/msvc/cmakeBuild.cmd
index 5453b62..4396fc9 100755
--- a/contrib/cmake/msvc/cmakeBuild.cmd
+++ b/contrib/cmake/msvc/cmakeBuild.cmd
@@ -104,14 +104,14 @@ if NOT DEFINED _VS_ (
)
call:echo testing architecture
-if "%PROCESSOR_ARCHITECTURE%" EQU "AMD64" (
- set Platform=x64
- set RawPlatform=x64
- set CpuPlatform=intel64
-) ELSE (
+if "%PROCESSOR_ARCHITECTURE%" EQU "x86" (
set Platform=Win32
set RawPlatform=x86
set CpuPlatform=ia32
+) ELSE (
+ set Platform=x64
+ set RawPlatform=x64
+ set CpuPlatform=intel64
)
call:echo Platform = %Platform% (%RawPlatform%)
@@ -315,21 +315,25 @@ if defined _TEST_ (
rem -----------------------------------------
rem Exit
-:end ::rem end syntax: goto end
+rem end syntax: goto end
+:end
endlocal
exit /b 0
-:error_end ::rem end with an error syntax: call:error_end
+rem end with an error syntax: call:error_end
+:error_end
endlocal
exit /b 1
rem -----------------------------------------
rem Functions
-:echo ::rem echo (or don't if --silent). syntax: call:echo args ...
+rem echo (or don't if --silent). syntax: call:echo args ...
+:echo
if NOT DEFINED _SILENT_ echo %*%
exit /b 0
-:run ::rem run a command. syntax call:run args ...
+rem run a command. syntax call:run args
+:run
if defined _VERBOSE_ (
echo.
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -345,7 +349,8 @@ if DEFINED _PAUSE_ pause
exit /b %_RESULT_%
rem -----------------------------------------
-:buildLib ::rem build a library with CMake. syntax: call:buildLib name cmake-args ...
+rem build a library with CMake. syntax: call:buildLib name cmake-args ...
+:buildLib
cd "%_BUILDDIR_%"
set "LOB=%1"
shift
@@ -380,7 +385,8 @@ popd
exit /b 0
rem -----------------------------------------
-:getOPENSSL ::rem get pre-built openssl binaries syntax: call:getOPENSSL version
+rem get pre-built openssl binaries syntax: call:getOPENSSL version
+:getOPENSSL
cd "%_BUILDDIR_%"
set "LOB=%1-vs%_VS_%"
@@ -415,7 +421,8 @@ popd
exit /b 0
rem -----------------------------------------
-:cltest ::rem this runs the compiler and reports _MSC_VER and sizeof(void*)
+rem this runs the compiler and reports _MSC_VER and sizeof(void*)
+:cltest
pushd "%_EXIV2_%
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list