Fix Build (Finally)
All checks were successful
minecraft-pi-reborn/pipeline/head This commit looks good
All checks were successful
minecraft-pi-reborn/pipeline/head This commit looks good
This commit is contained in:
parent
28424aa86a
commit
f2bd893241
3
dependencies/libpng/CMakeLists.txt
vendored
3
dependencies/libpng/CMakeLists.txt
vendored
@ -8,7 +8,6 @@ add_compile_options(-w)
|
||||
## LibPNG
|
||||
|
||||
# Download
|
||||
set(SKIP_INSTALL_ALL TRUE) # Skip Default LibPNG Installation
|
||||
FetchContent_Declare(
|
||||
libpng
|
||||
GIT_REPOSITORY "https://github.com/glennrp/libpng.git"
|
||||
@ -23,6 +22,8 @@ set(CMAKE_POLICY_DEFAULT_CMP0054 NEW) # Re-Enable New Behavior
|
||||
set_target_properties(png12 PROPERTIES LINK_FLAGS "-Wl,--version-script='${CMAKE_CURRENT_SOURCE_DIR}/libpng.vers'") # Use Symbol Versioning
|
||||
set_target_properties(png12 PROPERTIES DEBUG_POSTFIX "") # Fix LibPNG Suffix In Debug Mode
|
||||
|
||||
# Ensure Build
|
||||
set_target_properties(png12 PROPERTIES EXCLUDE_FROM_ALL FALSE)
|
||||
# Install
|
||||
install(TARGETS png12 DESTINATION "${MCPI_LIB_DIR}")
|
||||
|
||||
|
3
dependencies/zlib/CMakeLists.txt
vendored
3
dependencies/zlib/CMakeLists.txt
vendored
@ -8,7 +8,6 @@ add_compile_options(-w)
|
||||
## zlib
|
||||
|
||||
# Download
|
||||
set(SKIP_INSTALL_ALL TRUE) # Skip Default ZLib Installation
|
||||
FetchContent_Declare(
|
||||
zlib
|
||||
GIT_REPOSITORY "https://github.com/madler/zlib.git"
|
||||
@ -18,6 +17,8 @@ FetchContent_Populate(zlib)
|
||||
include_directories("${zlib_SOURCE_DIR}" "${zlib_BINARY_DIR}") # Fix ZLib Build
|
||||
add_subdirectory("${zlib_SOURCE_DIR}" "${zlib_BINARY_DIR}" EXCLUDE_FROM_ALL)
|
||||
|
||||
# Ensure Build
|
||||
set_target_properties(zlib PROPERTIES EXCLUDE_FROM_ALL FALSE)
|
||||
# Install
|
||||
install(TARGETS zlib DESTINATION "${MCPI_LIB_DIR}")
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user