X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cmake%2Fdbus%2FCMakeLists.txt;h=0205f852953b6e6857bd2ab84ccec81fddc953fd;hb=0cb7d487bc02730a4f6100108446c05aeb3b4453;hp=79bf6566bbdf0c16fafce96bed5cce0aad619b52;hpb=3718730332bc295c324987b86cfa2c09585f84ec;p=platform%2Fupstream%2Fdbus.git

diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index 79bf656..0205f85 100644
--- a/cmake/dbus/CMakeLists.txt
+++ b/cmake/dbus/CMakeLists.txt
@@ -1,11 +1,8 @@
-project(dbus)
+project(dbus-lib)
 
-#INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION
-
-include_directories(${CMAKE_SOURCE_DIR}/..)
 SET(DBUS_DIR ${CMAKE_SOURCE_DIR}/../dbus)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dbus-arch-deps.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/dbus-arch-deps.h )
+configure_file(${DBUS_DIR}/dbus-arch-deps.h.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-arch-deps.h )
 
 add_definitions(-DDBUS_COMPILATION)
 
@@ -24,6 +21,7 @@ set (dbusinclude_HEADERS
 	${DBUS_DIR}/dbus-server.h
 	${DBUS_DIR}/dbus-shared.h
 	${DBUS_DIR}/dbus-signature.h
+	${DBUS_DIR}/dbus-syntax.h
 	${DBUS_DIR}/dbus-threads.h
 	${DBUS_DIR}/dbus-types.h
 	dbus-arch-deps.h
@@ -34,9 +32,9 @@ set (dbusinclude_HEADERS
 set (DBUS_LIB_SOURCES
 	${DBUS_DIR}/dbus-address.c
 	${DBUS_DIR}/dbus-auth.c
-	${DBUS_DIR}/dbus-auth-script.c
 	${DBUS_DIR}/dbus-bus.c
 	${DBUS_DIR}/dbus-connection.c
+	${DBUS_DIR}/dbus-credentials.c
 	${DBUS_DIR}/dbus-errors.c
 	${DBUS_DIR}/dbus-keyring.c
 	${DBUS_DIR}/dbus-marshal-header.c
@@ -45,6 +43,7 @@ set (DBUS_LIB_SOURCES
 	${DBUS_DIR}/dbus-marshal-validate.c
 	${DBUS_DIR}/dbus-message.c
 	${DBUS_DIR}/dbus-misc.c
+	${DBUS_DIR}/dbus-nonce.c
 	${DBUS_DIR}/dbus-object-tree.c
 	${DBUS_DIR}/dbus-pending-call.c
 	${DBUS_DIR}/dbus-resources.c
@@ -53,27 +52,31 @@ set (DBUS_LIB_SOURCES
 	${DBUS_DIR}/dbus-server-debug-pipe.c
 	${DBUS_DIR}/dbus-sha.c
 	${DBUS_DIR}/dbus-signature.c
+	${DBUS_DIR}/dbus-syntax.c
 	${DBUS_DIR}/dbus-timeout.c
 	${DBUS_DIR}/dbus-threads.c
 	${DBUS_DIR}/dbus-transport.c
 	${DBUS_DIR}/dbus-transport-socket.c
 	${DBUS_DIR}/dbus-watch.c
-#dbus-md5.c
-#
-#  find a clean Windows implementation
-#  and move code to a *-win.c file
 )
+
+
 if(UNIX)
-    set (DBUS_LIB_SOURCES ${DBUS_LIB_SOURCES} 
-	    ${DBUS_DIR}/dbus-transport-unix.c
-	    ${DBUS_DIR}/dbus-server-unix.c
+	set (DBUS_LIB_SOURCES ${DBUS_LIB_SOURCES} 
+		${DBUS_DIR}/dbus-transport-unix.c
+		${DBUS_DIR}/dbus-server-unix.c
+	)
+else(UNIX)
+	set (DBUS_LIB_SOURCES ${DBUS_LIB_SOURCES} 
+		${DBUS_DIR}/dbus-transport-win.c
+		${DBUS_DIR}/dbus-server-win.c
 	)
 endif(UNIX)
 
 set (DBUS_LIB_HEADERS
 	${DBUS_DIR}/dbus-auth.h
-	${DBUS_DIR}/dbus-auth-script.h
 	${DBUS_DIR}/dbus-connection-internal.h
+	${DBUS_DIR}/dbus-credentials.h
 	${DBUS_DIR}/dbus-keyring.h
 	${DBUS_DIR}/dbus-marshal-header.h
 	${DBUS_DIR}/dbus-marshal-byteswap.h
@@ -94,17 +97,27 @@ set (DBUS_LIB_HEADERS
 	${DBUS_DIR}/dbus-threads-internal.h
 	${DBUS_DIR}/dbus-transport.h
 	${DBUS_DIR}/dbus-transport-protected.h
-	${DBUS_DIR}/dbus-transport-unix.h
 	${DBUS_DIR}/dbus-watch.h
 	${CMAKE_BINARY_DIR}/config.h
-##dbus-md5.h
 )
+if(UNIX)
+	set (DBUS_LIB_HEADERS ${DBUS_LIB_HEADERS} 
+		${DBUS_DIR}/dbus-transport-unix.h
+	)
+else(UNIX)
+	set (DBUS_LIB_HEADERS ${DBUS_LIB_HEADERS} 
+		${DBUS_DIR}/dbus-transport-win.h
+	)
+endif(UNIX)
+
+
 ### source code that goes in the installed client library
 ### AND is generic utility functionality used by the 
 ### daemon or test programs (all symbols in here should 
 ### be underscore-prefixed)
 set (DBUS_SHARED_SOURCES
 	${DBUS_DIR}/dbus-dataslot.c
+	${DBUS_DIR}/dbus-file.c
 	${DBUS_DIR}/dbus-hash.c
 	${DBUS_DIR}/dbus-internals.c
 	${DBUS_DIR}/dbus-list.c
@@ -113,12 +126,12 @@ set (DBUS_SHARED_SOURCES
 	${DBUS_DIR}/dbus-mempool.c
 	${DBUS_DIR}/dbus-string.c
 	${DBUS_DIR}/dbus-sysdeps.c
-	${DBUS_DIR}/dbus-sysdeps-util.c
-	${DBUS_DIR}/dbus-userdb.c
+	${DBUS_DIR}/dbus-pipe.c
 )
 
 set (DBUS_SHARED_HEADERS
 	${DBUS_DIR}/dbus-dataslot.h
+	${DBUS_DIR}/dbus-file.h
 	${DBUS_DIR}/dbus-hash.h
 	${DBUS_DIR}/dbus-internals.h
 	${DBUS_DIR}/dbus-list.h
@@ -126,8 +139,8 @@ set (DBUS_SHARED_HEADERS
 	${DBUS_DIR}/dbus-mempool.h
 	${DBUS_DIR}/dbus-string.h
 	${DBUS_DIR}/dbus-string-private.h
+	${DBUS_DIR}/dbus-pipe.h
 	${DBUS_DIR}/dbus-sysdeps.h
-	${DBUS_DIR}/dbus-userdb.h
 )
 
 ### source code that is generic utility functionality used
@@ -136,7 +149,10 @@ set (DBUS_SHARED_HEADERS
 ### should be underscore-prefixed but don't really need 
 ### to be unless they move to DBUS_SHARED_SOURCES later)
 set (DBUS_UTIL_SOURCES
+	${DBUS_DIR}/dbus-asv-util.c
+	${DBUS_DIR}/dbus-auth-script.c
 	${DBUS_DIR}/dbus-auth-util.c
+	${DBUS_DIR}/dbus-credentials-util.c
 	${DBUS_DIR}/dbus-mainloop.c
 	${DBUS_DIR}/dbus-marshal-byteswap-util.c
 	${DBUS_DIR}/dbus-marshal-recursive-util.c
@@ -144,21 +160,26 @@ set (DBUS_UTIL_SOURCES
 	${DBUS_DIR}/dbus-message-factory.c
 	${DBUS_DIR}/dbus-message-util.c
 	${DBUS_DIR}/dbus-shell.c
+	${DBUS_DIR}/dbus-socket-set.c
+	${DBUS_DIR}/dbus-socket-set-poll.c
 	${DBUS_DIR}/dbus-string-util.c
-	${DBUS_DIR}/dbus-userdb-util.c
+	${DBUS_DIR}/dbus-sysdeps-util.c
 )
 
-if (DBUS_BUILD_TESTS)
+if (DBUS_ENABLE_EMBEDDED_TESTS)
 	set (DBUS_UTIL_SOURCES 
 		${DBUS_UTIL_SOURCES}
 		${DBUS_DIR}/dbus-test.c
 	)
-endif (DBUS_BUILD_TESTS)
+endif (DBUS_ENABLE_EMBEDDED_TESTS)
 
 set (DBUS_UTIL_HEADERS
+	${DBUS_DIR}/dbus-asv-util.h
+	${DBUS_DIR}/dbus-auth-script.h
 	${DBUS_DIR}/dbus-mainloop.h
 	${DBUS_DIR}/dbus-message-factory.h
 	${DBUS_DIR}/dbus-shell.h
+	${DBUS_DIR}/dbus-socket-set.h
 	${DBUS_DIR}/dbus-spawn.h
 	${DBUS_DIR}/dbus-test.h
 )
@@ -166,79 +187,124 @@ set (DBUS_UTIL_HEADERS
 ### platform specific settings
 if (WIN32)
 	set (DBUS_SHARED_SOURCES ${DBUS_SHARED_SOURCES} 
+		${DBUS_DIR}/dbus-file-win.c
+		${DBUS_DIR}/dbus-init-win.cpp
 		${DBUS_DIR}/dbus-sysdeps-win.c
+		${DBUS_DIR}/dbus-pipe-win.c
 		${DBUS_DIR}/dbus-sysdeps-thread-win.c
-		${DBUS_DIR}/dbus-sysdeps-util-win.c
-		${DBUS_DIR}/dbus-spawn-win.c
 	)
 	set (DBUS_SHARED_HEADERS ${DBUS_SHARED_HEADERS} 
-    ${DBUS_DIR}/dbus-sockets-win.h
-    ${DBUS_DIR}/dbus-sysdeps-win.h
-  )
-	set (LIBS ${LIBS} ws2_32 advapi32 netapi32)
-
+		${DBUS_DIR}/dbus-sockets-win.h
+		${DBUS_DIR}/dbus-sysdeps-win.h
+	)
+	set (DBUS_UTIL_SOURCES ${DBUS_UTIL_SOURCES}
+		${DBUS_DIR}/dbus-spawn-win.c
+		${DBUS_DIR}/dbus-sysdeps-util-win.c
+	)
+	if(WINCE)
+	set (DBUS_SHARED_SOURCES ${DBUS_SHARED_SOURCES}
+		${DBUS_DIR}/dbus-sysdeps-wince-glue.c
+	)
+	set (DBUS_SHARED_HEADERS ${DBUS_SHARED_HEADERS}
+		${DBUS_DIR}/dbus-sysdeps-wince-glue.h
+	)
+	endif(WINCE)
 else (WIN32)
 	set (DBUS_SHARED_SOURCES ${DBUS_SHARED_SOURCES} 
+		${DBUS_DIR}/dbus-file-unix.c
+		${DBUS_DIR}/dbus-pipe-unix.c
 		${DBUS_DIR}/dbus-sysdeps-unix.c
 		${DBUS_DIR}/dbus-sysdeps-pthread.c
-		${DBUS_DIR}/dbus-sysdeps-util-unix.c
-		${DBUS_DIR}/dbus-spawn.c
+		${DBUS_DIR}/dbus-userdb.c
+        ${DBUS_DIR}/sd-daemon.c
 	)
 	set (DBUS_SHARED_HEADERS ${DBUS_SHARED_HEADERS} 
-    ${DBUS_DIR}/dbus-server-unix.h
-    ${DBUS_DIR}/dbus-transport-unix.h
-    ${DBUS_DIR}/dbus-sysdeps-unix.h
-  )
+		${DBUS_DIR}/dbus-server-unix.h
+		${DBUS_DIR}/dbus-transport-unix.h
+		${DBUS_DIR}/dbus-sysdeps-unix.h
+		${DBUS_DIR}/dbus-userdb.h
+        ${DBUS_DIR}/sd-daemon.h
+	)
+	set (DBUS_UTIL_SOURCES ${DBUS_UTIL_SOURCES}
+		${DBUS_DIR}/dbus-spawn.c
+		${DBUS_DIR}/dbus-userdb-util.c
+		${DBUS_DIR}/dbus-sysdeps-util-unix.c
+	)
 endif (WIN32)
 
 set(libdbus_SOURCES
 	${DBUS_LIB_SOURCES}
 	${DBUS_SHARED_SOURCES}
-	# for debugging
-	${DBUS_UTIL_SOURCES}
 )
 
 set(libdbus_HEADERS 
 	${DBUS_LIB_HEADERS}
 	${DBUS_SHARED_HEADERS}
-	# for debugging
-	${DBUS_UTIL_HEADERS}
 )
+if (MSVC)
+    set (BUILD_FILEVERSION ${DBUS_MAJOR_VERSION},${DBUS_MINOR_VERSION},${DBUS_MICRO_VERSION},${DBUS_PATCH_VERSION})
+    set (BUILD_TIMESTAMP ${DBUS_BUILD_TIMESTAMP})
+    
+    configure_file(${DBUS_DIR}/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo.rc)
+    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/afxres.h "")
+    list(APPEND libdbus_SOURCES versioninfo.rc)
+    set_source_files_properties(versioninfo.rc COMPILE_FLAGS "-D__LINE__=1")
+endif (MSVC)
 
-set(CMAKE_DEBUG_POSTFIX "d")
-if(MSVC)
-	add_library(dbus-1 STATIC ${libdbus_SOURCES} ${libdbus_HEADERS} )
-	project_source_group(${GROUP_CODE} libdbus_SOURCES libdbus_HEADERS)
-else(MSVC)
-	add_library(dbus-1 ${libdbus_SOURCES} ${libdbus_HEADERS} )
-endif(MSVC)
+if(MSVC_IDE)
+	project_source_group(${GROUP_CODE} DBUS_LIB_SOURCES DBUS_LIB_HEADERS)
+	project_source_group(${GROUP_CODE} DBUS_SHARED_SOURCES DBUS_SHARED_HEADERS)
+	project_source_group(${GROUP_CODE} DBUS_UTIL_SOURCES DBUS_UTIL_SOURCES)
+endif(MSVC_IDE)
 
-target_link_libraries(dbus-1 ${LIBS} )
+### Client library
 
-install_targets(/lib dbus-1 )
+add_library(dbus-1 SHARED
+			${libdbus_SOURCES}
+			${libdbus_HEADERS}
+)
+if(WIN32)
+    if(WINCE)
+        target_link_libraries(dbus-1 ws2)
+    else(WINCE)
+        target_link_libraries(dbus-1 ws2_32 advapi32 netapi32 iphlpapi)
+    endif(WINCE)
+else(WIN32)
+    target_link_libraries(dbus-1 ${CMAKE_THREAD_LIBS_INIT} rt)
+endif(WIN32)
+
+install(TARGETS dbus-1 ${INSTALL_TARGETS_DEFAULT_ARGS})
 install_files(/include/dbus FILES ${dbusinclude_HEADERS})
 
-#ADD_EXECUTABLE(dbus-example dbus-example.c)
-#target_link_libraries(${CMAKE_SOURCE_DIR}/../dbus/dbus-example dbus-1)
-#install_targets(/bin dbus-example )
-
-## note that TESTS has special meaning (stuff to use in make check)
-## so if adding tests not to be run in make check, don't add them to 
-## TESTS
-#if DBUS_BUILD_TESTS
-#TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus
-#TESTS=dbus-test
-#else
-#TESTS=
-#endif
-
-if (DBUS_BUILD_TESTS)
+### Internal library, used for the daemon, tools and tests, compiled statically.
+
+add_library(dbus-internal ${DBUS_INTERNAL_ADD_LIBRARY_OPTIONS}
+			${DBUS_LIB_SOURCES}
+			${DBUS_LIB_HEADERS}
+			${DBUS_SHARED_SOURCES}
+			${DBUS_SHARED_HEADERS}
+			${DBUS_UTIL_SOURCES}
+			${DBUS_UTIL_HEADERS}
+)
+target_link_libraries(dbus-internal)
+set_target_properties(dbus-internal PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_LIBRARY_DEFINITIONS})
+if(WIN32)
+    if(WINCE)
+        target_link_libraries(dbus-internal ws2)
+    else(WINCE)
+        target_link_libraries(dbus-internal ws2_32 advapi32 netapi32 iphlpapi)
+    endif(WINCE)
+else(WIN32)
+    target_link_libraries(dbus-internal ${CMAKE_THREAD_LIBS_INIT} rt)
+endif(WIN32)
+
+if (DBUS_ENABLE_EMBEDDED_TESTS)
 	set (TESTS_ENVIRONMENT "DBUS_TEST_DATA=${CMAKE_SOURCE_DIR}/test/data DBUS_TEST_HOMEDIR=${CMAKE_BUILD_DIR}/dbus")
-	ADD_EXECUTABLE(dbus-test  ${CMAKE_SOURCE_DIR}/../dbus/dbus-test-main.c)
-	target_link_libraries(dbus-test dbus-1 ${LIBS})
+	ADD_EXECUTABLE(dbus-test ${CMAKE_SOURCE_DIR}/../dbus/dbus-test-main.c)
+	target_link_libraries(dbus-test ${DBUS_INTERNAL_LIBRARIES})
 	add_test(dbus-test ${EXECUTABLE_OUTPUT_PATH}/dbus-test ${CMAKE_SOURCE_DIR}/../test/data)
-	install_targets(/bin dbus-test)
-ENDIF (DBUS_BUILD_TESTS)
+	set_target_properties(dbus-test PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
+ENDIF (DBUS_ENABLE_EMBEDDED_TESTS)
 
 if (UNIX)
 # set version info