From 772b87bfb3ce34dcc444913e68ef71af9f47b90f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbuehler@web.de>
Date: Wed, 9 Sep 2009 18:56:46 +0200
Subject: [PATCH] [cmake] small cleanups, renamed common lib

---
 CMakeLists.txt             | 20 ++------------------
 cmake/LighttpdMacros.cmake |  2 +-
 src/CMakeLists.txt         | 10 +++++-----
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9bb433..1b58fe4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,23 +6,7 @@ SET(PACKAGE_VERSION 2.0.0)
 
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
-INCLUDE(CTest)
-
-ENABLE_TESTING()
-
-SET(CPACK_PACKAGE_VERSION_MAJOR 2)
-SET(CPACK_PACKAGE_VERSION_MINOR 0)
-SET(CPACK_PACKAGE_VERSION_PATCH 0)
-
-#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
-#SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README")
-#SET(CPACK_PACKAGE_VENDOR "jan@kneschke.de")
-
-SET(CPACK_SOURCE_GENERATOR "TGZ")
-SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.;~$;/_;build/;CMakeFiles/;CMakeCache;gz$;Makefile\\\\.;trace;Testing/;foo;autom4te;cmake_install;CPack;\\\\.pem;ltmain.sh;configure;libtool;/config\\\\.;missing;autogen.sh;install-sh;Dart;aclocal;log$;Makefile$")
-
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+#INCLUDE(CTest)
+#ENABLE_TESTING()
 
 ADD_SUBDIRECTORY(src build)
-#ADD_SUBDIRECTORY(doc)
-#ADD_SUBDIRECTORY(tests)
diff --git a/cmake/LighttpdMacros.cmake b/cmake/LighttpdMacros.cmake
index 63041c6..415f329 100644
--- a/cmake/LighttpdMacros.cmake
+++ b/cmake/LighttpdMacros.cmake
@@ -12,7 +12,7 @@ MACRO(ADD_AND_INSTALL_LIBRARY LIBNAME SRCFILES)
 		ADD_TARGET_PROPERTIES(${LIBNAME} COMPILE_FLAGS ${COMMON_CFLAGS})
 		SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
 
-		TARGET_LINK_LIBRARIES(${LIBNAME}  common)
+		TARGET_LINK_LIBRARIES(${LIBNAME} lighttpd-common)
 
 		## Windows likes to link it this way back to app!
 		IF(WIN32)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9b15ab8..80ecd12 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -208,7 +208,7 @@ RAGEL_PARSER(angel/angel_config_parser.rl)
 
 SET(L_INSTALL_TARGETS)
 
-ADD_LIBRARY(common SHARED
+ADD_LIBRARY(lighttpd-common SHARED
 	${COMMON_SRC}
 )
 
@@ -216,14 +216,14 @@ ADD_EXECUTABLE(lighttpd
 	main/lighttpd.c
 	${LIGHTTPD_SHARED_SRC}
 )
-TARGET_LINK_LIBRARIES(lighttpd common)
+TARGET_LINK_LIBRARIES(lighttpd lighttpd-common)
 SET(L_INSTALL_TARGETS ${L_INSTALL_TARGETS} lighttpd)
 
 ADD_EXECUTABLE(lighttpd-angel
 	angel/angel_main.c
 	${ANGEL_SHARED_SRC}
 )
-TARGET_LINK_LIBRARIES(lighttpd-angel common)
+TARGET_LINK_LIBRARIES(lighttpd-angel lighttpd-common)
 SET(L_INSTALL_TARGETS ${L_INSTALL_TARGETS} lighttpd-angel)
 
 IF(BUILD_EXTRA_WARNINGS)
@@ -260,8 +260,8 @@ IF(HAVE_LIBSSL AND HAVE_LIBCRYPTO)
 ENDIF(HAVE_LIBSSL AND HAVE_LIBCRYPTO)
 
 
-ADD_TARGET_PROPERTIES(common LINK_FLAGS ${COMMON_LDFLAGS})
-ADD_TARGET_PROPERTIES(common COMPILE_FLAGS ${COMMON_CFLAGS})
+ADD_TARGET_PROPERTIES(lighttpd-common LINK_FLAGS ${COMMON_LDFLAGS})
+ADD_TARGET_PROPERTIES(lighttpd-common COMPILE_FLAGS ${COMMON_CFLAGS})
 
 ADD_TARGET_PROPERTIES(lighttpd LINK_FLAGS ${COMMON_LDFLAGS})
 ADD_TARGET_PROPERTIES(lighttpd COMPILE_FLAGS ${COMMON_CFLAGS})