diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 242238ccc6816926f4348cfc9785324f9cc3edb0..40b441d6be7c84355df1d42deec0dbe2b44c2937 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -1,22 +1,22 @@
 # Source files
 set(SOURCES
 	mainwindow.cpp
-	${CMAKE_SOURCE_DIR}/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
-	${CMAKE_SOURCE_DIR}/Applications/Utils/OGSFileConverter/FileListDialog.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/../Utils/OGSFileConverter/OGSFileConverter.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/../Utils/OGSFileConverter/FileListDialog.cpp
 )
 
 # Moc Header files
 set(MOC_HEADERS
 	mainwindow.h
-	${CMAKE_SOURCE_DIR}/Applications/Utils/OGSFileConverter/OGSFileConverter.h
-	${CMAKE_SOURCE_DIR}/Applications/Utils/OGSFileConverter/FileListDialog.h
+	${CMAKE_CURRENT_SOURCE_DIR}/../Utils/OGSFileConverter/OGSFileConverter.h
+	${CMAKE_CURRENT_SOURCE_DIR}/../Utils/OGSFileConverter/FileListDialog.h
 )
 
 # UI files
 set(UIS
 	mainwindow.ui
-	${CMAKE_SOURCE_DIR}/Applications/Utils/OGSFileConverter/OGSFileConverter.ui
-	${CMAKE_SOURCE_DIR}/Applications/Utils/OGSFileConverter/FileList.ui
+	${CMAKE_CURRENT_SOURCE_DIR}/../Utils/OGSFileConverter/OGSFileConverter.ui
+	${CMAKE_CURRENT_SOURCE_DIR}/../Utils/OGSFileConverter/FileList.ui
 )
 
 
@@ -59,7 +59,7 @@ source_group("UI Files" REGULAR_EXPRESSION "\\w*\\.ui")
 source_group("Moc Files" REGULAR_EXPRESSION "moc_.*")
 
 # Application icon
-set(APP_ICON ${CMAKE_SOURCE_DIR}/scripts/packaging/ogs-de-icon.icns)
+set(APP_ICON ${SOURCE_DIR_REL}/scripts/packaging/ogs-de-icon.icns)
 
 # Create the executable
 add_executable(DataExplorer MACOSX_BUNDLE
diff --git a/FileIO/CsvInterface.h b/FileIO/CsvInterface.h
index 848e75410829eaad7ef3371a1f100670fd271fdf..96101780d159a5de21a251a1fa2b0e6032a0de3d 100644
--- a/FileIO/CsvInterface.h
+++ b/FileIO/CsvInterface.h
@@ -24,7 +24,7 @@
 // ThirdParty/logog
 #include "logog/include/logog.hpp"
 
-#include "StringTools.h"
+#include "BaseLib/StringTools.h"
 
 namespace GeoLib {
 	class Point;
diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake
index 8f0094d8e602f2f12084585a7e608188f030f82d..5a785319cda06902189df96a5643fb65f97575dc 100644
--- a/scripts/cmake/CMakeSetup.cmake
+++ b/scripts/cmake/CMakeSetup.cmake
@@ -18,8 +18,16 @@ include(GetGitRevisionDescription)
 GET_GIT_HEAD_REVISION(GIT_REFSPEC GIT_SHA1)
 string(SUBSTRING ${GIT_SHA1} 0 8 GIT_SHA1_SHORT)
 
-if($ENV{CI})
-	set(OGS_VERSION 6.6.6) # Dummy version for CI-environment (Travis)
+# Check if this project is included in another
+if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+	set(IS_SUBPROJECT ON CACHE INTERNAL "" FORCE)
+	set(OGS_BUILD_CLI OFF CACHE BOOL "" FORCE)
+endif()
+
+if(DEFINED $ENV{CI})
+	set(OGS_VERSION 6.6.6) # Dummy version for CI-environment (Travis) or subproject
+elseif(IS_SUBPROJECT)
+	set(OGS_VERSION x.x.x)
 else()
 	GIT_GET_TAG(GIT_DESCRIBE)
 	string(REGEX MATCH ^[0-9|\\.]* GIT_TAG ${GIT_DESCRIBE})
diff --git a/scripts/cmake/ProjectSetup.cmake b/scripts/cmake/ProjectSetup.cmake
index 25b4ff328c9123e61943c9a683227091f847515d..f72640b90b0a41fc4198538cfa7b1749bc8b2924 100644
--- a/scripts/cmake/ProjectSetup.cmake
+++ b/scripts/cmake/ProjectSetup.cmake
@@ -22,9 +22,4 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-# Check if this project is included in another
-if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-	set(IS_SUBPROJECT ON INTERNAL)
-endif()
-
 site_name(HOSTNAME)
diff --git a/scripts/cmake/packaging/Pack.cmake b/scripts/cmake/packaging/Pack.cmake
index 2bfc4f003421e9a97d4e40201777241317ebbaf5..e1282e666f75550da11acb3e78390b2b72ec9493 100644
--- a/scripts/cmake/packaging/Pack.cmake
+++ b/scripts/cmake/packaging/Pack.cmake
@@ -1,3 +1,8 @@
+if(IS_SUBPROJECT)
+	include (CPack)
+	return()
+endif()
+
 include(packaging/PackagingMacros)
 include(packaging/ArchiveTestdata)