add QtSOAP dependencies

Daniele Giunchi · Daniele Giunchi · commit 683423390f56 · 2011-04-04T15:43:10.000+02:00
diff --git a/CMake/FindQtSOAP.cmake b/CMake/FindQtSOAP.cmake
diff --git a/CMake/mafMacroFoundationLibraries.cmake b/CMake/mafMacroFoundationLibraries.cmake
@@ -12,10 +12,6 @@
 MACRO(mafMacroFoundationLibraries)
 
 include(FindVXL)
-include(FindQtSOAP)
-
-#include(FindQXMLRPC)
-
 include(FindQScxml)
 
 include(mafCopySharedLibrariesInInstallDir)
diff --git a/CMakeExternals/External_QtSoap.cmake b/CMakeExternals/External_QtSoap.cmake
@@ -0,0 +1,41 @@
+#
+# QtSOAP
+#
+
+SET(QtSOAP_DEPENDS)
+
+  SET(QtSOAP_enabling_variable QtSOAP_LIBRARIES)
+
+  SET(proj QtSOAP)
+  SET(proj_DEPENDENCIES)
+
+  SET(QtSOAP_DEPENDS ${proj})
+
+  IF(NOT DEFINED QtSOAP_DIR)
+  
+    #     MESSAGE(STATUS "Adding project:${proj}")
+    ExternalProject_Add(${proj}
+      GIT_REPOSITORY "${git_protocol}://github.com/commontk/QtSOAP.git"
+      GIT_TAG "origin/master"
+      CMAKE_GENERATOR ${gen}
+      INSTALL_COMMAND ""
+      CMAKE_ARGS
+        ${ep_common_args}
+        -DBUILD_SHARED_LIBS:BOOL=ON
+        -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+      DEPENDS
+        ${proj_DEPENDENCIES}
+      )
+    SET(QtSOAP_DIR "${ep_build_dir}/${proj}")
+    
+    # Since QtSOAP is statically build, there is not need to add its corresponding 
+    # library output directory to CTK_EXTERNAL_LIBRARY_DIRS
+
+  ELSE()
+    ctkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
+  ENDIF()
+
+  SET(${QtSOAP_enabling_variable}_LIBRARY_DIRS QtSOAP_LIBRARY_DIRS)
+  SET(${QtSOAP_enabling_variable}_INCLUDE_DIRS QtSOAP_INCLUDE_DIRS)
+  SET(${QtSOAP_enabling_variable}_FIND_PACKAGE_CMD QtSOAP)
+
diff --git a/CMakeExternals/Find_QtSOAP.cmake b/CMakeExternals/Find_QtSOAP.cmake
@@ -0,0 +1,4 @@
+  SET(QtSOAP_DIR "${MAF_EXTERNAL_BUILD_DIR}/Build/QtSOAP")
+  FIND_PACKAGE(QtSOAP REQUIRED)
+  include(${QtSOAP_DIR}/QtSOAPConfig.cmake)
+  INCLUDE(${QtSOAP_USE_FILE})
diff --git a/SuperBuild.cmake b/SuperBuild.cmake
@@ -84,6 +84,9 @@ set(MAF_DEPENDENCIES)
 if(MAF_EVENT_BUS)
   set(MAF_DEPENDENCIES ${MAF_DEPENDENCIES} qxmlrpc)
   include(CMakeExternals/External_qxmlrpc.cmake)
+  
+  set(MAF_DEPENDENCIES ${MAF_DEPENDENCIES} QtSOAP)
+  include(CMakeExternals/External_QtSOAP.cmake)
 endif(MAF_EVENT_BUS)
 
 if(MAF_PLUGINVTK)
@@ -207,6 +210,8 @@ ExternalProject_Add(${proj}
     #-DVTK_DEBUG_LEAKS:BOOL=${MAF_USE_VTK_DEBUG_LEAKS}
     # qxmlrpc
     -Dqxmlrpc_DIR:PATH=${qxmlrpc_DIR} # Findqxmlrpc expects qxmlrpc_DIR variable to be defined
+    # QtSOAP
+    -DQtSOAP_DIR:PATH=${QtSOAP_DIR} # FindQtSOAP expects QtSOAP_DIR variable to be defined
     # CTK
     #-DCTK_DIR:PATH=${CTK_DIR}
     # CTKAppLauncher
diff --git a/src/Examples/RemoteCommunicationXMLRPC/clientXMLRPC/target_libraries.cmake b/src/Examples/RemoteCommunicationXMLRPC/clientXMLRPC/target_libraries.cmake
@@ -5,8 +5,8 @@
 #
 
 SET(foundation_libraries 
-  ${QXMLRPC_LIBRARY} 
-  ${QTSOAP_LIBRARY}
+  qxmlrpc
+  QtSOAP
   ${VXL_LIBRARY}
 )
 
diff --git a/src/Examples/RemoteCommunicationXMLRPC/serverXMLRPC/target_libraries.cmake b/src/Examples/RemoteCommunicationXMLRPC/serverXMLRPC/target_libraries.cmake
@@ -5,8 +5,8 @@
 # 
 
 SET(foundation_libraries 
-  ${QXMLRPC_LIBRARY} 
-  ${QTSOAP_LIBRARY}
+  qxmlrpc 
+  QtSOAP
   ${VXL_LIBRARY}
 )
 
diff --git a/src/Examples/SimpleApp/target_libraries.cmake b/src/Examples/SimpleApp/target_libraries.cmake
@@ -5,8 +5,8 @@
 # 
 
 SET(foundation_libraries 
-  ${QXMLRPC_LIBRARY} 
-  ${QTSOAP_LIBRARY}
+  qxmlrpc 
+  QtSOAP
   ${VXL_LIBRARY}
 )
 
diff --git a/src/mafApplicationLogic/CMakeLists.txt b/src/mafApplicationLogic/CMakeLists.txt
@@ -14,6 +14,7 @@
 ## #################################################################
 
 include(${MAF_SOURCE_DIR}/CMakeExternals/Find_qxmlrpc.cmake)
+include(${MAF_SOURCE_DIR}/CMakeExternals/Find_QtSOAP.cmake)
 
 ## #################################################################
 ## Init Project
diff --git a/src/mafApplicationLogic/target_libraries.cmake b/src/mafApplicationLogic/target_libraries.cmake
@@ -6,7 +6,7 @@
 
 SET(foundation_libraries 
   qxmlrpc
-  ${QTSOAP_LIBRARY}
+  QtSOAP
 )
 
 SET(target_libraries
diff --git a/src/mafEventBus/CMakeLists.txt b/src/mafEventBus/CMakeLists.txt
@@ -14,6 +14,7 @@
 ## #################################################################
 
 include(${MAF_SOURCE_DIR}/CMakeExternals/Find_qxmlrpc.cmake)
+include(${MAF_SOURCE_DIR}/CMakeExternals/Find_QtSOAP.cmake)
 
 ## #################################################################
 ## Init Project
diff --git a/src/mafEventBus/target_libraries.cmake b/src/mafEventBus/target_libraries.cmake
@@ -6,7 +6,7 @@
 
 SET(foundation_libraries 
   qxmlrpc
-  ${QTSOAP_LIBRARY}
+  QtSOAP
 )
 
 SET(target_libraries
diff --git a/src/mafGUI/CMakeLists.txt b/src/mafGUI/CMakeLists.txt
@@ -14,6 +14,7 @@
 ## #################################################################
 
 include(${MAF_SOURCE_DIR}/CMakeExternals/Find_qxmlrpc.cmake)
+include(${MAF_SOURCE_DIR}/CMakeExternals/Find_QtSOAP.cmake)
 
 ## #################################################################
 ## Init Project
diff --git a/src/mafGUI/target_libraries.cmake b/src/mafGUI/target_libraries.cmake
@@ -6,7 +6,7 @@
 
 SET(foundation_libraries 
   qxmlrpc 
-  ${QTSOAP_LIBRARY}
+  QtSOAP
 )
 
 SET(target_libraries
diff --git a/src/mafPluginVTK/CMakeLists.txt b/src/mafPluginVTK/CMakeLists.txt
@@ -14,6 +14,7 @@
 ## #################################################################
 
 include(${MAF_SOURCE_DIR}/CMakeExternals/Find_qxmlrpc.cmake)
+include(${MAF_SOURCE_DIR}/CMakeExternals/Find_QtSOAP.cmake)
 
 ## #################################################################
 ## Find the VTK package.
diff --git a/src/mafPluginVTK/target_libraries.cmake b/src/mafPluginVTK/target_libraries.cmake
@@ -6,7 +6,7 @@
 
 SET(foundation_libraries 
   qxmlrpc 
-  ${QTSOAP_LIBRARY}
+  QtSOAP
   ${VXL_LIBRARY}
 )
 
diff --git a/src/mafResources/CMakeLists.txt b/src/mafResources/CMakeLists.txt
@@ -14,6 +14,7 @@
 ## #################################################################
 
 include(${MAF_SOURCE_DIR}/CMakeExternals/Find_qxmlrpc.cmake)
+include(${MAF_SOURCE_DIR}/CMakeExternals/Find_QtSOAP.cmake)
 
 ## #################################################################
 ## Init Project
diff --git a/src/mafResources/target_libraries.cmake b/src/mafResources/target_libraries.cmake
@@ -6,7 +6,7 @@
 
 SET(foundation_libraries 
   qxmlrpc
-  ${QTSOAP_LIBRARY}
+  QtSOAP
   ${VXL_LIBRARY}
 )
 
diff --git a/src/mafSerialization/CMakeLists.txt b/src/mafSerialization/CMakeLists.txt
@@ -14,6 +14,7 @@
 ## #################################################################
 
 include(${MAF_SOURCE_DIR}/CMakeExternals/Find_qxmlrpc.cmake)
+include(${MAF_SOURCE_DIR}/CMakeExternals/Find_QtSOAP.cmake)
 
 ## #################################################################
 ## Init Project
diff --git a/src/mafSerialization/target_libraries.cmake b/src/mafSerialization/target_libraries.cmake
@@ -6,7 +6,7 @@
 
 SET(foundation_libraries 
   qxmlrpc
-  ${QTSOAP_LIBRARY}
+  QtSOAP
 )
 
 SET(target_libraries
diff --git a/src/mafTimeSpace/CMakeLists.txt b/src/mafTimeSpace/CMakeLists.txt
@@ -14,6 +14,7 @@
 ## #################################################################
 
 include(${MAF_SOURCE_DIR}/CMakeExternals/Find_qxmlrpc.cmake)
+include(${MAF_SOURCE_DIR}/CMakeExternals/Find_QtSOAP.cmake)
 
 
 ## #################################################################

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`SET(foundation_libraries`
`8`		`- ${QXMLRPC_LIBRARY}`
`9`		`- ${QTSOAP_LIBRARY}`
	`8`	`+ qxmlrpc`
	`9`	`+ QtSOAP`
`10`	`10`	`${VXL_LIBRARY}`
`11`	`11`	`)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`SET(foundation_libraries`
`8`	`8`	`qxmlrpc`
`9`		`- ${QTSOAP_LIBRARY}`
	`9`	`+ QtSOAP`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`SET(target_libraries`