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

cmake changes #10351

Merged
merged 3 commits into from Jul 20, 2016
Merged

cmake changes #10351

merged 3 commits into from Jul 20, 2016

Conversation

tchaikov
Copy link
Contributor

No description provided.

Signed-off-by: Kefu Chai <kchai@redhat.com>
util.cc is included by both librados and libcephfs, the `lvm` static
variable in `lsb_release_parse()` will be free twice by them. this
could lead to double free issue. and util.cc is not used by client at all, so
remove it from them.

Signed-off-by: Kefu Chai <kchai@redhat.com>
this silences the warning of:
```
In file included from
/home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/include/gtest/gtest.h:58:0,
                 from
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/osd/osdcap.cc:20:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/osd/osdcap.cc:
In member function ‘virtual void
OSDCap_AllowClassMulti_Test::TestBody()’:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/osd/osdcap.cc:766:6:
note: variable tracking size limit exceeded with
-fvar-tracking-assignments, retrying without
 TEST(OSDCap, AllowClassMulti) {
      ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/include/gtest/internal/gtest-internal.h:1211:3:
note: in definition of macro ‘GTEST_TEST_CLASS_NAME_’
   test_case_name##_##test_name##_Test
   ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/include/gtest/gtest.h:2181:3:
note: in expansion of macro ‘GTEST_TEST_’
   GTEST_TEST_(test_case_name, test_name, \
   ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/include/gtest/gtest.h:2187:42:
note: in expansion of macro ‘GTEST_TEST’
 # define TEST(test_case_name, test_name) GTEST_TEST(test_case_name,
 # test_name)
                                          ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/osd/osdcap.cc:766:1:
note: in expansion of macro ‘TEST’
 TEST(OSDCap, AllowClassMulti) {
 ^
```

see also b668051

Signed-off-by: Kefu Chai <kchai@redhat.com>
@wjwithagen
Copy link
Contributor

@tchaikov
I do like this restructuring. Makes things way much more hierarchical.
And excluding certain modules will go way much easier.

@alimaredia
Copy link
Contributor

@tchaikov this looks good to me, you wisely chose to leave libcommon in the src directory! you're not adding anything else to this PR right?

@tchaikov
Copy link
Contributor Author

i put all the changes i added in the commit messages.
Ali Maredia notifications@github.com于2016年7月20日 周三01:41写道:

@tchaikov https://github.com/tchaikov this looks good to me, you wisely
chose to leave libcommon in the src directory! you're not adding anything
else to this PR right?


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#10351 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AADmv1yry_88xn0mZn4YLuIc0JrKdaucks5qXQxMgaJpZM4JPxef
.

@tchaikov tchaikov merged commit f0426fb into master Jul 20, 2016
@tchaikov tchaikov deleted the wip-cmake branch July 20, 2016 02:06
@dmick
Copy link
Member

dmick commented Jul 20, 2016

This appears to have broken the debian build at least:

cp -a debian/tmp/usr/include/rados/buffer.h debian/librados-dev//usr/include/rados/
cp: cannot stat ‘debian/tmp/usr/include/rados/buffer.h’: No such file or directory

@tchaikov
Copy link
Contributor Author

thanks @dmick, i am on it.

@tchaikov
Copy link
Contributor Author

tchaikov commented Jul 20, 2016

@dmick #10360 addresses the packaging failure.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants