diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7abb0d57..82ec8a34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -176,20 +176,29 @@ IF(WIN32)
 	include_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854/include)
 ENDIF()
 
-ADD_SUBDIRECTORY( source/shared_lib )
-ADD_SUBDIRECTORY( source/glest_game )
-#if(wxWidgets_FOUND)
-  ADD_SUBDIRECTORY( source/glest_map_editor )
-  ADD_SUBDIRECTORY( source/g3d_viewer )
-  ADD_SUBDIRECTORY( source/configurator )
-#else()
-#  MESSAGE(STATUS "WARNING... the following game tools will NOT be built since we cannot find wxWidgets on this machine")
-#  MESSAGE(STATUS "map editor, g3d viewer, configurator")
-#endif()
-ADD_SUBDIRECTORY( source/tools/glexemel )
+# Check if sources exist
+IF(EXISTS "source/")
+	MESSAGE(STATUS "**Found game source code.")
 
-IF(APPLE)
-	include(mk/macosx/CMakeLists.txt)
-ENDIF(APPLE)
+	ADD_SUBDIRECTORY( source/shared_lib )
+	ADD_SUBDIRECTORY( source/glest_game )
+	#if(wxWidgets_FOUND)
+	  ADD_SUBDIRECTORY( source/glest_map_editor )
+	  ADD_SUBDIRECTORY( source/g3d_viewer )
+	  ADD_SUBDIRECTORY( source/configurator )
+	#else()
+	#  MESSAGE(STATUS "WARNING... the following game tools will NOT be built since we cannot find wxWidgets on this machine")
+	#  MESSAGE(STATUS "map editor, g3d viewer, configurator")
+	#endif()
+	ADD_SUBDIRECTORY( source/tools/glexemel )
 
+	IF(APPLE)
+		include(mk/macosx/CMakeLists.txt)
+	ENDIF(APPLE)
+ENDIF()
 
+# Check if data exist
+IF(EXISTS "data/glest_game/")
+        MESSAGE(STATUS "**Found game data.")
+	ADD_SUBDIRECTORY( data/glest_game )
+ENDIF()
diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index 318b5082..ccb89b34 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -202,36 +202,36 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
 		DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
 
 	# Installation of the program config and image files
-	INSTALL(FILES 
-	  "${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"
-	  "${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
-	  "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.bmp"
-	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
+#	INSTALL(FILES 
+#	  "${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"
+#	  "${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
+#	  "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.bmp"
+#	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
 
 	# Installation of the program desktop file
-	INSTALL(FILES 
-	  "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.desktop"
-	  DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
+#	INSTALL(FILES 
+#	  "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.desktop"
+#	  DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
 
 	# Installation of the program desktop icon file
-	INSTALL(FILES 
-	  "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
-	  DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
+#	INSTALL(FILES 
+#	  "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
+#	  DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
 
 	# Installation of data files from outside normal data folder
-	INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/source/masterserver/flags" 
-	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}data/core/misc_textures
-	  OPTIONAL REGEX "/.svn" EXCLUDE)
+#	INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/source/masterserver/flags" 
+#	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}data/core/misc_textures
+#	  OPTIONAL REGEX "/.svn" EXCLUDE)
 
 	# Installation of the data
-	install(
-	  DIRECTORY "${PROJECT_SOURCE_DIR}/data/glest_game/data" 
-		    "${PROJECT_SOURCE_DIR}/data/glest_game/docs" 
-		    "${PROJECT_SOURCE_DIR}/data/glest_game/maps"
-		    "${PROJECT_SOURCE_DIR}/data/glest_game/scenarios"
-		    "${PROJECT_SOURCE_DIR}/data/glest_game/techs"
-		    "${PROJECT_SOURCE_DIR}/data/glest_game/tilesets"
-		    "${PROJECT_SOURCE_DIR}/data/glest_game/tutorials"
-	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}
-	  OPTIONAL REGEX "/.svn" EXCLUDE)
+#	install(
+#	  DIRECTORY "${PROJECT_SOURCE_DIR}/data/glest_game/data" 
+#		    "${PROJECT_SOURCE_DIR}/data/glest_game/docs" 
+#		    "${PROJECT_SOURCE_DIR}/data/glest_game/maps"
+#		    "${PROJECT_SOURCE_DIR}/data/glest_game/scenarios"
+#		    "${PROJECT_SOURCE_DIR}/data/glest_game/techs"
+#		    "${PROJECT_SOURCE_DIR}/data/glest_game/tilesets"
+#		    "${PROJECT_SOURCE_DIR}/data/glest_game/tutorials"
+#	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}
+#	  OPTIONAL REGEX "/.svn" EXCLUDE)
 ENDIF()