Why did you do that? For me libpaccurl is simply a fixed version of curl and
should be dropped in some future?
-------- Message d'origine --------
De : Marius Cirsta <mfor...@gmail.com>
Date :
A : frugalware-git@frugalware.org
Objet : [Frugalware-git] pacman-g2: * changed naming to LIBPACCURL as
LIBCURL was pointing to curl libraries
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=bfa9ed58c0bc4741155195ed2088846c1fb4605e
commit bfa9ed58c0bc4741155195ed2088846c1fb4605e
Author: Marius Cirsta <mfor...@gmail.com>
Date: Wed Dec 11 16:25:28 2013 +0200
* changed naming to LIBPACCURL as LIBCURL was pointing to curl libraries
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c95e465..a9d86e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,10 @@ project (PACMAN-G2)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
-include (CheckIncludeFile)
-include (CheckIncludeFiles)
-include (CheckFunctionExists)
+INCLUDE (CheckIncludeFile)
+INCLUDE (CheckIncludeFiles)
+INCLUDE (CheckFunctionExists)
+INCLUDE (FindPkgConfig)
enable_testing()
@@ -44,22 +45,21 @@ else(BUILD_SHARED_LIBS)
set(CMAKE_EXECUTABLE_SUFFIX ".static")
endif(BUILD_SHARED_LIBS)
-INCLUDE(FindPkgConfig)
PKG_SEARCH_MODULE(LIBARCHIVE REQUIRED libarchive)
-PKG_SEARCH_MODULE(LIBCURL libpaccurl)
-if(NOT LIBCURL_FOUND)
- PKG_SEARCH_MODULE(LIBCURL REQUIRED libcurl)
- include_directories("${LIBCURL_INCLUDEDIR}/curl")
+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(LIBCURL_STATIC_LIBRARIES ${LIBCURL_STATIC_LIBRARIES} cares idn ssh2 z) #
Temporary fixes till paccurl is fixed
- include_directories("${LIBCURL_INCLUDEDIR}/paccurl")
-endif(NOT PACCURL_FOUND)
+ 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)
if(BUILD_SHARED_LIBS)
- set(LIBPACMAN_LIBRARIES ${LIBARCHIVE_LIBRARIES} ${LIBCURL_LIBRARIES})
+ set(LIBPACMAN_LIBRARIES ${LIBARCHIVE_LIBRARIES} ${LIBPACCURL_LIBRARIES})
else(BUILD_SHARED_LIBS)
- set(LIBPACMAN_LIBRARIES ${LIBARCHIVE_STATIC_LIBRARIES}
${LIBCURL_STATIC_LIBRARIES})
+ set(LIBPACMAN_LIBRARIES ${LIBARCHIVE_STATIC_LIBRARIES}
${LIBPACCURL_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
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
