Using set(EXECUTABLE testweb3) to bring the CMake file for the libweb… #88

Merged
merged 5 commits into from Dec 4, 2015

Conversation

Projects
None yet
4 participants
@bobsummerwill
Contributor

bobsummerwill commented Dec 3, 2015

…three tests in line with the other files.

This also fixes automated dependency graph generation.

Using set(EXECUTABLE testweb3) to bring the CMake file for the libweb…
…three tests in line with the other files.

This also fixes automated dependency graph generation.
@gavofyork

This comment has been minimized.

Show comment
Hide comment
@gavofyork

gavofyork Dec 3, 2015

Contributor

build failing?

Contributor

gavofyork commented Dec 3, 2015

build failing?

@bobsummerwill

This comment has been minimized.

Show comment
Hide comment
@bobsummerwill

bobsummerwill Dec 3, 2015

Contributor

I can't see the logs, @gavofyork. Please could you cut-and-paste one? I assume they are all the same?

Contributor

bobsummerwill commented Dec 3, 2015

I can't see the logs, @gavofyork. Please could you cut-and-paste one? I assume they are all the same?

bobsummerwill added some commits Dec 4, 2015

Undid Commit: 364396a [364396a]
Merge pull request #76 from gluk256/_framing2

Because the change was not atomic, as indicated in its notes.
@subtly

View changes

libwhisper/WhisperPeer.cpp
@@ -28,8 +28,7 @@ using namespace dev;
using namespace dev::p2p;
using namespace dev::shh;
-WhisperPeer::WhisperPeer(std::shared_ptr<Session> _s, HostCapabilityFace* _h, unsigned _i, CapDesc const&, uint16_t _capID):

This comment has been minimized.

@subtly

subtly Dec 4, 2015

Member

Why the reversion?

@subtly

subtly Dec 4, 2015

Member

Why the reversion?

This comment has been minimized.

@bobsummerwill

bobsummerwill Dec 4, 2015

Contributor

Trying to work out where the break came. It's not from my edits.

Build fails. Undo. Build fails. Redo. Build succeeds.
Sad face. That took a lot of hours :-(
@LefterisJP @gavofyork @chriseth.

Anyway - end result is this PR is now ready for merge, fixing the solidity module name inconsistency and the missing set(EXECUTABLE testweb3), now with some bonus messy history.

@bobsummerwill

bobsummerwill Dec 4, 2015

Contributor

Trying to work out where the break came. It's not from my edits.

Build fails. Undo. Build fails. Redo. Build succeeds.
Sad face. That took a lot of hours :-(
@LefterisJP @gavofyork @chriseth.

Anyway - end result is this PR is now ready for merge, fixing the solidity module name inconsistency and the missing set(EXECUTABLE testweb3), now with some bonus messy history.

Revert "Undid Commit: 364396a [364396a]"
This reverts commit 66efa3e.

LefterisJP added a commit that referenced this pull request Dec 4, 2015

Merge pull request #88 from doublethinkco/cmake_fixes
Using set(EXECUTABLE testweb3) to bring the CMake file for the libweb…

@LefterisJP LefterisJP merged commit 55263dd into ethereum:develop Dec 4, 2015

7 checks passed

macosx_slave The build has succeeded
Details
macosx_slave-tests The Tests run succeeded
Details
ubuntu The build has succeeded
Details
ubuntu-tests The Tests run succeeded
Details
webthree -- ALL Build finished. No test results found.
Details
windows-slave The build has succeeded
Details
windows-slave-tests The Tests run succeeded
Details
@bobsummerwill

This comment has been minimized.

Show comment
Hide comment
@bobsummerwill

bobsummerwill Dec 4, 2015

Contributor

Thanks, @LefterisJP, and also for the PR-for-my-PR! Nearly there, eh?

Contributor

bobsummerwill commented Dec 4, 2015

Thanks, @LefterisJP, and also for the PR-for-my-PR! Nearly there, eh?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment