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 Windows build #45272

Merged
merged 2 commits into from Mar 9, 2022
+9 −1
Merged

Fix Windows build #45272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b7432b
include: Define dlfcn.h on Windows
petrutlucian94 Mar 7, 2022
c11455f
build: avoid Windows linking issues
petrutlucian94 Mar 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -526,7 +526,14 @@ add_library(common STATIC ${ceph_common_objs})
target_link_libraries(common ${ceph_common_deps})
add_dependencies(common legacy-option-headers ${jaeger_base})

add_library(ceph-common ${CEPH_SHARED} ${ceph_common_objs})
if (WIN32)
# Statically building ceph-common on Windows fails. We're temporarily
# reverting this: 22fefb2338cfc4fcb03ece3cbf77aa964a7f17f2
add_library(ceph-common SHARED ${ceph_common_objs})
else()
add_library(ceph-common ${CEPH_SHARED} ${ceph_common_objs})
endif()

target_link_libraries(ceph-common ${ceph_common_deps})
if(ENABLE_COVERAGE)
target_link_libraries(ceph-common gcov)
Expand Down
1 change: 1 addition & 0 deletions src/include/win32/dlfcn.h
View file
Open in desktop
@@ -0,0 +1 @@
#include "../dlfcn_compat.h"