Author: kkaempf Date: Wed Dec 3 14:23:53 2008 New Revision: 11850 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11850&view=rev Log: make SWIG optional Modified: trunk/sat-solver/CMakeLists.txt Modified: trunk/sat-solver/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/CMakeLists.txt?rev=11850&r1=11849&r2=11850&view=diff ============================================================================== --- trunk/sat-solver/CMakeLists.txt (original) +++ trunk/sat-solver/CMakeLists.txt Wed Dec 3 14:23:53 2008 @@ -117,10 +117,6 @@ #################################################################### MESSAGE(STATUS "Looking modules in ${CMAKE_MODULE_PATH}") -#FIND_PROGRAM(SWIG_EXECUTABLE -# NAMES swig-1.3 swig -# PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin -#) set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall" ) set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -g -O3" ) @@ -132,10 +128,19 @@ ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(doc) -FIND_PACKAGE(SWIG REQUIRED) +FIND_PACKAGE(SWIG) IF ( SWIG_FOUND ) ADD_SUBDIRECTORY(bindings) +ELSE ( SWIG_FOUND ) + # for older version of swig/cmake + FIND_PROGRAM(SWIG_EXECUTABLE + NAMES swig-1.3 swig + PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin + ) + IF ( SWIG_EXECUTABLE ) + ADD_SUBDIRECTORY(bindings) + ENDIF ( SWIG_EXECUTABLE ) ENDIF ( SWIG_FOUND ) MESSAGE(STATUS "version: ${VERSION}") -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org