python_install_cmake.diff

Ethan Rublee, 2011-05-23 10:11 pm

Download (1.3 kB)

 
CMakeLists.txt (working copy)
541 541 
    string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
542 542 
    if(UNIX)
543 543 
        set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
544 
        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
544 
        if(APPLE)
545 
          set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
546 
        else() #debian based assumed, install to the dist-packages.
547 
          set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
548 
        endif()
545 549 
    endif()
546 550 
    if(WIN32)
547 551 
        get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
......
889 893 

  		





  890
  894
  
    
    set(EXTRA_EXE_LINKER_FLAGS_RELEASE "${EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")


  		





  891
  895
  
    

  		





  
  896
  
    

  		





  892
  897
  
    
    #if(ENABLE_OPENMP)


  		





  893
  898
  
    
    #    set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} /openmp")


  		





  894
  899
  
    
    #endif()