Changeset 1484

Timestamp:

12/25/2006 02:32:14 PM (21 months ago)

Author:

jan

Message:

added ctest support

* src/CMakeLists.txt, CMakeLists.txt

• moved ctest setup to the top-cmakelist.txt

* src/CMakeLists.txt

• fixed compile for modules with more than one source-file

* tests/CMakeLists.txt

• added all tests

Location:

trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• src/CMakeLists.txt (modified) (6 diffs)
• tests/CMakeLists.txt (added)

trunk/CMakeLists.txt

@@ -1 @@
-PROJECT(lighttpd)
+PROJECT(lighttpd C)
+
+INCLUDE(CTest)
+
+ENABLE_TESTING()
 
 SET(CPACK_PACKAGE_VERSION_MAJOR 1)
@@ -13 +17 @@
 ADD_SUBDIRECTORY(src build)
 ADD_SUBDIRECTORY(doc)
+ADD_SUBDIRECTORY(tests)
 
 

trunk/src/CMakeLists.txt

@@ -3 +3 @@
 INCLUDE(CheckFunctionExists)
 INCLUDE(CheckVariableExists)
+INCLUDE(CheckTypeSize)
 INCLUDE(CMakeDetermineCCompiler)
 INCLUDE(FindThreads)
 INCLUDE(CPack)
-INCLUDE(CTest)
 
 ## our modules are without the "lib" prefix
@@ -19 +19 @@
         
 MACRO(CHECK_TYPE_EXISTS_ADD_DEF SYMNAME DEFINESTR)
-  ADD_DEFINITIONS(-D${DEFINESTR})
+  SET(CMAKE_EXTRA_INCLUDE_FILES sys/socket.h)
+  CHECK_TYPE_SIZE("${SYMNAME}" ${DEFINESTR}) 
+  SET(CMAKE_EXTRA_INCLUDE_FILES)
+  IF (${DEFINESTR})
+    ADD_DEFINITIONS(-D${DEFINESTR})
+  ENDIF(${DEFINESTR})
 ENDMACRO(CHECK_TYPE_EXISTS_ADD_DEF)
  
@@ -148 +153 @@
 ADD_AND_INSTALL_LIBRARY(mod_rrdtool mod_rrdtool.c)
 ADD_AND_INSTALL_LIBRARY(mod_usertrack mod_usertrack.c)
-ADD_AND_INSTALL_LIBRARY(mod_proxy_core  mod_proxy_core.c
-                mod_proxy_core_pool.c
-                mod_proxy_core_backend.c
-                mod_proxy_core_address.c
-                mod_proxy_core_backlog.c
-                mod_proxy_core_protocol.c
-                mod_proxy_core_rewrites.c) 
+ADD_AND_INSTALL_LIBRARY(mod_proxy_core  "mod_proxy_core.c;mod_proxy_core_pool.c;mod_proxy_core_backend.c;mod_proxy_core_address.c;mod_proxy_core_backlog.c;mod_proxy_core_protocol.c;mod_proxy_core_rewrites.c") 
 ADD_AND_INSTALL_LIBRARY(mod_proxy_backend_http mod_proxy_backend_http.c)
 ADD_AND_INSTALL_LIBRARY(mod_proxy_backend_fastcgi mod_proxy_backend_fastcgi.c)
@@ -169 +168 @@
 ADD_AND_INSTALL_LIBRARY(mod_redirect mod_redirect.c)
 ADD_AND_INSTALL_LIBRARY(mod_rewrite mod_rewrite.c)
-ADD_AND_INSTALL_LIBRARY(mod_auth mod_auth.c http_auth_digest.c http_auth.c)
+ADD_AND_INSTALL_LIBRARY(mod_auth "mod_auth.c;http_auth_digest.c;http_auth.c")
 ADD_AND_INSTALL_LIBRARY(mod_webdav mod_webdav.c)
 ADD_AND_INSTALL_LIBRARY(mod_sql_vhost_core mod_sql_vhost_core.c)
@@ -176 +175 @@
 ADD_AND_INSTALL_LIBRARY(mod_uploadprogress mod_uploadprogress.c)
 ADD_AND_INSTALL_LIBRARY(mod_evasive mod_evasive.c)
-ADD_AND_INSTALL_LIBRARY(mod_ssi mod_ssi_exprparser.c mod_ssi_expr.c mod_ssi.c)
+ADD_AND_INSTALL_LIBRARY(mod_ssi "mod_ssi_exprparser.c;mod_ssi_expr.c;mod_ssi.c")
 ADD_AND_INSTALL_LIBRARY(mod_flv_streaming mod_flv_streaming.c)
 
@@ -217 +216 @@
         ARCHIVE DESTINATION lib/static)
 
-