Author: rinrab
Date: Sat Jul 6 14:59:05 2024
New Revision: 1918969
URL: http://svn.apache.org/viewvc?rev=1918969&view=rev
Log:
On the 'cmake' branch: Setup include directories outside the
build-type-specific if blocks.
This simplifies the code and the include directories should not depend on
the library built in static or in shared configuration.
* build/cmake/FindAPR.cmake,
build/cmake/FindAPRUtil.cmake
(): Do not setup include directories from by set_target_properties, instead,
use target_include_directories outside the build-type-specific if blocks.
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=1918969&r1=1918968&r2=1918969&view=diff
==============================================================================
--- subversion/branches/cmake/build/cmake/FindAPR.cmake (original)
+++ subversion/branches/cmake/build/cmake/FindAPR.cmake Sat Jul 6 14:59:05 2024
@@ -74,7 +74,6 @@ if(APR_FOUND AND NOT TARGET apr::apr)
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}
)
@@ -82,11 +81,12 @@ if(APR_FOUND AND NOT TARGET apr::apr)
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()
+ target_include_directories(apr::apr INTERFACE ${APR_INCLUDE_DIR})
+
if (WIN32)
target_link_libraries(apr::apr INTERFACE ws2_32 rpcrt4)
endif()
Modified: subversion/branches/cmake/build/cmake/FindAPRUtil.cmake
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/cmake/FindAPRUtil.cmake?rev=1918969&r1=1918968&r2=1918969&view=diff
==============================================================================
--- subversion/branches/cmake/build/cmake/FindAPRUtil.cmake (original)
+++ subversion/branches/cmake/build/cmake/FindAPRUtil.cmake Sat Jul 6 14:59:05
2024
@@ -74,7 +74,6 @@ if(APRUtil_FOUND AND NOT TARGET apr::apr
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}
)
@@ -82,8 +81,9 @@ if(APRUtil_FOUND AND NOT TARGET apr::apr
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()
+
+ target_include_directories(apr::aprutil INTERFACE ${APRUTIL_INCLUDE_DIR})
endif()
