Changeset 2990

Show
Ignore:
Timestamp:
11/07/08 07:04:48 (2 months ago)
Author:
kkaempf
Message:

use local copy of FindPythonLib? in order to find the .so lib

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openwsman/trunk/CMakeLists.txt

    r2986 r2990  
    2020endif(COMMAND cmake_policy) 
    2121               
     22# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked 
     23SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) 
     24 
     25INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) 
     26SET(VERSION "\"${OPENWSMAN_MAJOR}.${OPENWSMAN_MINOR}.${OPENWSMAN_PATCH}\"") 
     27   MESSAGE(STATUS "Version ${VERSION}") 
    2228 
    2329# Library path (lib / lib64 ) 
    …… 
    8086OPTION( BUILD_CUNIT_TESTS "Build serialization tests" NO ) 
    8187OPTION( DISABLE_PLUGINS "Do not build plugins" NO ) 
    82 OPTION( BUILD_SWIG_PLUGIN "Build SWIG plugin" NO ) 
     88OPTION( BUILD_SWIG_PLUGIN "Build SWIG plugin" YES ) 
    8389OPTION( DISABLE_SERVER "Do not build server component" NO ) 
    8490OPTION( ENABLE_EVENTING_SUPPORT "WS-Eventing wanted" YES ) 
    …… 
    118124 
    119125IF( BUILD_PYTHON ) 
    120 INCLUDE(FindPythonInterp) 
    121 INCLUDE(FindPythonLibs) 
    122 MESSAGE(STATUS "Building Python bindings" ) 
    123  IF(NOT PYTHON_INCLUDE_PATH ) 
    124   IF(BUILD_PYTHON_EXPLICIT) 
    125    NO_HEADERS_WARNING_EXPL(BUILD_PYTHON Python) 
    126   ELSE(BUILD_PYTHON_EXPLICIT) 
    127    NO_HEADERS_WARNING(BUILD_PYTHON Python) 
    128   ENDIF(BUILD_PYTHON_EXPLICIT) 
    129  ENDIF(NOT PYTHON_INCLUDE_PATH ) 
     126  MESSAGE(STATUS "Building Python bindings" ) 
     127  FIND_PACKAGE(PythonLibs) 
     128  IF (PYTHON_LIBRARY) 
     129    FIND_PACKAGE(PythonInterp REQUIRED) 
     130    MESSAGE(STATUS "Found PythonLibs...") 
     131    FIND_PACKAGE(PythonLinkLibs) 
     132    IF (PYTHON_LINK_LIBS) 
     133      MESSAGE(STATUS "Building Python...") 
     134    ENDIF (PYTHON_LINK_LIBS) 
     135  ENDIF (PYTHON_LIBRARY) 
     136  IF(NOT PYTHON_INCLUDE_PATH ) 
     137    IF(BUILD_PYTHON_EXPLICIT) 
     138      NO_HEADERS_WARNING_EXPL(BUILD_PYTHON Python) 
     139    ELSE(BUILD_PYTHON_EXPLICIT) 
     140      NO_HEADERS_WARNING(BUILD_PYTHON Python) 
     141    ENDIF(BUILD_PYTHON_EXPLICIT) 
     142  ENDIF(NOT PYTHON_INCLUDE_PATH ) 
    130143ENDIF( BUILD_PYTHON ) 
    131144 
    …… 
    336349#################################################################### 
    337350 
    338 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked 
    339 SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) 
    340  
    341 INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) 
    342 SET(VERSION "\"${OPENWSMAN_MAJOR}.${OPENWSMAN_MINOR}.${OPENWSMAN_PATCH}\"") 
    343  
    344 SET(CMAKE_VERBOSE_MAKEFILE ON) 
     351SET(CMAKE_VERBOSE_MAKEFILE OFF) 
    345352 
    346353ADD_DEFINITIONS( -DHAVE_CONFIG_H )