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: b121522
machinekit · May 2, 2014 · 1d0f0ec · 1d0f0ec
1 parent ba4849d
commit 1d0f0ec
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/externals/include/cppzmq/LICENSE → 3rdparty/cppzmq/LICENSE b/externals/include/cppzmq/LICENSE → 3rdparty/cppzmq/LICENSE
diff --git a/externals/include/cppzmq/README → 3rdparty/cppzmq/README b/externals/include/cppzmq/README → 3rdparty/cppzmq/README
diff --git a/externals/include/cppzmq/zmq.hpp → 3rdparty/cppzmq/zmq.hpp b/externals/include/cppzmq/zmq.hpp → 3rdparty/cppzmq/zmq.hpp
diff --git 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
@@ -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
@@ -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
@@ -58,7 +58,7 @@ LIBS += -lzmq
 
 INCLUDEPATH += \
     ../include \
-    ../externals/include/cppzmq \
+    ../3rdparty/cppzmq \
     $(QTDIR)/include \
     /opt/local/include