Merge lp:~thomir-deactivatedaccount/xpathselect/static-build into lp:xpathselect

[Thomi Richards]

Make library build statically.

XPathSelect needs to be built as a static library, due to the way the Qt testability system works.

[Brandon Schaefer (brandontschaefer)]

review: Approve

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:18
http://jenkins.qa.ubuntu.com/job/xpathselect-ci/6/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/xpathselect-ci/./distribution=quantal,flavor=amd64/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/xpathselect-ci/./distribution=quantal,flavor=i386/6/console

review: Needs Fixing (continuous-integration)

=== modified file 'lib/CMakeLists.txt'
--- lib/CMakeLists.txt	2012-08-10 20:33:20 +0000
+++ lib/CMakeLists.txt	2012-08-11 01:51:18 +0000
@@ -1,11 +1,11 @@
 FIND_PACKAGE( Boost 1.40 REQUIRED )
 INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wl,--no-undefined")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++11 -Wall -Wl,--no-undefined")
 set(SOURCES node.cpp xpathselect.h xpathselect.cpp utils.h utils.cpp)
 set(HEADERS node.h xpathselect.h)
 
-add_library(xpathselect SHARED ${SOURCES})
+add_library(xpathselect STATIC ${SOURCES})
 
 target_link_libraries(xpathselect ${Boost_LIBRARIES})
 
@@ -15,7 +15,8 @@
   SOVERSION 1.0)
 
 install(TARGETS xpathselect
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib)
 
 install(FILES ${HEADERS}
   DESTINATION include/${PROJECT_NAME})

=== modified file 'lib/xpathselect.cpp'
--- lib/xpathselect.cpp	2012-08-10 20:33:20 +0000
+++ lib/xpathselect.cpp	2012-08-11 01:51:18 +0000
@@ -137,7 +137,7 @@
             queue.push(root);
             while (!queue.empty())
             {
-                Node::Ptr const& node = queue.front();
+                Node::Ptr node = queue.front();
                 queue.pop();
                 if (query_parts.front().Matches(node))
                 {
@@ -146,7 +146,7 @@
                     matches.push_back(node);
                 }
                 // Add all children of current node to queue.
-                for(Node::Ptr const& child : node->Children())
+                for(Node::Ptr child : node->Children())
                 {
                     queue.push(child);
                 }