Mailinglist Archive: zypp-devel (149 mails)

["Jan-Simon Möller" <dl9pf@xxxxxx>]

Here's a patch to be able to define the cmake Paths and my Makefile.cvs.

Could we integrate this ?

Best regards
Jan-Simon
Index: swig/python/CMakeLists.txt
===================================================================
--- swig/python/CMakeLists.txt  (Revision 10927)
+++ swig/python/CMakeLists.txt  (Arbeitskopie)
@@ -15,7 +15,9 @@
 SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/satsolver_python.cc" )
 
 FIND_PACKAGE(PythonInterp REQUIRED)
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from 
distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" 
OUTPUT_VARIABLE PYTHON_LIB_PATH)
+IF(NOT PYTHON_LIB_PATH)
+    EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; 
from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" 
OUTPUT_VARIABLE PYTHON_LIB_PATH)
+ENDIF(NOT PYTHON_LIB_PATH)
 
 MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}")
 MESSAGE(STATUS "Python lib path: ${PYTHON_LIB_PATH}")
Index: swig/perl5/CMakeLists.txt
===================================================================
--- swig/perl5/CMakeLists.txt   (Revision 10927)
+++ swig/perl5/CMakeLists.txt   (Arbeitskopie)
@@ -12,8 +12,12 @@
 
 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)
-EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print 
\$Config{installvendorarch}" OUTPUT_VARIABLE PERL_VENDOR_ARCH)
-EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print 
\$Config{installvendorlib}" OUTPUT_VARIABLE PERL_VENDOR_LIB)
+IF(NOT PERL_VENDOR_ARCH)
+    EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print 
\$Config{installvendorarch}" OUTPUT_VARIABLE PERL_VENDOR_ARCH)
+ENDIF(NOT PERL_VENDOR_ARCH)
+IF(NOT PERL_VENDOR_LIB)
+    EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print 
\$Config{installvendorlib}" OUTPUT_VARIABLE PERL_VENDOR_LIB)
+ENDIF(NOT PERL_VENDOR_LIB)
 EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print 
\$Config{ccdlflags}" OUTPUT_VARIABLE PERL_LINK_FLAGS)
 
 MESSAGE(STATUS "Perl executable: ${PERL_EXECUTABLE}")
# Generic Makefile.cvs for CMake-based projects:
#
# Create a subdirecory build/ and call cmake from there with /usr prefix.
#
# Intentionally using /usr rather than the default /usr/local since this is for
# internal use, and we are the distribution makers: /usr/local is off limits
# for us.
#
# Author: Stefan Hundhammer <sh@xxxxxxx>

BUILD_SUBDIR            = build
HERE_FROM_BUILD_SUBDIR  = ..
PREFIX                  = /home/dl9pf/pfx
CMAKE                   = /usr/bin/cmake

all:    cmake


cmake: create-build-subdir create-toplevel-makefile
        ( cd $(BUILD_SUBDIR) && $(CMAKE) -DZYPP_INCLUDE_DIR=$(PREFIX)/include/ \
                                         
-DZYPP_LIBRARY=$(PREFIX)/lib/libzypp.so \
                                         
-DPYTHON_LIB_PATH=/home/dl9pf/pfx/lib/python/ \
                                         
-DRUBY_VENDORARCH_DIR=/home/dl9pf/pfx/lib/ruby/vendor_ruby/1.8/x86_64-linux/ \
                                         
-DPERL_VENDOR_LIB=/home/dl9pf/pfx/lib/perl5/vendor_perl/5.10.0/x86_64-linux-thread-multi/
 \
                                         
-DPERL_VENDOR_ARCH=/home/dl9pf/pfx/lib/perl5/vendor_perl/5.10.0/x86_64-linux-thread-multi/
 \
                                         -DCMAKE_INSTALL_PREFIX=$(PREFIX) \
                                         $(HERE_FROM_BUILD_SUBDIR) )
#-DINCLUDE_DIRS=$(PREFIX)/include/ 
create-build-subdir:
        test -d $(BUILD_SUBDIR) || mkdir $(BUILD_SUBDIR)


create-toplevel-makefile:
        echo 'all:'                                              >Makefile
        echo -e '\t$$(MAKE) $$(MAKEFLAGS) -C $(BUILD_SUBDIR)'   >>Makefile