[Cmake-commits] [cmake-commits] marcus.hanwell committed FindPythonLibs.cmake 1.47 1.48

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv7999/Modules

Modified Files:
	FindPythonLibs.cmake 
Log Message:
Applied patch from Pat Marion - modules header macro.

This modifies the behavior of PYTHON_WRITE_MODULES_HEADER, should be backwards
compatible. Also marked a couple of the variables generated by adding Python
modules as advanced.


Index: FindPythonLibs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonLibs.cmake,v
retrieving revision 1.47
retrieving revision 1.48
diff -C 2 -d -r1.47 -r1.48
*** FindPythonLibs.cmake	17 Feb 2010 16:35:17 -0000	1.47
--- FindPythonLibs.cmake	17 Feb 2010 16:37:37 -0000	1.48
***************
*** 112,116 ****
  FUNCTION(PYTHON_ADD_MODULE _NAME )
    OPTION(PYTHON_ENABLE_MODULE_${_NAME} "Add module ${_NAME}" TRUE)
!   OPTION(PYTHON_MODULE_${_NAME}_BUILD_SHARED "Add module ${_NAME} shared" ${_TARGET_SUPPORTS_SHARED_LIBS})
  
    IF(PYTHON_ENABLE_MODULE_${_NAME})
--- 112,121 ----
  FUNCTION(PYTHON_ADD_MODULE _NAME )
    OPTION(PYTHON_ENABLE_MODULE_${_NAME} "Add module ${_NAME}" TRUE)
!   OPTION(PYTHON_MODULE_${_NAME}_BUILD_SHARED
!     "Add module ${_NAME} shared" ${_TARGET_SUPPORTS_SHARED_LIBS})
! 
!   # Mark these options as advanced
!   MARK_AS_ADVANCED(PYTHON_ENABLE_MODULE_${_NAME}
!     PYTHON_MODULE_${_NAME}_BUILD_SHARED)
  
    IF(PYTHON_ENABLE_MODULE_${_NAME})
***************
*** 135,145 ****
    GET_FILENAME_COMPONENT(_name "${_filename}" NAME)
    STRING(REPLACE "." "_" _name "${_name}")
!   STRING(TOUPPER ${_name} _name)
  
    SET(_filenameTmp "${_filename}.in")
    FILE(WRITE ${_filenameTmp} "/*Created by cmake, do not edit, changes will be lost*/\n")
    FILE(APPEND ${_filenameTmp} 
! "#ifndef ${_name}
! #define ${_name}
  
  #include <Python.h>
--- 140,150 ----
    GET_FILENAME_COMPONENT(_name "${_filename}" NAME)
    STRING(REPLACE "." "_" _name "${_name}")
!   STRING(TOUPPER ${_name} _nameUpper)
  
    SET(_filenameTmp "${_filename}.in")
    FILE(WRITE ${_filenameTmp} "/*Created by cmake, do not edit, changes will be lost*/\n")
    FILE(APPEND ${_filenameTmp} 
! "#ifndef ${_nameUpper}
! #define ${_nameUpper}
  
  #include <Python.h>
***************
*** 167,175 ****
    ENDFOREACH(_currentModule ${PY_STATIC_MODULES_LIST})
  
!   FILE(APPEND ${_filenameTmp} "#ifndef EXCLUDE_LOAD_ALL_FUNCTION\nvoid CMakeLoadAllPythonModules(void)\n{\n")
    FOREACH(_currentModule ${PY_STATIC_MODULES_LIST})
      FILE(APPEND ${_filenameTmp} "  CMakeLoadPythonModule_${_currentModule}();\n")
    ENDFOREACH(_currentModule ${PY_STATIC_MODULES_LIST})
!   FILE(APPEND ${_filenameTmp} "}\n#endif\n\n#endif\n")
    
  # with CONFIGURE_FILE() cmake complains that you may not use a file created using FILE(WRITE) as input file for CONFIGURE_FILE()
--- 172,181 ----
    ENDFOREACH(_currentModule ${PY_STATIC_MODULES_LIST})
  
!   FILE(APPEND ${_filenameTmp} "void ${_name}_LoadAllPythonModules(void)\n{\n")
    FOREACH(_currentModule ${PY_STATIC_MODULES_LIST})
      FILE(APPEND ${_filenameTmp} "  CMakeLoadPythonModule_${_currentModule}();\n")
    ENDFOREACH(_currentModule ${PY_STATIC_MODULES_LIST})
!   FILE(APPEND ${_filenameTmp} "}\n\n")
!   FILE(APPEND ${_filenameTmp} "#ifndef EXCLUDE_LOAD_ALL_FUNCTION\nvoid CMakeLoadAllPythonModules(void)\n{\n  ${_name}_LoadAllPythonModules();\n}\n#endif\n\n#endif\n")
    
  # with CONFIGURE_FILE() cmake complains that you may not use a file created using FILE(WRITE) as input file for CONFIGURE_FILE()