Author: rinrab
Date: Sat Jul 6 16:02:59 2024
New Revision: 1918974
URL: http://svn.apache.org/viewvc?rev=1918974&view=rev
Log:
On the 'cmake' branch: Use INTERFACE_COMPILE_DEFINITIONS property instead
of target_compile_definitions() command to setup how to use APR and APR-Util
libraries (static or shared).
This is better for the code structure.
* build/cmake/FindAPR.cmake
build/cmake/FindAPRUtil.cmake
(): Use properties instead of special command.
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=1918974&r1=1918973&r2=1918974&view=diff
==============================================================================
--- subversion/branches/cmake/build/cmake/FindAPR.cmake (original)
+++ subversion/branches/cmake/build/cmake/FindAPR.cmake Sat Jul 6 16:02:59 2024
@@ -72,16 +72,16 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(
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
IMPORTED_LOCATION ${APR_DLL}
IMPORTED_IMPLIB ${APR_LIBRARY}
+ INTERFACE_COMPILE_DEFINITIONS "APR_DECLARE_IMPORT"
)
else()
add_library(apr::apr STATIC IMPORTED)
- target_compile_definitions(apr::apr INTERFACE "APR_DECLARE_STATIC")
set_target_properties(apr::apr PROPERTIES
IMPORTED_LOCATION ${APR_LIBRARY}
+ INTERFACE_COMPILE_DEFINITIONS "APR_DECLARE_STATIC"
)
endif()
Modified: subversion/branches/cmake/build/cmake/FindAPRUtil.cmake
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/cmake/FindAPRUtil.cmake?rev=1918974&r1=1918973&r2=1918974&view=diff
==============================================================================
--- subversion/branches/cmake/build/cmake/FindAPRUtil.cmake (original)
+++ subversion/branches/cmake/build/cmake/FindAPRUtil.cmake Sat Jul 6 16:02:59
2024
@@ -72,16 +72,16 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(
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
IMPORTED_LOCATION ${APRUTIL_DLL}
IMPORTED_IMPLIB ${APRUTIL_LIBRARY}
+ INTERFACE_COMPILE_DEFINITIONS "APU_DECLARE_IMPORT"
)
else()
add_library(apr::aprutil STATIC IMPORTED)
- target_compile_definitions(apr::aprutil INTERFACE "APU_DECLARE_STATIC")
set_target_properties(apr::aprutil PROPERTIES
IMPORTED_LOCATION ${APRUTIL_LIBRARY}
+ INTERFACE_COMPILE_DEFINITIONS "APU_DECLARE_STATIC"
)
endif()
