[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam-software-compilation] project/bundles/3rdparty/ext_exiv2: polish
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2016-12-01 20:22:47
Message-ID: E1cCXsV-0004W3-Bw () code ! kde ! org
[Download RAW message or body]

Git commit 1c60d5f2ae75a94329b0aaae51bfcecb29f1a6e0 by Gilles Caulier.
Committed on 01/12/2016 at 20:22.
Pushed by cgilles into branch 'master'.

polish

M  +1    -2    project/bundles/3rdparty/ext_exiv2/CMakeLists.txt
D  +0    -13   project/bundles/3rdparty/ext_exiv2/exiv2-threads-mxe.patch

https://commits.kde.org/digikam-software-compilation/1c60d5f2ae75a94329b0aaae51bfcecb29f1a6e0

diff --git a/project/bundles/3rdparty/ext_exiv2/CMakeLists.txt \
b/project/bundles/3rdparty/ext_exiv2/CMakeLists.txt index 8230f97..b71eb69 100755
--- a/project/bundles/3rdparty/ext_exiv2/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_exiv2/CMakeLists.txt
@@ -24,8 +24,7 @@ if(MINGW)
         PATCH_COMMAND ${PATCH_COMMAND} -p0 -i ${CMAKE_CURRENT_SOURCE_DIR}/exiv2-trunk.patch &&
                       ${PATCH_COMMAND} -p0 -i ${CMAKE_CURRENT_SOURCE_DIR}/exiv2-threads-mxe.patch
 
-        CONFIGURE_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.mxe <SOURCE_DIR>/. &&
-                          <SOURCE_DIR>/bootstrap.mxe ${MXE_BUILDROOT} relwithdebinfo \
"-DEXIV2_ENABLE_SHARED=ON -DEXIV2_ENABLE_XMP=ON -DEXIV2_ENABLE_LIBXMP=ON -DEXIV2_ENABLE_PNG=ON \
-DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PRINTUCS2=ON -DEXIV2_ENABLE_LENSDATA=ON \
-DEXIV2_ENABLE_COMMERCIAL=OFF -DEXIV2_ENABLE_BUILD_SAMPLES=OFF -DEXIV2_ENABLE_BUILD_PO=OFF \
-DEXIV2_ENABLE_VIDEO=OFF -DEXIV2_ENABLE_WEBREADY=OFF -DEXIV2_ENABLE_CURL=OFF -DEXIV2_ENABLE_SSH=OFF" +    \
CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.mxe ${MXE_BUILDROOT} relwithdebinfo "-DEXIV2_ENABLE_SHARED=ON \
-DEXIV2_ENABLE_XMP=ON -DEXIV2_ENABLE_LIBXMP=ON -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_NLS=OFF \
-DEXIV2_ENABLE_PRINTUCS2=ON -DEXIV2_ENABLE_LENSDATA=ON -DEXIV2_ENABLE_COMMERCIAL=OFF \
-DEXIV2_ENABLE_BUILD_SAMPLES=OFF -DEXIV2_ENABLE_BUILD_PO=OFF -DEXIV2_ENABLE_VIDEO=OFF \
-DEXIV2_ENABLE_WEBREADY=OFF -DEXIV2_ENABLE_CURL=OFF -DEXIV2_ENABLE_SSH=OFF"  
         BUILD_COMMAND cd <SOURCE_DIR>/build && make -j
 
diff --git a/project/bundles/3rdparty/ext_exiv2/exiv2-threads-mxe.patch \
b/project/bundles/3rdparty/ext_exiv2/exiv2-threads-mxe.patch deleted file mode 100644
index 1f28013..0000000
--- a/project/bundles/3rdparty/ext_exiv2/exiv2-threads-mxe.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt	(revision 4688)
-+++ CMakeLists.txt	(working copy)
-@@ -116,7 +116,7 @@
- IF( EXIV2_ENABLE_XMP )
-     SET( HAVE_XMP_TOOLKIT ON )
-     SET( XMPLIB "do" )
--    set(THREADS_PREFER_PTHREAD_FLAG ON)
-+#    set(THREADS_PREFER_PTHREAD_FLAG ON)
-     find_package(Threads REQUIRED)
- ENDIF( EXIV2_ENABLE_XMP )
- 


[prev in list] [next in list] [prev in thread] [next in thread]