File tree 6 files changed +4
-174
lines changed
6 files changed +4
-174
lines changed Original file line number Diff line number Diff line change @@ -52,38 +52,19 @@ IF(COMPILE_LIBXML2)
52
52
ENDIF (COMPILE_LIBXML2)
53
53
54
54
IF (ENABLE_XMLSEC AND COMPILE_XMLSEC)
55
- IF (COMPILE_LIBXSLT)
56
- IF (DOWNLOAD)
57
- SET (URL ftp://xmlsoft.org/libxml2/)
58
- ENDIF ()
59
- EXTERNALPROJECT_ADD(
60
- 03_XSLT
61
- URL ${URL} /libxslt-1.1.28.tar.gz
62
- BUILD_IN_SOURCE 1
63
- PATCH_COMMAND patch -d <SOURCE_DIR> -p0 -t -N < ${PROJECT_SOURCE_DIR} /contrib/libxslt-1.1.26.patch
64
- CONFIGURE_COMMAND ${CONFIGURE} ${PREFIX_ARG} ${AUTO_CFLAGS} ${AUTO_CXXFLAGS} ${AUTO_LDFLAGS}
65
- --disable-dependency-tracking --enable-static =yes --enable-shared=no
66
- --with-libxml-prefix =${PREFIX}
67
- --with-libxml-include -prefix =${PREFIX} /include /libxml2
68
- --with-libxml-libs-prefix =${PREFIX} /lib
69
- BUILD_COMMAND ${MAKE} -f <SOURCE_DIR>/Makefile
70
- INSTALL_COMMAND ${INSTALL}
71
- )
72
- ENDIF (COMPILE_LIBXSLT)
73
-
74
55
IF (DOWNLOAD)
75
56
SET (URL http://www.aleksey.com/xmlsec/download)
76
57
ENDIF ()
77
58
IF (WIN32 )
78
- SET (XURL ${URL} /xmlsec1-1.2.18.tar.gz)
59
+ SET (URL ${URL} /xmlsec1-1.2.18.tar.gz)
79
60
ELSE ()
80
- SET (XURL ${URL} /xmlsec1-1.2.19 .tar.gz)
61
+ SET (URL ${URL} /xmlsec1-1.2.20 .tar.gz)
81
62
ENDIF ()
82
63
EXTERNALPROJECT_ADD(
83
64
06_XMLSEC1
84
- URL ${XURL }
65
+ URL ${URL }
85
66
BUILD_IN_SOURCE 1
86
- PATCH_COMMAND patch -d <SOURCE_DIR> -p0 -t -N < ${PROJECT_SOURCE_DIR} /contrib/xmlsec1-1.1.29 .patch
67
+ PATCH_COMMAND patch -d <SOURCE_DIR> -p0 -t -N < ${PROJECT_SOURCE_DIR} /contrib/xmlsec1-1.2.20 .patch
87
68
CONFIGURE_COMMAND ${CONFIGURE} ${PREFIX_ARG} ${AUTO_CFLAGS} ${AUTO_CXXFLAGS} ${AUTO_LDFLAGS}
88
69
--enable-pkgconfig=no
89
70
--disable-dependency-tracking --enable-static =yes --enable-shared=no
Load Diff This file was deleted.
Load Diff This file was deleted.
Load Diff This file was deleted.
File renamed without changes.
Original file line number Diff line number Diff line change @@ -19,12 +19,10 @@ ENDIF()
19
19
INCLUDE_DIRECTORIES (${SYSROOT_PATH} /include /libxml2)
20
20
21
21
IF (ENABLE_XMLSEC)
22
- # INCLUDE_DIRECTORIES(${SYSROOT_PATH}/include/libxslt)
23
22
INCLUDE_DIRECTORIES (${SYSROOT_PATH} /include /xmlsec1)
24
23
SET (COMPILE_XMLSEC 1)
25
24
SET (LIBS ${LIBS} ${LIB_DIR_SYS} /libxmlsec1-openssl.a ${LIB_DIR_SYS} /libxmlsec1.a)
26
25
SET (LIBS ${LIBS} -L${LIB_DIR_SYS} )
27
- #SET(LIBS ${LIBS} -L${LIB_DIR_SYS} -lxslt)
28
26
ENDIF (ENABLE_XMLSEC)
29
27
30
28
SET (COMPILE_LIBXML2 0)
You can’t perform that action at this time.
0 commit comments