Commit 2b760341 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Complete the build of libxml2 with CMake.

parent e9f34642
......@@ -20,10 +20,4 @@
#
############################################################################
if(EXISTS ${INSTALL_PREFIX}/lib/libxml2.dll.a)
execute_process(COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${INSTALL_PREFIX}/lib/libxml2.dll.a" "${INSTALL_PREFIX}/lib/xml2.lib")
endif()
if(EXISTS ${INSTALL_PREFIX}/lib/libxml2.a)
execute_process(COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${INSTALL_PREFIX}/lib/libxml2.a" "${INSTALL_PREFIX}/lib/xml2.lib")
endif()
execute_process(COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${SOURCE_DIR}/builders/xml2/FindXML2.cmake" "${INSTALL_PREFIX}/share/cmake/Modules/FindXML2.cmake")
......@@ -61,20 +61,20 @@ include(builders/CMakeLists.txt)
# antlr3c
set(EP_antlr3c_LINKING_TYPE "-DENABLE_STATIC=1")
set(EP_antlr3c_LINKING_TYPE "-DENABLE_STATIC=YES")
# belle-sip
set(EP_bellesip_LINKING_TYPE "-DENABLE_STATIC=1")
set(EP_bellesip_LINKING_TYPE "-DENABLE_STATIC=YES")
set(EP_bellesip_EXTRA_CFLAGS "-DUSE_STRUCT_RES_STATE_NAMESERVERS ${EP_bellesip_EXTRA_CFLAGS}")
# cunit
set(EP_cunit_LINKING_TYPE "-DENABLE_STATIC=1")
set(EP_cunit_LINKING_TYPE "-DENABLE_STATIC=YES")
# ffmpeg
set(EP_ffmpeg_LINKING_TYPE "--disable-static" "--enable-shared")
# gsm
set(EP_gsm_LINKING_TYPE "-DENABLE_STATIC=1")
set(EP_gsm_LINKING_TYPE "-DENABLE_STATIC=YES")
# linphone
list(APPEND EP_linphone_CONFIGURE_OPTIONS
......@@ -116,13 +116,13 @@ set(EP_ortp_LINKING_TYPE "--enable-static" "--disable-shared")
set(EP_polarssl_LINKING_TYPE "-DUSE_SHARED_POLARSSL_LIBRARY=0")
# speex
set(EP_speex_LINKING_TYPE "-DENABLE_STATIC=1")
set(EP_speex_LINKING_TYPE "-DENABLE_STATIC=YES")
# srtp
set(EP_srtp_LINKING_TYPE "-DENABLE_STATIC=1")
set(EP_srtp_LINKING_TYPE "-DENABLE_STATIC=YES")
# vpx
set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared")
# xml2
set(EP_xml2_LINKING_TYPE "--enable-static" "--disable-shared")
set(EP_xml2_LINKING_TYPE "_DENABLE_STATIC=YES")
......@@ -79,7 +79,3 @@ endif()
# Include builders
include(builders/CMakeLists.txt)
# xml2
list(APPEND EP_xml2_CONFIGURE_OPTIONS "--with-sax1")
......@@ -74,19 +74,19 @@ include(builders/CMakeLists.txt)
# antlr3c
set(EP_antlr3c_LINKING_TYPE "-DENABLE_STATIC=1")
set(EP_antlr3c_LINKING_TYPE "-DENABLE_STATIC=YES")
# belle-sip
set(EP_bellesip_LINKING_TYPE "-DENABLE_STATIC=1")
set(EP_bellesip_LINKING_TYPE "-DENABLE_STATIC=YES")
# cunit
set(EP_cunit_LINKING_TYPE "-DENABLE_STATIC=1")
set(EP_cunit_LINKING_TYPE "-DENABLE_STATIC=YES")
# ffmpeg
set(EP_ffmpeg_LINKING_TYPE "--enable-static" "--disable-shared")
# gsm
set(EP_gsm_LINKING_TYPE "-DENABLE_STATIC=1")
set(EP_gsm_LINKING_TYPE "-DENABLE_STATIC=YES")
# linphone
list(APPEND EP_linphone_CONFIGURE_OPTIONS
......@@ -127,13 +127,13 @@ set(EP_ortp_LINKING_TYPE "--enable-static" "--disable-shared")
set(EP_polarssl_LINKING_TYPE "-DUSE_SHARED_POLARSSL_LIBRARY=0")
# speex
set(EP_speex_LINKING_TYPE "-DENABLE_STATIC=1")
set(EP_speex_LINKING_TYPE "-DENABLE_STATIC=YES")
# srtp
set(EP_srtp_LINKING_TYPE "-DENABLE_STATIC=1")
set(EP_srtp_LINKING_TYPE "-DENABLE_STATIC=YES")
# vpx
set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared")
# xml2
set(EP_xml2_LINKING_TYPE "--enable-static" "--disable-shared")
set(EP_xml2_LINKING_TYPE "-DENABLE_STATIC=YES")
......@@ -137,7 +137,7 @@ set(EP_polarssl_LINKING_TYPE "-DUSE_SHARED_POLARSSL_LIBRARY=NO")
set(EP_speex_LINKING_TYPE "-DENABLE_STATIC=YES")
# sqlite3
set(EP_sqlite3_LINKING_TYPE "-DENABLE_STATIC=1")
set(EP_sqlite3_LINKING_TYPE "-DENABLE_STATIC=YES")
# srtp
set(EP_srtp_LINKING_TYPE "-DENABLE_STATIC=YES")
......@@ -149,7 +149,7 @@ set(EP_v4l_LINKING_TYPE "--enable-static" "--disable-shared" "--with-pic")
set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared" "--enable-pic")
# xml2
set(EP_xml2_LINKING_TYPE "--enable-static" "--disable-shared" "--with-pic")
set(EP_xml2_LINKING_TYPE "-DENABLE_STATIC=YES")
# Python module
......
......@@ -112,7 +112,7 @@ if(NOT MSVC)
endif()
# sqlite3
set(EP_sqlite3_LINKING_TYPE "-DENABLE_STATIC=1")
set(EP_sqlite3_LINKING_TYPE "-DENABLE_STATIC=YES")
# v4l
set(EP_v4l_LINKING_TYPE "--enable-static" "--disable-shared" "--with-pic")
......@@ -124,4 +124,4 @@ set(EP_voamrwbenc_LINKING_TYPE "--enable-static" "--disable-shared" "--with-pic"
set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared" "--enable-pic")
# xml2
set(EP_xml2_LINKING_TYPE "--enable-static" "--disable-shared" "--with-pic")
set(EP_xml2_LINKING_TYPE "-DENABLE_STATIC=YES")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment