diff options
| author | Klaus Kämpf <kkaempf@suse.de> | 2010-12-01 08:59:53 +0100 |
|---|---|---|
| committer | Klaus Kämpf <kkaempf@suse.de> | 2010-12-01 08:59:53 +0100 |
| commit | ce43971aaa0a356dd82b870614d04500c389146c (patch) | |
| tree | fd85d2f418f7fb32819d640059d5ccaea33693a1 /swig | |
| parent | f1118b0b4cbbc40b569b7dc0300cc3714642d159 (diff) | |
| parent | f5c9977c4842ebafc53fe395c79b8c38091b59e5 (diff) | |
| download | libzypp-bindings-ce43971aaa0a356dd82b870614d04500c389146c.tar.gz libzypp-bindings-ce43971aaa0a356dd82b870614d04500c389146c.tar.bz2 libzypp-bindings-ce43971aaa0a356dd82b870614d04500c389146c.zip | |
Merge branch 'master' of gitorious.org:opensuse/libzypp-bindings
Fix Conflict (rdoc)
Diffstat (limited to 'swig')
| -rw-r--r-- | swig/ruby/CMakeLists.txt | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/swig/ruby/CMakeLists.txt b/swig/ruby/CMakeLists.txt index edbcf24..08d6329 100644 --- a/swig/ruby/CMakeLists.txt +++ b/swig/ruby/CMakeLists.txt @@ -42,17 +42,20 @@ INSTALL(TARGETS zypp_ruby LIBRARY DESTINATION ${RUBY_VENDORARCH_DIR}) # # This requires rdoc-swig from https://github.com/kkaempf/rdoc-swig # -#SET(rdoc_dir "${CMAKE_CURRENT_BINARY_DIR}/html") -#ADD_CUSTOM_COMMAND ( -# OUTPUT ${rdoc_dir} -# COMMAND ${CMAKE_COMMAND} -E echo_append "Creating rdoc documentation ..." -# COMMAND rm -rf ${rdoc_dir} -# COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rdoc -o ${rdoc_dir} zypp.i *.i ruby/*.i -# COMMAND ${CMAKE_COMMAND} -E echo "Done." -# WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/swig -# DEPENDS ${CMAKE_SOURCE_DIR}/swig/*.i ${CMAKE_SOURCE_DIR}/swig/ruby/*.rb ${CMAKE_SOURCE_DIR}/swig/ruby/*.i -#) -#ADD_CUSTOM_TARGET(ruby_rdoc ALL DEPENDS "${rdoc_dir}") + +IF(EXISTS ${CMAKE_SOURCE_DIR}/swig/ruby/rdoc) +SET(rdoc_dir "${CMAKE_CURRENT_BINARY_DIR}/html") +ADD_CUSTOM_COMMAND ( + OUTPUT ${rdoc_dir} + COMMAND ${CMAKE_COMMAND} -E echo_append "Creating rdoc documentation ..." + COMMAND rm -rf ${rdoc_dir} + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rdoc -o ${rdoc_dir} zypp.i *.i ruby/*.i + COMMAND ${CMAKE_COMMAND} -E echo "Done." + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/swig + DEPENDS ${CMAKE_SOURCE_DIR}/swig/*.i ${CMAKE_SOURCE_DIR}/swig/ruby/*.rb ${CMAKE_SOURCE_DIR}/swig/ruby/*.i +) +ADD_CUSTOM_TARGET(ruby_rdoc ALL DEPENDS "${rdoc_dir}") +ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/swig/ruby/rdoc) # # Leave this to %doc in the .spec file |