Author: rinrab
Date: Sat Jul 6 14:50:49 2024
New Revision: 1918968
URL: http://svn.apache.org/viewvc?rev=1918968&view=rev
Log:
On the 'cmake' branch: Simplify CMake modules for APR and APR-Util libraries
by removing nested conditions. Now the checks for LIBRARY_FOUND and for
existing of that target are in the same `if`.
* build/cmake/FindAPR.cmake,
build/cmake/FindAPRUtil.cmake
(): Removing nested conditions.
Modified:
subversion/branches/cmake/build/cmake/FindAPR.cmake
subversion/branches/cmake/build/cmake/FindAPRUtil.cmake
Modified: subversion/branches/cmake/build/cmake/FindAPR.cmake
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/cmake/FindAPR.cmake?rev=1918968&r1=1918967&r2=1918968&view=diff
==============================================================================
--- subversion/branches/cmake/build/cmake/FindAPR.cmake (original)
+++ subversion/branches/cmake/build/cmake/FindAPR.cmake Sat Jul 6 14:50:49 2024
@@ -69,27 +69,25 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(
APR_VERSION
)
-if(APR_FOUND)
- if (NOT TARGET apr::apr)
- if (APR_LIBRARY_SHARED)
- add_library(apr::apr SHARED IMPORTED)
- target_compile_definitions(apr::apr INTERFACE "APR_DECLARE_IMPORT")
- set_target_properties(apr::apr PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES ${APR_INCLUDE_DIR}
- IMPORTED_LOCATION ${APR_DLL}
- IMPORTED_IMPLIB ${APR_LIBRARY}
- )
- else()
- add_library(apr::apr STATIC IMPORTED)
- target_compile_definitions(apr::apr INTERFACE "APR_DECLARE_STATIC")
- set_target_properties(apr::apr PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES ${APR_INCLUDE_DIR}
- IMPORTED_LOCATION ${APR_LIBRARY}
- )
- endif()
+if(APR_FOUND AND NOT TARGET apr::apr)
+ if (APR_LIBRARY_SHARED)
+ add_library(apr::apr SHARED IMPORTED)
+ target_compile_definitions(apr::apr INTERFACE "APR_DECLARE_IMPORT")
+ set_target_properties(apr::apr PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES ${APR_INCLUDE_DIR}
+ IMPORTED_LOCATION ${APR_DLL}
+ IMPORTED_IMPLIB ${APR_LIBRARY}
+ )
+ else()
+ add_library(apr::apr STATIC IMPORTED)
+ target_compile_definitions(apr::apr INTERFACE "APR_DECLARE_STATIC")
+ set_target_properties(apr::apr PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES ${APR_INCLUDE_DIR}
+ IMPORTED_LOCATION ${APR_LIBRARY}
+ )
+ endif()
- if (WIN32)
- target_link_libraries(apr::apr INTERFACE ws2_32 rpcrt4)
- endif()
+ if (WIN32)
+ target_link_libraries(apr::apr INTERFACE ws2_32 rpcrt4)
endif()
endif()
Modified: subversion/branches/cmake/build/cmake/FindAPRUtil.cmake
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/cmake/FindAPRUtil.cmake?rev=1918968&r1=1918967&r2=1918968&view=diff
==============================================================================
--- subversion/branches/cmake/build/cmake/FindAPRUtil.cmake (original)
+++ subversion/branches/cmake/build/cmake/FindAPRUtil.cmake Sat Jul 6 14:50:49
2024
@@ -69,23 +69,21 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(
APRUTIL_VERSION
)
-if(APRUtil_FOUND)
- if(NOT TARGET apr::aprutil)
- if (APRUTIL_LIBRARY_SHARED)
- add_library(apr::aprutil SHARED IMPORTED)
- target_compile_definitions(apr::aprutil INTERFACE "APU_DECLARE_IMPORT")
- set_target_properties(apr::aprutil PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES ${APRUTIL_INCLUDE_DIR}
- IMPORTED_LOCATION ${APRUTIL_DLL}
- IMPORTED_IMPLIB ${APRUTIL_LIBRARY}
- )
- else()
- add_library(apr::aprutil STATIC IMPORTED)
- target_compile_definitions(apr::aprutil INTERFACE "APU_DECLARE_STATIC")
- set_target_properties(apr::aprutil PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES ${APRUTIL_INCLUDE_DIR}
- IMPORTED_LOCATION ${APRUTIL_LIBRARY}
- )
- endif()
+if(APRUtil_FOUND AND NOT TARGET apr::aprutil)
+ if (APRUTIL_LIBRARY_SHARED)
+ add_library(apr::aprutil SHARED IMPORTED)
+ target_compile_definitions(apr::aprutil INTERFACE "APU_DECLARE_IMPORT")
+ set_target_properties(apr::aprutil PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES ${APRUTIL_INCLUDE_DIR}
+ IMPORTED_LOCATION ${APRUTIL_DLL}
+ IMPORTED_IMPLIB ${APRUTIL_LIBRARY}
+ )
+ else()
+ add_library(apr::aprutil STATIC IMPORTED)
+ target_compile_definitions(apr::aprutil INTERFACE "APU_DECLARE_STATIC")
+ set_target_properties(apr::aprutil PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES ${APRUTIL_INCLUDE_DIR}
+ IMPORTED_LOCATION ${APRUTIL_LIBRARY}
+ )
endif()
endif()
