From fe7c57b8c53d0a6aaf49eefc912c8920480caa94 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Tue, 7 Feb 2012 22:24:01 +0100
Subject: [PATCH] Make dfsg tarball compiling with cmake

---
 src/3rdParty/CMakeLists.txt |  8 ++++++--
 src/Base/CMakeLists.txt     | 17 ++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/3rdParty/CMakeLists.txt b/src/3rdParty/CMakeLists.txt
index e6e825fee..e6de70dba 100644
--- a/src/3rdParty/CMakeLists.txt
+++ b/src/3rdParty/CMakeLists.txt
@@ -22,9 +22,13 @@ elseif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE7X)
 elseif(FREECAD_BUILD_GUI)
     find_path(COIN_VERSION3 Inventor/scxml/ScXML.h ${COIN3D_INCLUDE_DIR})
     if (COIN_VERSION3)
-    add_subdirectory(Pivy-0.5)
+    if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy-0.5)
+        add_subdirectory(Pivy-0.5)
+    endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy-0.5)
     else (COIN_VERSION3)
-    add_subdirectory(Pivy)
+    if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy)
+        add_subdirectory(Pivy)
+    endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy)
     endif(COIN_VERSION3)
 endif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE6X)
 
diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt
index 10cd30b50..32612ca95 100644
--- a/src/Base/CMakeLists.txt
+++ b/src/Base/CMakeLists.txt
@@ -68,6 +68,7 @@ if(SWIG_FOUND)
     add_definitions(-DHAVE_SWIG=1)
 endif(SWIG_FOUND)
 
+if (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++)
 SET(zipios_SRCS
     ../zipios++/backbuffer.h
     ../zipios++/basicentry.cpp
@@ -121,6 +122,12 @@ SET(zipios_SRCS
     ../zipios++/zipoutputstream.h
 )
 SOURCE_GROUP("zipios" FILES ${zipios_SRCS})
+else (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++)
+    set(FreeCADBase_LIBS
+        ${FreeCADBase_LIBS}
+        -lzipios
+    )
+endif (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++)
 
 SET(pycxx_SRCS
     ../CXX/Config.hxx
@@ -148,11 +155,11 @@ SET(FreeCADBase_XML_SRCS
     VectorPy.xml
 )
 SOURCE_GROUP("XML" FILES ${FreeCADBase_XML_SRCS})
-
-set(FreeCADBase_MOC_HDRS
-    FutureWatcherProgress.h
-)
-fc_wrap_cpp(FreeCADBase_MOC_SRCS ${FreeCADBase_MOC_HDRS})
+
+set(FreeCADBase_MOC_HDRS
+    FutureWatcherProgress.h
+)
+fc_wrap_cpp(FreeCADBase_MOC_SRCS ${FreeCADBase_MOC_HDRS})
 
 SET(FreeCADBase_UNITAPI_SRCS
     UnitsApi.cpp