| 1 |
scarabeus 09/09/29 09:33:55 |
| 2 |
|
| 3 |
Added: 0.4.0-cmake.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
(Portage version: 2.2_rc38/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-text/wv2/files/0.4.0-cmake.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/wv2/files/0.4.0-cmake.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/wv2/files/0.4.0-cmake.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 0.4.0-cmake.patch |
| 15 |
=================================================================== |
| 16 |
diff -urN wv2-0.4.0.old/CMakeLists.txt wv2-0.4.0/CMakeLists.txt |
| 17 |
--- wv2-0.4.0.old/CMakeLists.txt 2009-08-26 23:46:40.000000000 +0200 |
| 18 |
+++ wv2-0.4.0/CMakeLists.txt 2009-09-29 11:21:50.000000000 +0200 |
| 19 |
@@ -29,10 +29,10 @@ |
| 20 |
SET( ICONV_REQUIRES_CONST ${ICONV_SECOND_ARGUMENT_IS_CONST} ) |
| 21 |
ENDIF( ICONV_FOUND ) |
| 22 |
|
| 23 |
-OPTION( WITHOUT_ZLIB "Build wv2 without zlib (without compression features)" OFF ) |
| 24 |
-IF( NOT WITHOUT_ZLIB ) |
| 25 |
+OPTION( WITH_ZLIB "Build wv2 with zlib (with compression features)" ON ) |
| 26 |
+IF( WITH_ZLIB ) |
| 27 |
FIND_PACKAGE( ZLIB REQUIRED ) |
| 28 |
-ENDIF( NOT WITHOUT_ZLIB ) |
| 29 |
+ENDIF( WITH_ZLIB ) |
| 30 |
|
| 31 |
INCLUDE_DIRECTORIES( ${GLIB2_INCLUDE_DIR} ${LIBGSF_INCLUDE_DIR} ${ICONV_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ) |
| 32 |
|
| 33 |
@@ -129,9 +129,9 @@ |
| 34 |
TRY_RUN( MODERN_ZLIB_RUN MODERN_ZLIB_COMPILE ${wvWare_BINARY_DIR}/CMakeTmp ${wvWare_SOURCE_DIR}/cmake/TestModernZlib.c ) |
| 35 |
ENDIF( ZLIB_HAS_INFLATE ) |
| 36 |
|
| 37 |
-IF( MODERN_ZLIB_RUN GREATER 0 AND NOT WITHOUT_ZLIB ) |
| 38 |
+IF( MODERN_ZLIB_RUN GREATER 0 AND WITH_ZLIB ) |
| 39 |
MESSAGE( FATAL_ERROR "Your version of zlib is too old for wv2" ) |
| 40 |
-ENDIF( MODERN_ZLIB_RUN GREATER 0 AND NOT WITHOUT_ZLIB ) |
| 41 |
+ENDIF( MODERN_ZLIB_RUN GREATER 0 AND WITH_ZLIB ) |
| 42 |
|
| 43 |
# |
| 44 |
# Set cflags and ldflags |
| 45 |
diff -urN wv2-0.4.0.old/src/CMakeLists.txt wv2-0.4.0/src/CMakeLists.txt |
| 46 |
--- wv2-0.4.0.old/src/CMakeLists.txt 2009-08-26 23:46:40.000000000 +0200 |
| 47 |
+++ wv2-0.4.0/src/CMakeLists.txt 2009-09-29 11:20:05.000000000 +0200 |
| 48 |
@@ -90,11 +90,11 @@ |
| 49 |
INSTALL( TARGETS wv2 |
| 50 |
EXPORT wvWare |
| 51 |
RUNTIME DESTINATION bin |
| 52 |
- LIBRARY DESTINATION lib |
| 53 |
- ARCHIVE DESTINATION lib/static |
| 54 |
+ LIBRARY DESTINATION lib${LIB_SUFFIX} |
| 55 |
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}/static |
| 56 |
) |
| 57 |
|
| 58 |
-INSTALL( EXPORT wvWare DESTINATION lib/wvWare FILE wv2.cmake ) |
| 59 |
+INSTALL( EXPORT wvWare DESTINATION lib${LIB_SUFFIX}/wvWare FILE wv2.cmake ) |
| 60 |
|
| 61 |
INSTALL( FILES ${wv2_HEADERS} |
| 62 |
DESTINATION include/wv2 |
| 63 |
@@ -103,5 +103,5 @@ |
| 64 |
# libtool files are useless for Visual C++ and Borland C++ |
| 65 |
IF( NOT MSVC AND NOT BORLAND ) |
| 66 |
INCLUDE( ${wvWare_SOURCE_DIR}/cmake/MacroCreateLibtoolFile.cmake ) |
| 67 |
- CREATE_LIBTOOL_FILE( wv2 /lib ) |
| 68 |
+ CREATE_LIBTOOL_FILE( wv2 /lib${LIB_SUFFIX} ) |
| 69 |
ENDIF( NOT MSVC AND NOT BORLAND ) |
Archives