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.

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

Jump to bottom

Fix pkgconfig for gnutls #30

Merged
merged 5 commits into from
Feb 15, 2021
Merged

Fix pkgconfig for gnutls #30

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da73b89
Fix pkgconfig for gnutls
tuxmaster5000 Feb 9, 2021
22aff63
Fix pkgconfig for gnutls
tuxmaster5000 Feb 9, 2021
d18e625
Update samba/CMakeLists.txt
tuxmaster5000 Feb 12, 2021
75902fd
Fix extra space char
tuxmaster5000 Feb 15, 2021
12c96ee
Add Changelog entry
tuxmaster5000 Feb 15, 2021
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
3 changes: 2 additions & 1 deletion samba/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> rc <TARGET> <LINK_FLAGS> <OBJECTS>

include_directories(${GSSAPI_INCLUDE_DIRS})
include_directories(${POPT_INCLUDE_DIRS})
include_directories(${GNUTLS_INCLUDE_DIRS})

set (SMB_INCLUDES
${CMAKE_SOURCE_DIR}/samba
Expand Down Expand Up @@ -450,5 +451,5 @@ add_custom_command(
add_library(samba-static STATIC ${RPC_GEN_SRC} ${SAMBA_SRC} ${RPC_GEN_HEADERS})
# Link against static heimdal-gssapi ldflags returned by pkg-config
# Link against libhdb as well since it is missing from the list
target_link_libraries (samba-static ${GSSAPI_STATIC_LDFLAGS} hdb)
target_link_libraries (samba-static ${GSSAPI_STATIC_LDFLAGS} ${GNUTLS_STATIC_LDFLAGS} hdb )
tuxmaster5000 marked this conversation as resolved.
Show resolved Hide resolved
set_target_properties (samba-static PROPERTIES CMAKE_POSITION_INDEPENDENT_CODE TRUE)
1 change: 0 additions & 1 deletion wmi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ set(WMI_HDR
)

add_library(openvas_wmiclient SHARED ${WMICLIENT_SRC} ${WMI_SHARED_SRC})

target_link_libraries(openvas_wmiclient samba-static dl ${GNUTLS_LIBRARIES} ${GSSAPI_LIBRARIES} ${POPT_LIBRARIES} ${LINKER_HARDENING_FLAGS})

set_target_properties (openvas_wmiclient PROPERTIES SOVERSION "${PROJECT_VERSION_MAJOR}")
Expand Down