--- a/src/CMakeLists.txt	Sun May 03 17:19:36 2009 +0300
+++ b/src/CMakeLists.txt	Mon May 04 20:55:04 2009 +0300
@@ -15,9 +15,10 @@
 set (IRC_SOURCES irc_line.c irc_conn.c irc_net.c irc_chan.c chain.c irc_cmd.c irc_proto.c irc_client.c irc_user.c irc_queue.c irc_net_connect.c)
 set (LUA_SOURCES nexus_lua.c lua_objs.c lua_config.c lua_irc.c lua_func.c lua_type.c)
 set (CONSOLE_SOURCES console.c lua_console.c)
+file (GLOB _TEST_SOURCES "test/*.c")
 
 set (NEXUS_SOURCES nexus.c ${CORE_SOURCES} ${IO_SOURCES} ${IRC_SOURCES} ${LUA_SOURCES} ${CONSOLE_SOURCES} signals.c module.c config.c)
-set (TEST_SOURCES test.c ${CORE_SOURCES} ${IO_SOURCES} transport_test.c ${IRC_SOURCES})
+set (TEST_SOURCES ${_TEST_SOURCES} ${CORE_SOURCES} ${IO_SOURCES} transport_test.c ${IRC_SOURCES})
 set (IRC_LOG_SOURCES modules/irc_log.c)
 set (LOGWATCH_SOURCES modules/logwatch.c modules/logwatch_source.c modules/logwatch_filter.c modules/logwatch_chan.c)
 
@@ -26,7 +27,7 @@
 set (NEXUS_LIBRARIES ${LibEvent_LIBRARIES} ${GnuTLS_LIBRARIES} ${MODULE_LIBRARIES} "readline" ${Lua51_LIBRARIES})
 
 # compiler flags
-set (CFLAGS "-Wall -Wextra -std=gnu99")
+set (CMAKE_C_FLAGS "-Wall -Wextra -std=gnu99")
 
 # add our binaries
 add_executable (nexus ${NEXUS_SOURCES})
@@ -42,11 +43,6 @@
 target_link_libraries (irc_log ${Evsql_LIBRARIES})
 target_link_libraries (logwatch ${PCRE_LIBRARIES})
 
-# global target properties
-set_target_properties (nexus test irc_log logwatch PROPERTIES
-    COMPILE_FLAGS   ${CFLAGS}
-)
-
 # nexus needs to export its symbols to be able to load modules
 set_target_properties (nexus PROPERTIES
     LINK_FLAGS      "--export-dynamic"