Move cppcodec to 3rdparty directory

Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
Nitrokey · Apr 3, 2017 · 6e5b0e2 · 6e5b0e2
1 parent 08e952a
commit 6e5b0e2
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,5 +2,5 @@
 	path = libnitrokey
 	url = https://github.com/Nitrokey/libnitrokey.git
 [submodule "cppcodec"]
-	path = cppcodec
+	path = 3rdparty/cppcodec
 	url = https://github.com/tplgy/cppcodec.git
diff --git a/cppcodec → 3rdparty/cppcodec b/cppcodec → 3rdparty/cppcodec
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -113,7 +113,7 @@ INCLUDE_DIRECTORIES(
   ${SRCDIR}
   ${UTILSDIR}
   ${SRCUIDIR}
-    cppcodec
+    3rdparty/cppcodec
 )
 
 # c/cpp sources

diff --git a/nitrokey-app-qt5.pro b/nitrokey-app-qt5.pro
@@ -97,7 +97,7 @@ INCLUDEPATH +=  $${SRCDIR} \
                 $${SRCUIDIR} \
                 $${UTILSDIR} \
                 $${COREDIR} \
-		$${ROOTDIR}/cppcodec \
+		        $${ROOTDIR}/3rdparty/cppcodec \
                 $${GUIDIR}
 
 LIBNITROKEY= -lnitrokey-static