Skip to content
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.

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

Fix only searching for static libs in zlib, protobuf, etc #877

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions cmake/UserverPreferStaticLibs.cmake
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
include_guard(DIRECTORY)

if(USERVER_USE_STATIC_LIBS)
set(OPENSSL_USE_STATIC_LIBS ON)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is bad solution, IMHO, because it contradicts the USE_STATIC_LIBS idea, we won't accept that.

But, to make this more flexible, you can do something like this:

if(NOT DEFINED OPENSSL_USE_STATIC_LIBS)
    set(OPENSSL_USE_STATIC_LIBS ON)
endif()
if(NOT DEFINED Protobuf_USE_STATIC_LIBS)
    set(Protobuf_USE_STATIC_LIBS ON)
endif()

set(ZLIB_USE_STATIC_LIBS ON)
set(Protobuf_USE_STATIC_LIBS ON)
set(Boost_USE_STATIC_LIBS ON)
set(CURL_USE_STATIC_LIBS ON)

set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so")
Expand Down