eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorganize zlib config

This commit is contained in:
Alexander Batalov 2022-05-28 08:17:23 +03:00
parent 7174cc703d
commit 456fd43d8a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -247,4 +247,7 @@ target_link_libraries(fallout2-ce ${FPATTERN_LIBRARY})
target_include_directories(fallout2-ce PRIVATE ${FPATTERN_INCLUDE_DIR}) target_include_directories(fallout2-ce PRIVATE ${FPATTERN_INCLUDE_DIR})
add_subdirectory("third_party/zlib") add_subdirectory("third_party/zlib")
target_link_libraries(fallout2-ce ${ZLIB_LIBRARIES})
target_include_directories(fallout2-ce PRIVATE ${ZLIB_INCLUDE_DIRS})
add_subdirectory("third_party/sdl2") add_subdirectory("third_party/sdl2")

5
third_party/zlib/CMakeLists.txt vendored
View File

@ -11,5 +11,6 @@ if (NOT zlib_POPULATED)
endif() endif()
add_subdirectory(${zlib_SOURCE_DIR} ${zlib_BINARY_DIR} EXCLUDE_FROM_ALL) add_subdirectory(${zlib_SOURCE_DIR} ${zlib_BINARY_DIR} EXCLUDE_FROM_ALL)
target_include_directories(fallout2-ce PUBLIC ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR})
target_link_libraries(fallout2-ce zlibstatic) set(ZLIB_LIBRARIES zlibstatic PARENT_SCOPE)
set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR} PARENT_SCOPE)