Skip to content

Cmake fixes #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Cmake fixes #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57f8409
allow build from src using external zlib
jmairboeck Aug 29, 2024
d06b165
fix installation paths
jmairboeck Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ set(VERSION 1.0.5)

set(CMAKE_C_STANDARD 99)

if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
find_package(ZLIB REQUIRED)
set(zlib_target ZLIB::ZLIB)
else()
set(zlib_target zlib)
endif()

add_library(pplib_utils STATIC
util/utilplat.h
util/utilcryptdef.h
Expand Down Expand Up @@ -42,7 +49,7 @@ target_include_directories(pplib_utils PUBLIC
target_link_libraries(pplib_utils
PUBLIC
m
zlib
${zlib_target}
)

add_library(pplib_filters STATIC
Expand All @@ -63,7 +70,7 @@ target_include_directories(pplib_filters PUBLIC
target_link_libraries(pplib_filters
PUBLIC
m
zlib
${zlib_target}
)

add_library(pplib
Expand Down Expand Up @@ -131,9 +138,10 @@ set_target_properties(pplib

add_library(pplib::pplib ALIAS pplib)

include(GNUInstallDirs)

install(TARGETS pplib
EXPORT pplib
DESTINATION lib
)

enable_testing()
Expand Down