serf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1835224 - /serf/trunk/CMakeLists.txt
Date Fri, 06 Jul 2018 09:44:50 GMT
Author: brane
Date: Fri Jul  6 09:44:49 2018
New Revision: 1835224

URL: http://svn.apache.org/viewvc?rev=1835224&view=rev
Log:
* CMakeLists.txt: Fix generation of serf.pc with corrected values for LIBDIR and INCLUDE_SUBDIR.

Modified:
    serf/trunk/CMakeLists.txt

Modified: serf/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/serf/trunk/CMakeLists.txt?rev=1835224&r1=1835223&r2=1835224&view=diff
==============================================================================
--- serf/trunk/CMakeLists.txt (original)
+++ serf/trunk/CMakeLists.txt Fri Jul  6 09:44:49 2018
@@ -46,7 +46,7 @@ include(SerfWindowsToolkit)
 option(DEBUG "Enable debugging info and strict compile warnings" OFF)
 option(SKIP_SHARED "Disable building shared Serf libraries" OFF)
 option(SKIP_STATIC "Disable building static Serf libraries" OFF)
-option(LIBDIR "Indstall directory for architecture-dependent libraries" "")
+option(LIBDIR "Install directory for architecture-dependent libraries" "")
 option(APR "Path to APR's install area" "")
 option(APU "Path to APR-Util's install area" "")
 option(OPENSSL "Path to OpenSSL's install area" "")
@@ -352,9 +352,9 @@ install(TARGETS ${SERF_TARGETS}
         RUNTIME DESTINATION "bin")
 
 if(NOT SERF_WINDOWS)
-  set(SERF_INCLUDE_SUBDIR "/serf-${SERF_MAJOR_VERSION}")
+  set(SERF_INCLUDE_SUBDIR "serf-${SERF_MAJOR_VERSION}")
 endif()
-install(FILES ${HEADERS} DESTINATION "include${SERF_INCLUDE_SUBDIR}")
+install(FILES ${HEADERS} DESTINATION "include/${SERF_INCLUDE_SUBDIR}")
 
 
 # Generate the pkg-config module file.
@@ -363,19 +363,21 @@ if(NOT SERF_WINDOWS)
   function(make_pkgconfig)
     set(PREFIX ${CMAKE_INSTALL_PREFIX})
     if(NOT LIBDIR)
-      set(LIBDIR "${PREIFX}/lib")
+      set(LIBDIR "\${prefix}/lib")
     endif()
+    set(INCLUDE_SUBDIR ${SERF_INCLUDE_SUBDIR})
     set(VERSION ${SERF_VERSION})
     set(MAJOR ${SERF_MAJOR_VERSION})
     unset(LIBS)
-    foreach(DEPLIB ${DEPENDENCY_LIBRARIES})
+    foreach(DEPLIB ${SERF_DEPENDENCY_LIBRARIES} ${SERF_INTERFACE_LIBRARIES})
       set(LIBS "${LIBS} ${DEPLIB}")
     endforeach()
     configure_file("build/serf.pc.in" "serf.pc" @ONLY)
   endfunction()
 
   make_pkgconfig()
-  install(FILES "${CMAKE_BINARY_DIR}/serf.pc" DESTINATION "share/pkgconfig")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/serf.pc"
+          DESTINATION "share/pkgconfig")
 endif()
 
 if(NOT SKIP_TESTS)



Mime
View raw message