--- a/src/CMakeLists.txt	Wed Jan 21 03:33:35 2009 +0200
+++ b/src/CMakeLists.txt	Wed Jan 21 23:07:22 2009 +0200
@@ -1,19 +1,32 @@
-FILE(GLOB SOURCE_FILES "*.cc" "Network/*.cc" "Graphics/*.cc")
-FILE(GLOB HEADER_FILES "*.hh" "Network/*.hh" "Graphics/*.hh")
+FILE(GLOB SOURCE_FILES "*.cc" "Network/*.cc")
+FILE(GLOB HEADER_FILES "*.hh" "Network/*.hh")
 
 set_source_files_properties("version.c" PROPERTIES GENERATED true)
-set(SOURCES ${SOURCE_FILES} ${HEADER_FILES} "version.c")
 
 # Generate config.h
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h" @ONLY)
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")
 
+# main module
+set (CORE_CLANLIB_COMPONENTS Core App Signals)
+set (CORE_SOURCES ${SOURCE_FILES} ${HEADER_FILES})
+
+# Graphics module
+add_subdirectory(Graphics)
+
 # Libraries
+set (CLANLIB_VERSION 0.8)
+set (CLANLIB_COMPONENTS ${CORE_CLANLIB_COMPONENTS} ${GRAPHICS_CLANLIB_COMPONENTS})
 
 # ClanLib 0.8
-find_package(ClanLib 0.8 REQUIRED COMPONENTS Core App Signals Display GL Sound Network)
+message (STATUS "Finding ClanLib version=${CLANLIB_VERSION}, components=${CLANLIB_COMPONENTS}" )
+find_package(ClanLib ${CLANLIB_VERSION} REQUIRED COMPONENTS ${CLANLIB_COMPONENTS})
+
 include_directories(${ClanLib_INCLUDE_DIRS})
+
+# build list of libs/source files
 set(LIBS ${LIBS} ${ClanLib_LIBRARIES})
+set(SOURCES ${CORE_SOURCES} ${GRAPHICS_SOURCES} "version.c")
 
 # Assumes the project generates only one executable. If you need more, you'll need to alter
 # the script and replace ${PROJECT_SHORT_NAME} by executable name.