From 1d0f0ec48e910fb94e16948ca71bfd765a0c5efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20R=C3=B6ssler?= Date: Fri, 2 May 2014 15:22:53 +0200 Subject: [PATCH] Squashed '3rdparty/nzmqt/' changes from 68d2543..b121522 b121522 changed include paths 8b7d691 Merge commit '4664716fc23b983d6401fff866a74c605f380f4f' as '3rdparty/cppzmq' 4664716 Squashed '3rdparty/cppzmq/' content from commit ee47ae4 52e0dd3 removed submodule REVERT: 68d2543 added cppzmq as subtree REVERT: 144b84d Merge commit '2254a0e5c6acb7204e45c94c13ffb47640ec9ec1' as 'externals/include/cppzmq' REVERT: 2254a0e Squashed 'externals/include/cppzmq/' content from commit ee47ae4 REVERT: 6048043 removed submodule git-subtree-dir: 3rdparty/nzmqt git-subtree-split: b121522632e003936f5c4a67ffa70b97d21b1838 --- .gitmodules | 0 {externals/include => 3rdparty}/cppzmq/LICENSE | 0 {externals/include => 3rdparty}/cppzmq/README | 0 {externals/include => 3rdparty}/cppzmq/zmq.hpp | 0 src/nzmqt_app.pro | 2 +- src/nzmqt_sharedlib.pro | 2 +- src/nzmqt_staticlib.pro | 2 +- src/nzmqt_test.pro | 2 +- 8 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 .gitmodules rename {externals/include => 3rdparty}/cppzmq/LICENSE (100%) rename {externals/include => 3rdparty}/cppzmq/README (100%) rename {externals/include => 3rdparty}/cppzmq/zmq.hpp (100%) diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29b..00000000 diff --git a/externals/include/cppzmq/LICENSE b/3rdparty/cppzmq/LICENSE similarity index 100% rename from externals/include/cppzmq/LICENSE rename to 3rdparty/cppzmq/LICENSE diff --git a/externals/include/cppzmq/README b/3rdparty/cppzmq/README similarity index 100% rename from externals/include/cppzmq/README rename to 3rdparty/cppzmq/README diff --git a/externals/include/cppzmq/zmq.hpp b/3rdparty/cppzmq/zmq.hpp similarity index 100% rename from externals/include/cppzmq/zmq.hpp rename to 3rdparty/cppzmq/zmq.hpp diff --git a/src/nzmqt_app.pro b/src/nzmqt_app.pro index 51286cfb..79f15028 100755 --- a/src/nzmqt_app.pro +++ b/src/nzmqt_app.pro @@ -62,7 +62,7 @@ LIBS += -lzmq INCLUDEPATH += \ ../include \ - ../externals/include/cppzmq \ + ../3rdparty/cppzmq \ $(QTDIR)/include \ /opt/local/include diff --git a/src/nzmqt_sharedlib.pro b/src/nzmqt_sharedlib.pro index dd9b5ac6..58ee4534 100644 --- a/src/nzmqt_sharedlib.pro +++ b/src/nzmqt_sharedlib.pro @@ -53,7 +53,7 @@ LIBS += -lzmq INCLUDEPATH += \ ../include \ - ../externals/include/cppzmq \ + ../3rdparty/cppzmq \ $(QTDIR)/include \ /opt/local/include diff --git a/src/nzmqt_staticlib.pro b/src/nzmqt_staticlib.pro index 6396b1c5..77284e0a 100644 --- a/src/nzmqt_staticlib.pro +++ b/src/nzmqt_staticlib.pro @@ -53,7 +53,7 @@ LIBS += -lzmq INCLUDEPATH += \ ../include \ - ../externals/include/cppzmq \ + ../3rdparty/cppzmq \ $(QTDIR)/include \ /opt/local/include diff --git a/src/nzmqt_test.pro b/src/nzmqt_test.pro index 2856ab0d..332a1dd3 100644 --- a/src/nzmqt_test.pro +++ b/src/nzmqt_test.pro @@ -58,7 +58,7 @@ LIBS += -lzmq INCLUDEPATH += \ ../include \ - ../externals/include/cppzmq \ + ../3rdparty/cppzmq \ $(QTDIR)/include \ /opt/local/include