|
1 | 1 | diff --git a/tmxlite/CMakeLists.txt b/tmxlite/CMakeLists.txt |
2 | | -index a1b1882..8c0aad6 100644 |
| 2 | +index 1a1e05b..cae012b 100644 |
3 | 3 | --- a/tmxlite/CMakeLists.txt |
4 | 4 | +++ b/tmxlite/CMakeLists.txt |
5 | | -@@ -68,10 +68,9 @@ if(USE_EXTLIBS) |
6 | | - SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") |
7 | | - |
8 | | - find_package(ZLIB REQUIRED) |
9 | | -- find_package(PUGIXML REQUIRED) |
10 | | -- find_package(Zstd REQUIRED) |
11 | | -+ find_package(pugixml CONFIG REQUIRED) |
12 | | -+ find_package(zstd CONFIG REQUIRED) |
13 | | - |
14 | | -- include_directories(${ZLIB_INCLUDE_DIRS} ${PUGIXML_INCLUDE_DIR} ${ZSTD_INCLUDE_DIR}) |
15 | | - |
| 5 | +@@ -70,10 +70,9 @@ if(USE_EXTLIBS) |
| 6 | + SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") |
| 7 | + |
| 8 | + find_package(ZLIB REQUIRED) |
| 9 | +- find_package(PUGIXML REQUIRED) |
| 10 | +- find_package(Zstd REQUIRED) |
| 11 | ++ find_package(pugixml CONFIG REQUIRED) |
| 12 | ++ find_package(zstd CONFIG REQUIRED) |
| 13 | + |
| 14 | +- include_directories(${ZLIB_INCLUDE_DIRS} ${PUGIXML_INCLUDE_DIR} ${ZSTD_INCLUDE_DIR}) |
| 15 | + |
16 | 16 | else() |
17 | | - #add miniz and pugixml from source |
18 | | -@@ -102,7 +101,10 @@ else() |
| 17 | + # add miniz and pugixml from source |
| 18 | +@@ -104,7 +103,10 @@ else() |
19 | 19 | endif() |
20 | 20 |
|
21 | 21 | if(USE_EXTLIBS) |
22 | | -- target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES} ${PUGIXML_LIBRARY} ${ZSTD_LIBRARY}) |
23 | | -+ target_link_libraries(${PROJECT_NAME} PRIVATE |
24 | | -+ $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static> |
25 | | -+ pugixml::pugixml |
26 | | -+ ZLIB::ZLIB) |
| 22 | +- target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES} ${PUGIXML_LIBRARY} ${ZSTD_LIBRARY}) |
| 23 | ++ target_link_libraries(${PROJECT_NAME} PRIVATE |
| 24 | ++ $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static> |
| 25 | ++ pugixml::pugixml |
| 26 | ++ ZLIB::ZLIB) |
27 | 27 | else() |
28 | | - if(USE_ZSTD) |
29 | | - target_link_libraries(${PROJECT_NAME} ${ZSTD_LIBRARY}) |
| 28 | + if(USE_ZSTD) |
| 29 | + target_link_libraries(${PROJECT_NAME} ${ZSTD_LIBRARY}) |
0 commit comments