cmake: update for recent librbd changes #6715
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(building with cmake was broken in master) |
|
cmake still fails on my test machine. following patch fixes it. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1e61e4f..903a222 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -908,7 +908,8 @@ if(${WITH_RBD})
add_library(librbd ${CEPH_SHARED} ${librbd_srcs}
$<TARGET_OBJECTS:osdc_rbd_objs>
$<TARGET_OBJECTS:common_util_obj>)
- target_link_libraries(librbd PRIVATE librados common cls_lock_client cls_rbd_client
+ target_link_libraries(librbd PRIVATE librados common journal
+ cls_lock_client cls_rbd_client cls_journal_client
${CMAKE_DL_LIBS})
if(${ENABLE_SHARED})
set_target_properties(librbd PROPERTIES VERSION "1.0.0" SOVERSION "1" |
Recent merge moved lots of things. Signed-off-by: John Spray <john.spray@redhat.com>
jcsp
force-pushed
the
wip-librbd-cmake
branch
from
748601e
to
26752f9
Compare
|
@ukernel -- oh right, I was only updating it far enough to let the other components build, hadn't actually been building librbd itself. Updated the PR with your change. |
dillaman
pushed a commit
that referenced
this pull request
Nov 30, 2015
cmake: update for recent librbd changes Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Recent merge moved lots of things.
Signed-off-by: John Spray john.spray@redhat.com