move libdxfrw to external lib directory

qgis · Jan 19, 2018 · 232d721 · 232d721
1 parent 3abf27f
commit 232d721
Show file tree

Hide file tree

Showing 48 changed files with 5 additions and 4 deletions.
diff --git a/src/app/dwg/libdxfrw/CMakeLists.txt → external/libdxfrw/CMakeLists.txt b/src/app/dwg/libdxfrw/CMakeLists.txt → external/libdxfrw/CMakeLists.txt
@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
 	${CMAKE_SOURCE_DIR}/src/core
-        ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/core
 	${Qt5Core_INCLUDE_DIRS}
 )
 

diff --git a/src/app/dwg/libdxfrw/drw_base.h → external/libdxfrw/drw_base.h b/src/app/dwg/libdxfrw/drw_base.h → external/libdxfrw/drw_base.h
diff --git a/src/app/dwg/libdxfrw/drw_classes.cpp → external/libdxfrw/drw_classes.cpp b/src/app/dwg/libdxfrw/drw_classes.cpp → external/libdxfrw/drw_classes.cpp
diff --git a/src/app/dwg/libdxfrw/drw_classes.h → external/libdxfrw/drw_classes.h b/src/app/dwg/libdxfrw/drw_classes.h → external/libdxfrw/drw_classes.h
diff --git a/src/app/dwg/libdxfrw/drw_entities.cpp → external/libdxfrw/drw_entities.cpp b/src/app/dwg/libdxfrw/drw_entities.cpp → external/libdxfrw/drw_entities.cpp
diff --git a/src/app/dwg/libdxfrw/drw_entities.h → external/libdxfrw/drw_entities.h b/src/app/dwg/libdxfrw/drw_entities.h → external/libdxfrw/drw_entities.h
diff --git a/src/app/dwg/libdxfrw/drw_header.cpp → external/libdxfrw/drw_header.cpp b/src/app/dwg/libdxfrw/drw_header.cpp → external/libdxfrw/drw_header.cpp
diff --git a/src/app/dwg/libdxfrw/drw_header.h → external/libdxfrw/drw_header.h b/src/app/dwg/libdxfrw/drw_header.h → external/libdxfrw/drw_header.h
diff --git a/src/app/dwg/libdxfrw/drw_interface.h → external/libdxfrw/drw_interface.h b/src/app/dwg/libdxfrw/drw_interface.h → external/libdxfrw/drw_interface.h
diff --git a/src/app/dwg/libdxfrw/drw_objects.cpp → external/libdxfrw/drw_objects.cpp b/src/app/dwg/libdxfrw/drw_objects.cpp → external/libdxfrw/drw_objects.cpp
diff --git a/src/app/dwg/libdxfrw/drw_objects.h → external/libdxfrw/drw_objects.h b/src/app/dwg/libdxfrw/drw_objects.h → external/libdxfrw/drw_objects.h
diff --git a/src/app/dwg/libdxfrw/intern/drw_cptable932.h → external/libdxfrw/intern/drw_cptable932.h b/src/app/dwg/libdxfrw/intern/drw_cptable932.h → external/libdxfrw/intern/drw_cptable932.h
diff --git a/src/app/dwg/libdxfrw/intern/drw_cptable936.h → external/libdxfrw/intern/drw_cptable936.h b/src/app/dwg/libdxfrw/intern/drw_cptable936.h → external/libdxfrw/intern/drw_cptable936.h
diff --git a/src/app/dwg/libdxfrw/intern/drw_cptable949.h → external/libdxfrw/intern/drw_cptable949.h b/src/app/dwg/libdxfrw/intern/drw_cptable949.h → external/libdxfrw/intern/drw_cptable949.h
diff --git a/src/app/dwg/libdxfrw/intern/drw_cptable950.h → external/libdxfrw/intern/drw_cptable950.h b/src/app/dwg/libdxfrw/intern/drw_cptable950.h → external/libdxfrw/intern/drw_cptable950.h
diff --git a/src/app/dwg/libdxfrw/intern/drw_cptables.h → external/libdxfrw/intern/drw_cptables.h b/src/app/dwg/libdxfrw/intern/drw_cptables.h → external/libdxfrw/intern/drw_cptables.h
diff --git a/src/app/dwg/libdxfrw/intern/drw_dbg.cpp → external/libdxfrw/intern/drw_dbg.cpp b/src/app/dwg/libdxfrw/intern/drw_dbg.cpp → external/libdxfrw/intern/drw_dbg.cpp
diff --git a/src/app/dwg/libdxfrw/intern/drw_dbg.h → external/libdxfrw/intern/drw_dbg.h b/src/app/dwg/libdxfrw/intern/drw_dbg.h → external/libdxfrw/intern/drw_dbg.h
diff --git a/...app/dwg/libdxfrw/intern/drw_textcodec.cpp → external/libdxfrw/intern/drw_textcodec.cpp b/...app/dwg/libdxfrw/intern/drw_textcodec.cpp → external/libdxfrw/intern/drw_textcodec.cpp
diff --git a/src/app/dwg/libdxfrw/intern/drw_textcodec.h → external/libdxfrw/intern/drw_textcodec.h b/src/app/dwg/libdxfrw/intern/drw_textcodec.h → external/libdxfrw/intern/drw_textcodec.h
diff --git a/src/app/dwg/libdxfrw/intern/dwgbuffer.cpp → external/libdxfrw/intern/dwgbuffer.cpp b/src/app/dwg/libdxfrw/intern/dwgbuffer.cpp → external/libdxfrw/intern/dwgbuffer.cpp
diff --git a/src/app/dwg/libdxfrw/intern/dwgbuffer.h → external/libdxfrw/intern/dwgbuffer.h b/src/app/dwg/libdxfrw/intern/dwgbuffer.h → external/libdxfrw/intern/dwgbuffer.h
diff --git a/src/app/dwg/libdxfrw/intern/dwgreader.cpp → external/libdxfrw/intern/dwgreader.cpp b/src/app/dwg/libdxfrw/intern/dwgreader.cpp → external/libdxfrw/intern/dwgreader.cpp
diff --git a/src/app/dwg/libdxfrw/intern/dwgreader.h → external/libdxfrw/intern/dwgreader.h b/src/app/dwg/libdxfrw/intern/dwgreader.h → external/libdxfrw/intern/dwgreader.h
diff --git a/src/app/dwg/libdxfrw/intern/dwgreader15.cpp → external/libdxfrw/intern/dwgreader15.cpp b/src/app/dwg/libdxfrw/intern/dwgreader15.cpp → external/libdxfrw/intern/dwgreader15.cpp
diff --git a/src/app/dwg/libdxfrw/intern/dwgreader15.h → external/libdxfrw/intern/dwgreader15.h b/src/app/dwg/libdxfrw/intern/dwgreader15.h → external/libdxfrw/intern/dwgreader15.h
diff --git a/src/app/dwg/libdxfrw/intern/dwgreader18.cpp → external/libdxfrw/intern/dwgreader18.cpp b/src/app/dwg/libdxfrw/intern/dwgreader18.cpp → external/libdxfrw/intern/dwgreader18.cpp
diff --git a/src/app/dwg/libdxfrw/intern/dwgreader18.h → external/libdxfrw/intern/dwgreader18.h b/src/app/dwg/libdxfrw/intern/dwgreader18.h → external/libdxfrw/intern/dwgreader18.h
diff --git a/src/app/dwg/libdxfrw/intern/dwgreader21.cpp → external/libdxfrw/intern/dwgreader21.cpp b/src/app/dwg/libdxfrw/intern/dwgreader21.cpp → external/libdxfrw/intern/dwgreader21.cpp
diff --git a/src/app/dwg/libdxfrw/intern/dwgreader21.h → external/libdxfrw/intern/dwgreader21.h b/src/app/dwg/libdxfrw/intern/dwgreader21.h → external/libdxfrw/intern/dwgreader21.h
diff --git a/src/app/dwg/libdxfrw/intern/dwgreader24.cpp → external/libdxfrw/intern/dwgreader24.cpp b/src/app/dwg/libdxfrw/intern/dwgreader24.cpp → external/libdxfrw/intern/dwgreader24.cpp
diff --git a/src/app/dwg/libdxfrw/intern/dwgreader24.h → external/libdxfrw/intern/dwgreader24.h b/src/app/dwg/libdxfrw/intern/dwgreader24.h → external/libdxfrw/intern/dwgreader24.h
diff --git a/src/app/dwg/libdxfrw/intern/dwgreader27.cpp → external/libdxfrw/intern/dwgreader27.cpp b/src/app/dwg/libdxfrw/intern/dwgreader27.cpp → external/libdxfrw/intern/dwgreader27.cpp
diff --git a/src/app/dwg/libdxfrw/intern/dwgreader27.h → external/libdxfrw/intern/dwgreader27.h b/src/app/dwg/libdxfrw/intern/dwgreader27.h → external/libdxfrw/intern/dwgreader27.h
diff --git a/src/app/dwg/libdxfrw/intern/dwgutil.cpp → external/libdxfrw/intern/dwgutil.cpp b/src/app/dwg/libdxfrw/intern/dwgutil.cpp → external/libdxfrw/intern/dwgutil.cpp
diff --git a/src/app/dwg/libdxfrw/intern/dwgutil.h → external/libdxfrw/intern/dwgutil.h b/src/app/dwg/libdxfrw/intern/dwgutil.h → external/libdxfrw/intern/dwgutil.h
diff --git a/src/app/dwg/libdxfrw/intern/dxfreader.cpp → external/libdxfrw/intern/dxfreader.cpp b/src/app/dwg/libdxfrw/intern/dxfreader.cpp → external/libdxfrw/intern/dxfreader.cpp
diff --git a/src/app/dwg/libdxfrw/intern/dxfreader.h → external/libdxfrw/intern/dxfreader.h b/src/app/dwg/libdxfrw/intern/dxfreader.h → external/libdxfrw/intern/dxfreader.h
diff --git a/src/app/dwg/libdxfrw/intern/dxfwriter.cpp → external/libdxfrw/intern/dxfwriter.cpp b/src/app/dwg/libdxfrw/intern/dxfwriter.cpp → external/libdxfrw/intern/dxfwriter.cpp
diff --git a/src/app/dwg/libdxfrw/intern/dxfwriter.h → external/libdxfrw/intern/dxfwriter.h b/src/app/dwg/libdxfrw/intern/dxfwriter.h → external/libdxfrw/intern/dxfwriter.h
diff --git a/src/app/dwg/libdxfrw/intern/rscodec.cpp → external/libdxfrw/intern/rscodec.cpp b/src/app/dwg/libdxfrw/intern/rscodec.cpp → external/libdxfrw/intern/rscodec.cpp
diff --git a/src/app/dwg/libdxfrw/intern/rscodec.h → external/libdxfrw/intern/rscodec.h b/src/app/dwg/libdxfrw/intern/rscodec.h → external/libdxfrw/intern/rscodec.h
diff --git a/src/app/dwg/libdxfrw/libdwgr.cpp → external/libdxfrw/libdwgr.cpp b/src/app/dwg/libdxfrw/libdwgr.cpp → external/libdxfrw/libdwgr.cpp
diff --git a/src/app/dwg/libdxfrw/libdwgr.h → external/libdxfrw/libdwgr.h b/src/app/dwg/libdxfrw/libdwgr.h → external/libdxfrw/libdwgr.h
diff --git a/src/app/dwg/libdxfrw/libdxfrw.cpp → external/libdxfrw/libdxfrw.cpp b/src/app/dwg/libdxfrw/libdxfrw.cpp → external/libdxfrw/libdxfrw.cpp
diff --git a/src/app/dwg/libdxfrw/libdxfrw.dox → external/libdxfrw/libdxfrw.dox b/src/app/dwg/libdxfrw/libdxfrw.dox → external/libdxfrw/libdxfrw.dox
diff --git a/src/app/dwg/libdxfrw/libdxfrw.h → external/libdxfrw/libdxfrw.h b/src/app/dwg/libdxfrw/libdxfrw.h → external/libdxfrw/libdxfrw.h
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -1,4 +1,4 @@
-ADD_SUBDIRECTORY(dwg/libdxfrw)
+ADD_SUBDIRECTORY(../../external/libdxfrw dwg/libdxfrw)
 
 SET(QGIS_APP_SRCS
   qgisapp.cpp
@@ -565,12 +565,13 @@ SET_SOURCE_FILES_PROPERTIES(
 ENDIF(MSVC)
 
 INCLUDE_DIRECTORIES(
+  ${CMAKE_SOURCE_DIR}/external/libdxfrw
+
   ${CMAKE_SOURCE_DIR}/src/app
   ${CMAKE_SOURCE_DIR}/src/app/layout
   ${CMAKE_SOURCE_DIR}/src/app/pluginmanager
   ${CMAKE_SOURCE_DIR}/src/app/gps
   ${CMAKE_SOURCE_DIR}/src/app/dwg
-  ${CMAKE_SOURCE_DIR}/src/app/dwg/libdxfrw
   ${CMAKE_SOURCE_DIR}/src/app/locator
   ${CMAKE_SOURCE_DIR}/src/analysis/raster
   ${CMAKE_SOURCE_DIR}/src/core
@@ -661,7 +662,7 @@ INCLUDE_DIRECTORIES(
   ../python
   gps
   dwg
-  dwg/libdxfrw
+  ${CMAKE_SOURCE_DIR}/external/libdxfrw
   ${CMAKE_SOURCE_DIR}/src/native
   ${CMAKE_BINARY_DIR}/src/native
 )