echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Use imported target EXPAT::EXPAT instead of variables

Browse Source
This commit is contained in:
Alex Turbov 2022-08-21 09:05:53 +04:00 committed by Brad King
parent 2be5a7de4e
commit 9cdf5a6779
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/CMakeLists.txt
View File

@ -743,7 +743,6 @@ target_include_directories(
"${CMake_BINARY_DIR}/Source" "${CMake_BINARY_DIR}/Source"
"${CMake_SOURCE_DIR}/Source" "${CMake_SOURCE_DIR}/Source"
"${CMake_SOURCE_DIR}/Source/LexerParser" "${CMake_SOURCE_DIR}/Source/LexerParser"
${CMAKE_EXPAT_INCLUDES}
${CMAKE_TAR_INCLUDES} ${CMAKE_TAR_INCLUDES}
${CMake_HAIKU_INCLUDE_DIRS} ${CMake_HAIKU_INCLUDE_DIRS}
) )
@ -752,8 +751,8 @@ target_link_libraries(
PUBLIC PUBLIC
cmstd cmstd
cmsys cmsys
EXPAT::EXPAT
ZLIB::ZLIB ZLIB::ZLIB
${CMAKE_EXPAT_LIBRARIES}
${CMAKE_TAR_LIBRARIES} ${CMAKE_TAR_LIBRARIES}
${CMAKE_CURL_LIBRARIES} ${CMAKE_CURL_LIBRARIES}
${CMAKE_JSONCPP_LIBRARIES} ${CMAKE_JSONCPP_LIBRARIES}

1
Source/Modules/CMakeBuildUtilities.cmake
View File

@ -197,6 +197,7 @@ else()
set(CMAKE_EXPAT_INCLUDES) set(CMAKE_EXPAT_INCLUDES)
set(CMAKE_EXPAT_LIBRARIES cmexpat) set(CMAKE_EXPAT_LIBRARIES cmexpat)
add_subdirectory(Utilities/cmexpat) add_subdirectory(Utilities/cmexpat)
add_library(EXPAT::EXPAT ALIAS cmexpat)
CMAKE_SET_TARGET_FOLDER(cmexpat "Utilities/3rdParty") CMAKE_SET_TARGET_FOLDER(cmexpat "Utilities/3rdParty")
endif() endif()