diff options
| author | Klaus Kämpf <kkaempf@suse.de> | 2010-11-13 18:17:37 +0100 |
|---|---|---|
| committer | Klaus Kämpf <kkaempf@suse.de> | 2010-11-13 18:17:37 +0100 |
| commit | bfbfa2816aaa63c139b7e55b8caf401f17047c2d (patch) | |
| tree | 76482a382bcb671e8aa81c90a9f949d791e17ed5 | |
| parent | 43f013895fe290659f05ba9ea47305ee09bc2e4c (diff) | |
| download | libzypp-bindings-bfbfa2816aaa63c139b7e55b8caf401f17047c2d.tar.gz libzypp-bindings-bfbfa2816aaa63c139b7e55b8caf401f17047c2d.tar.bz2 libzypp-bindings-bfbfa2816aaa63c139b7e55b8caf401f17047c2d.zip | |
Fix generated .cc name, its libzypp not satsolver
| -rw-r--r-- | swig/perl5/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | swig/python/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | swig/ruby/CMakeLists.txt | 24 |
3 files changed, 14 insertions, 14 deletions
diff --git a/swig/perl5/CMakeLists.txt b/swig/perl5/CMakeLists.txt index 9ed91b5..df226a4 100644 --- a/swig/perl5/CMakeLists.txt +++ b/swig/perl5/CMakeLists.txt @@ -11,7 +11,7 @@ ENABLE_TESTING() ADD_SUBDIRECTORY(tests) # SWIG_OUPUT is per-target -SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_perl.cc" ) +SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/libzypp_perl.cc" ) EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{cppflags}" OUTPUT_VARIABLE PERL_CXXFLAGS) EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{archlib}.\"/CORE\"" OUTPUT_VARIABLE PERL_CORE_DIR) diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt index bdc4909..284bcb0 100644 --- a/swig/python/CMakeLists.txt +++ b/swig/python/CMakeLists.txt @@ -12,7 +12,7 @@ ADD_SUBDIRECTORY(tests) # SWIG_OUPUT is per-target -SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_python.cc" ) +SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/libzypp_python.cc" ) FIND_PACKAGE(PythonInterp REQUIRED) IF (NOT PYTHON_SITEDIR) diff --git a/swig/ruby/CMakeLists.txt b/swig/ruby/CMakeLists.txt index 628c3c4..edbcf24 100644 --- a/swig/ruby/CMakeLists.txt +++ b/swig/ruby/CMakeLists.txt @@ -7,7 +7,7 @@ ADD_SUBDIRECTORY(tests) # SWIG_OUPUT is per-target -SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_ruby.cc" ) +SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/libzypp_ruby.cc" ) MESSAGE(STATUS "Ruby executable: ${RUBY_EXECUTABLE}") MESSAGE(STATUS "Ruby vendor arch dir: ${RUBY_VENDORARCH_DIR}") @@ -42,17 +42,17 @@ 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}") +#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}") # # Leave this to %doc in the .spec file |