Changeset 2184

Timestamp:

05/26/2008 10:09:32 AM (3 months ago)

Author:

moo

Message:

added ADD_TARGET_PROPERTIES to simplify code. use pkg-config for checking lua

Location:

trunk

Files:

• cmake/LighttpdMacros.cmake (modified) (1 diff)
• src/CMakeLists.txt (modified) (3 diffs)

trunk/cmake/LighttpdMacros.cmake

@@ -28 +28 @@
 )
 ENDMACRO(LEMON_PARSER)
+
+MACRO(ADD_TARGET_PROPERTIES _target _name _properties)
+  SET(_properties ${ARGV})
+  LIST(REMOVE_AT _properties 0)
+  LIST(REMOVE_AT _properties 1)
+  GET_TARGET_PROPERTY(_old_properties ${_target} ${_name})
+        MESSAGE("adding property to ${_target} ${_name}: ${_properties}")
+  IF(NOT _old_properties)
+    # in case it's NOTFOUND
+    SET(_old_properties)
+  ENDIF(NOT _old_properties)
+  SET_TARGET_PROPERTIES(${_target} PROPERTIES ${_name} "${_old_properties} ${_properties}")
+ENDMACRO(ADD_TARGET_PROPERTIES)

trunk/src/CMakeLists.txt

@@ -303 +303 @@
 
 IF(WITH_LUA)
-  SET(CMAKE_REQUIRED_LIBRARIES "-lm")
-  CHECK_INCLUDE_FILES(lua.h HAVE_LUA_H)
-  CHECK_LIBRARY_EXISTS(lua lua_setfield "" HAVE_LIBLUA)
-  SET(CMAKE_REQUIRED_LIBRARIES)
+  PKGCONFIG(lua LUA_INCDIR LUA_LIBDIR LUA_LDFLAGS LUA_CFLAGS)
+  IF(NOT LUA_LDFLAGS)
+    PKGCONFIG(lua5.1 LUA_INCDIR LUA_LIBDIR LUA_LDFLAGS LUA_CFLAGS)
+  ENDIF(NOT LUA_LDFLAGS)
+  MESSAGE(STATUS "found lua at: INCDIR: ${LUA_INCDIR} LIBDIR: ${LUA_LIBDIR} LDFLAGS: ${LUA_LDFLAGS} CFLAGS: ${LUA_CFLAGS}")
+  IF(LUA_LDFLAGS)
+    SET(HAVE_LIBLUA 1 "Have liblua")
+    INCLUDE_DIRECTORIES(${LUA_INCDIR})
+                ADD_DEFINITIONS(${LUA_CFLAGS})
+
+    SET(CMAKE_REQUIRED_INCLUDES ${LUA_INCDIR})
+    SET(CMAKE_REQUIRED_FLAGS ${LUA_CFLAGS})
+                MESSAGE(${CMAKE_REQUIRED_FLAGS})
+    CHECK_INCLUDE_FILES(lua.h HAVE_LUA_H)
+    SET(CMAKE_REQUIRED_INCLUDES)
+    SET(CMAKE_REQUIRED_FLAGS)
+  ELSE(LUA_LDFLAGS)
+    SET(HAVE_LIBLUA "" "Have liblua")
+    SET(HAVE_LUA_H  "" "Have liblua header")
+  ENDIF(LUA_LDFLAGS)
 ENDIF(WITH_LUA)
 
@@ -580 +596 @@
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
-SET(L_FLAGS)
-
-SET(L_FLAGS "${L_FLAGS} ${GTHREAD_LDFLAGS} ${XML2_LDFLAGS}")
+ADD_TARGET_PROPERTIES(lighttpd LINK_FLAGS "${GTHREAD_LDFLAGS} ${XML2_LDFLAGS} ${LUA_LDFLAGS}")
 IF(CMAKE_SYSTEM MATCHES "Linux")
   ## on linux we need pthread and librt for posix-aio
-  SET(L_FLAGS "${L_FLAGS} -lrt")
+  ADD_TARGET_PROPERTIES(lighttpd LINK_FLAGS "-lrt")
 ENDIF(CMAKE_SYSTEM MATCHES "Linux")
 
-SET_TARGET_PROPERTIES(lighttpd PROPERTIES LINK_FLAGS "${L_FLAGS}")
+ADD_TARGET_PROPERTIES(lighttpd COMPILE_FLAGS "${GTHREAD_CFLAGS} ${LUA_CFLAGS}")
 SET_TARGET_PROPERTIES(lighttpd PROPERTIES CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 
 IF(WIN32)
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNVALGRIND")
-  SET_TARGET_PROPERTIES(lighttpd PROPERTIES COMPILE_FLAGS "-DLI_DECLARE_EXPORTS")
+  ADD_TARGET_PROPERTIES(lighttpd COMPILE_FLAGS "-DLI_DECLARE_EXPORTS")
   TARGET_LINK_LIBRARIES(lighttpd ws2_32)
   TARGET_LINK_LIBRARIES(mod_proxy_core ws2_32)
@@ -605 +619 @@
   ENDIF(WITH_GLIB)
 
-  SET(LINK_FLAGS "${GTHREAD_LDFLAGS}")
   IF(MINGW)
     TARGET_LINK_LIBRARIES(lighttpd msvcr70)
-    SET(FLAGS "${LINK_FLAGS} -Wl,-subsystem,console")
+    ADD_TARGET_PROPERTIES(lighttpd LINK_FLAGS "-Wl,-subsystem,console")
   ENDIF(MINGW)
-  SET_TARGET_PROPERTIES(lighttpd PROPERTIES LINK_FLAGS ${LINK_FLAGS})
 ENDIF(WIN32)