You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by iv...@apache.org on 2024/04/20 14:32:54 UTC

svn commit: r1917215 - in /apr/apr/branches/1.7.x-cmake-improvements: ./ CMakeLists.txt

Author: ivan
Date: Sat Apr 20 14:32:53 2024
New Revision: 1917215

URL: http://svn.apache.org/viewvc?rev=1917215&view=rev
Log:
On '1.7.x-cmake-improvements' branch: Merge r1895471 from trunk:
  Use global variable instead repeating the same name throgh CMakeLists.txt

Modified:
    apr/apr/branches/1.7.x-cmake-improvements/   (props changed)
    apr/apr/branches/1.7.x-cmake-improvements/CMakeLists.txt

Propchange: apr/apr/branches/1.7.x-cmake-improvements/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1895471

Modified: apr/apr/branches/1.7.x-cmake-improvements/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x-cmake-improvements/CMakeLists.txt?rev=1917215&r1=1917214&r2=1917215&view=diff
==============================================================================
--- apr/apr/branches/1.7.x-cmake-improvements/CMakeLists.txt (original)
+++ apr/apr/branches/1.7.x-cmake-improvements/CMakeLists.txt Sat Apr 20 14:32:53 2024
@@ -21,6 +21,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 PROJECT(APR C)
 
+SET(apr_name    apr-1)
+SET(apr_libname libapr-1)
+
 OPTION(APR_INSTALL_PRIVATE_H  "Install selected private .h files (for httpd)"  OFF)
 OPTION(APR_HAVE_IPV6        "IPv6 support"                 ON)
 OPTION(INSTALL_PDB          "Install .pdb files (if generated)"  ON)
@@ -278,20 +281,20 @@ ENDIF()
 
 # libapr-1 is shared, apr-1 is static
 IF (APR_BUILD_SHARED)
-  ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc)
-  SET(install_targets ${install_targets} libapr-1)
-  SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libapr-1.pdb)
-  TARGET_LINK_LIBRARIES(libapr-1 ${APR_SYSTEM_LIBS})
-  SET_TARGET_PROPERTIES(libapr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_EXPORT;WINNT")
-  ADD_DEPENDENCIES(libapr-1 test_char_header)
+  ADD_LIBRARY(${apr_libname} SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc)
+  SET(install_targets ${install_targets} ${apr_libname})
+  SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/${apr_libname}.pdb)
+  TARGET_LINK_LIBRARIES(${apr_libname} ${APR_SYSTEM_LIBS})
+  SET_TARGET_PROPERTIES(${apr_libname} PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_EXPORT;WINNT")
+  ADD_DEPENDENCIES(${apr_libname} test_char_header)
 ENDIF()
 
 IF (APR_BUILD_STATIC)
-  ADD_LIBRARY(apr-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
-  SET(install_targets ${install_targets} apr-1)
-  TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS})
-  SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT")
-  ADD_DEPENDENCIES(apr-1 test_char_header)
+  ADD_LIBRARY(${apr_name} STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
+  SET(install_targets ${install_targets} ${apr_name})
+  TARGET_LINK_LIBRARIES(${apr_name} ${APR_SYSTEM_LIBS})
+  SET_TARGET_PROPERTIES(${apr_name} PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT")
+  ADD_DEPENDENCIES(${apr_name} test_char_header)
 ENDIF()
 
 # libaprapp-1 and aprapp-1 are static
@@ -323,11 +326,11 @@ IF(APR_BUILD_TESTAPR)
                   ${PROJECT_BINARY_DIR}/data/mmap_datafile.txt)
 
   IF(TEST_STATIC_LIBS)
-    SET(whichapr    apr-1)
+    SET(whichapr    ${apr_name})
     SET(whichaprapp aprapp-1)
     SET(apiflag     -DAPR_DECLARE_STATIC)
   ELSE()
-    SET(whichapr    libapr-1)
+    SET(whichapr    ${apr_libname})
     SET(whichaprapp libaprapp-1)
     SET(apiflag)
   ENDIF()