Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=dadd43569119f583115723ea8e2c9ca4579487d0
commit dadd43569119f583115723ea8e2c9ca4579487d0
Author: Michel Hermier <herm...@frugalware.org>
Date: Thu Dec 12 17:15:54 2013 +0100
cmake: revert curl detection as paccurl is just a stripped down and fixed
version of libcurl, remove the now unecessary library fixes due to broken
libpaccurl.pc.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9d86e9..d992a30 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,20 +46,19 @@ else(BUILD_SHARED_LIBS)
endif(BUILD_SHARED_LIBS)
PKG_SEARCH_MODULE(LIBARCHIVE REQUIRED libarchive)
-PKG_SEARCH_MODULE(LIBPACCURL libpaccurl)
-if(NOT LIBPACCURL_FOUND)
- PKG_SEARCH_MODULE(LIBPACCURL REQUIRED libcurl)
- include_directories("${LIBPACCURL_INCLUDEDIR}/curl")
- message(WARNING "libpaccurl not found")
-else()
- set(LIBPACCURL_STATIC_LIBRARIES ${LIBPACCURL_STATIC_LIBRARIES} cares idn
ssh2 z) # Temporary fixes till paccurl is fixed
- include_directories("${LIBPACCURL_INCLUDEDIR}/paccurl")
-endif(NOT LIBPACCURL_FOUND)
+PKG_SEARCH_MODULE(LIBCURL libpaccurl)
+if(LIBCURL_FOUND)
+ include_directories("${LIBCURL_INCLUDEDIR}/paccurl")
+else(LIBCURL_FOUND)
+ message(WARNING "libpaccurl not found - trying with regular libcurl")
+ PKG_SEARCH_MODULE(LIBCURL REQUIRED libcurl)
+ include_directories("${LIBCURL_INCLUDEDIR}/curl")
+endif(LIBCURL_FOUND)
if(BUILD_SHARED_LIBS)
- set(LIBPACMAN_LIBRARIES ${LIBARCHIVE_LIBRARIES} ${LIBPACCURL_LIBRARIES})
+ set(LIBPACMAN_LIBRARIES ${LIBARCHIVE_LIBRARIES} ${LIBCURL_LIBRARIES})
else(BUILD_SHARED_LIBS)
- set(LIBPACMAN_LIBRARIES ${LIBARCHIVE_STATIC_LIBRARIES}
${LIBPACCURL_STATIC_LIBRARIES})
+ set(LIBPACMAN_LIBRARIES ${LIBARCHIVE_STATIC_LIBRARIES}
${LIBCURL_STATIC_LIBRARIES})
endif(BUILD_SHARED_LIBS)
message(STATUS "LIBPACMAN_LIBRARIES: ${LIBPACMAN_LIBRARIES}")
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
