diff --git a/dmlite-complilation-dependencies.patch b/dmlite-complilation-dependencies.patch index d98cb92..33e7366 100644 --- a/dmlite-complilation-dependencies.patch +++ b/dmlite-complilation-dependencies.patch @@ -1,12 +1,30 @@ diff --git a/src/plugins/apache-httpd/src/client/CMakeLists.txt b/src/plugins/apache-httpd/src/client/CMakeLists.txt -index 88daf71f..66491d5a 100644 +index 88daf71f..640de11c 100644 --- a/src/plugins/apache-httpd/src/client/CMakeLists.txt +++ b/src/plugins/apache-httpd/src/client/CMakeLists.txt -@@ -32,6 +32,7 @@ add_custom_command (OUTPUT soapC.c soapClient.c - add_custom_command (OUTPUT DelegationSoapBinding.c +@@ -21,17 +21,18 @@ find_package (Ldap REQUIRED) + pkg_check_modules(GSOAP_PKG REQUIRED gsoapssl>=2.7) + + # Compile the WSDL +-add_custom_command (OUTPUT typemap.dat ++add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/typemap.dat + COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/typemap.dat ${CMAKE_CURRENT_BINARY_DIR}/typemap.dat) +-add_custom_command (OUTPUT delegation.h ++add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/delegation.h + COMMAND wsdl2h -c -o${CMAKE_CURRENT_BINARY_DIR}/delegation.h ${DELEGATION_WSDL} +- DEPENDS typemap.dat) +-add_custom_command (OUTPUT soapC.c soapClient.c ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/typemap.dat) ++add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/soapC.c ${CMAKE_CURRENT_BINARY_DIR}/soapClient.c + COMMAND soapcpp2 -c ${CMAKE_CURRENT_BINARY_DIR}/delegation.h +- DEPENDS delegation.h) +-add_custom_command (OUTPUT DelegationSoapBinding.c ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/delegation.h) ++add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/DelegationSoapBinding.c COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/DelegationSoapBinding.nsmap ${CMAKE_CURRENT_BINARY_DIR}/DelegationSoapBinding.c - DEPENDS soapC.c) -+add_custom_target(delegation2soap DEPENDS soapC.c DelegationSoapBinding.c) +- DEPENDS soapC.c) ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/soapC.c) ++add_custom_target(delegation2soap DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/delegation.h ${CMAKE_CURRENT_BINARY_DIR}/soapC.c ${CMAKE_CURRENT_BINARY_DIR}/soapClient.c ${CMAKE_CURRENT_BINARY_DIR}/DelegationSoapBinding.c) # Includes include_directories (${CMAKE_CURRENT_BINARY_DIR} ${GRIDSITE_INCLUDE_DIR}