Attachment 609146 Details for Bug 853765 – Patch2 (replaces current)

[patch] Patch2 (replaces current)

0002-nuke-old-bundled-copy-of-expat-use-system-expat.patch (text/plain), 2.54 KB, created by Zenon Panoussis on 2012-09-02 18:48:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zenon Panoussis

Created: 2012-09-02 18:48:49 UTC

Size: 2.54 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index 037ede6..cdafb35 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -147,6 +147,7 @@
> 
> find_package(ZLIB REQUIRED)
> find_package(Threads REQUIRED)
>+find_package(EXPAT REQUIRED)
> 
> check_include_file(sys/time.h HAVE_SYS_TIME_H)
> check_include_file(sys/timeb.h HAVE_SYS_TIMEB_H)
>@@ -249,7 +250,8 @@
> 
> include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS} 
>     ${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} 
>-    ${ALUT_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR} )
>+    ${ALUT_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR} 
>+    ${EXPAT_INCLUDE_DIR} )
> 
> add_definitions(-DHAVE_CONFIG_H)
> add_definitions(-DHAVE_EXPAT_CONFIG_H)
>diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt
>index 684e2ee..4d45799 100644
>--- a/simgear/CMakeLists.txt
>+++ b/simgear/CMakeLists.txt
>@@ -54,7 +54,7 @@
>     set_property(TARGET SimGearCore PROPERTY VERSION   ${SIMGEAR_VERSION})
>     set_property(TARGET SimGearCore PROPERTY SOVERSION ${SIMGEAR_SOVERSION})
> 
>-    target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY})
>+    target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY} ${EXPAT_LIBRARY})
>     install(TARGETS SimGearCore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
> 
>     if(LIBSVN_FOUND)
>diff --git a/simgear/props/CMakeLists.txt b/simgear/props/CMakeLists.txt
>index f0dcbed..b79479e 100644
>--- a/simgear/props/CMakeLists.txt
>+++ b/simgear/props/CMakeLists.txt
>@@ -27,7 +27,9 @@ if(ENABLE_TESTS)
> if (SIMGEAR_SHARED)
>     set(TEST_LIBS SimGearCore)
> else()
>-    set(TEST_LIBS sgprops sgxml sgstructure sgmisc sgdebug)
>+    set(TEST_LIBS
>+            sgprops sgxml sgstructure sgmisc sgdebug
>+            ${EXPAT_LIBRARY})
> endif()
> 
> 
>diff --git a/simgear/xml/CMakeLists.txt b/simgear/xml/CMakeLists.txt
>index 0365e86..e2dae9e 100644
>--- a/simgear/xml/CMakeLists.txt
>+++ b/simgear/xml/CMakeLists.txt
>@@ -7,26 +7,7 @@
>     )
>     
> set(SOURCES 
>-    asciitab.h
>-    hashtable.h
>-    iasciitab.h
>-    latin1tab.h
>-    nametab.h
>-    utf8tab.h
>-    xmldef.h
>-    xmlparse.h
>-    xmlrole.h
>-    xmltok.h
>-    xmltok_impl.h
>-    hashtable.c
>-    xmlparse.c
>-    xmlrole.c
>-    xmltok.c
>     easyxml.cxx
>-    internal.h
>-    ascii.h
>-    expat.h
>-    expat_external.h
>     )
> 
> simgear_component(xml xml "${SOURCES}" "${HEADERS}")
>diff --git a/simgear/xml/easyxml.cxx b/simgear/xml/easyxml.cxx
>index 65a3551..0a5b617 100644
>--- a/simgear/xml/easyxml.cxx
>+++ b/simgear/xml/easyxml.cxx
>@@ -9,7 +9,7 @@
> #include <string.h>		// strcmp()
> 
> #include "easyxml.hxx"
>-#include "xmlparse.h"
>+#include <expat.h>
> 
> #include <fstream>
> #include <iostream>
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 853765: 609146 | 609147