3 commits - CMakeLists.txt src/php src/uriencode.cpp

[Christian Mollekopf]

 CMakeLists.txt         |    2 +-
 src/php/CMakeLists.txt |    2 +-
 src/uriencode.cpp      |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3efa3f0fc9a227aa0573558662fe4209a91b5a55
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Fri Jul 20 12:11:54 2012 +0200

    With boost >1.50 we also need the system library. Using the system library work also on older versions of boost so no need for an if clause.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26dcf51..00b5899 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,7 @@ set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/Libkolabxml )
 configure_file(libkolabxml-version.h.cmake "${CMAKE_BINARY_DIR}/libkolabxml-version.h" @ONLY)
 
 set(Boost_USE_MULTITHREADED ON)
-find_package(Boost REQUIRED COMPONENTS thread)
+find_package(Boost REQUIRED COMPONENTS thread system)
 if (Boost_FOUND)
     message("Found boost in ${Boost_INCLUDE_DIRS}")
 endif (Boost_FOUND)


commit 971cf4be664b9329f65076ffb403689aa70b5c82
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Fri Jul 20 12:06:44 2012 +0200

    There are no php libraries.

diff --git a/src/php/CMakeLists.txt b/src/php/CMakeLists.txt
index fee4b37..aec9cd6 100644
--- a/src/php/CMakeLists.txt
+++ b/src/php/CMakeLists.txt
@@ -25,7 +25,7 @@ find_package(PHP4 5.3 REQUIRED)
 if (PHP4_FOUND)
     include_directories(${PHP4_INCLUDE_PATH})
     add_library(phpbindings SHARED ${KOLAB_SWIG_PHP_SOURCE_FILE})
-    target_link_libraries(phpbindings kolabxml ${PHP_LIBRARIES})
+    target_link_libraries(phpbindings kolabxml)
     SET_TARGET_PROPERTIES(phpbindings PROPERTIES OUTPUT_NAME "kolabformat")
     SET_TARGET_PROPERTIES(phpbindings PROPERTIES PREFIX "")
 


commit 8f8a2f3b9f3d227a60f1a733476b13c60a352e21
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Fri Jul 20 12:06:29 2012 +0200

    fix build without -fpermissive

diff --git a/src/uriencode.cpp b/src/uriencode.cpp
index 363f98e..3c30331 100644
--- a/src/uriencode.cpp
+++ b/src/uriencode.cpp
@@ -21,7 +21,7 @@
 std::string uriEncode(const std::string &s)
 {
     CURL *easyhandle = curl_easy_init();
-    const char *result = curl_easy_escape(easyhandle, s.c_str(), s.length());
+    char *result = curl_easy_escape(easyhandle, s.c_str(), static_cast<int>(s.length()));
     curl_easy_cleanup(easyhandle);
     if (!result) {
         return std::string();
@@ -35,7 +35,7 @@ std::string uriDecode(const std::string &s)
 {
     CURL *easyhandle = curl_easy_init();
     int length = 0;
-    const char *result = curl_easy_unescape(easyhandle, s.c_str(), s.length(), &length);
+    char *result = curl_easy_unescape(easyhandle, s.c_str(), static_cast<int>(s.length()), &length);
     curl_easy_cleanup(easyhandle);
     if (!length) {
         return std::string();