HaikuPorts
  • Login
  • Preferences
  • Help/Guide
  • Wiki
  • Timeline
  • Roadmap
  • View Tickets
  • Search
  • Port Log
  • Blog

Context Navigation

  • Back to Ticket #399

Ticket #399: cmake-2.8.1.2.patch

File cmake-2.8.1.2.patch, 2.1 KB (added by michaelvoliveira, 5 years ago)

augiedoggie

  • Modules/FindLua51.cmake

    diff -Naur cmake-2.8.1/Modules/FindLua51.cmake cmake-2.8.1-haiku/Modules/FindLua51.cmake
    old new  
    5757 
    5858IF(LUA_LIBRARY) 
    5959  # include the math library for Unix 
    60   IF(UNIX AND NOT APPLE) 
     60  IF(UNIX AND NOT APPLE AND NOT BEOS) 
    6161    FIND_LIBRARY(LUA_MATH_LIBRARY m) 
    6262    SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") 
    6363  # For Windows and Mac, don't need to explicitly include the math library 
    6464  ELSE(UNIX AND NOT APPLE) 
    6565    SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries") 
    66   ENDIF(UNIX AND NOT APPLE) 
     66  ENDIF(UNIX AND NOT APPLE AND NOT BEOS) 
    6767ENDIF(LUA_LIBRARY) 
    6868 
    6969INCLUDE(FindPackageHandleStandardArgs) 
  • Modules/FindOpenGL.cmake

    diff -Naur cmake-2.8.1/Modules/FindOpenGL.cmake cmake-2.8.1-haiku/Modules/FindOpenGL.cmake
    old new  
    8080      /usr/share/doc/NVIDIA_GLX-1.0/include 
    8181      /usr/openwin/share/include 
    8282      /opt/graphics/OpenGL/include /usr/X11R6/include 
     83      /boot/develop/headers/os/opengl 
    8384    ) 
    8485 
    8586    FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h 
    … …  
    9495            /usr/openwin/lib 
    9596            /usr/shlib /usr/X11R6/lib 
    9697            ${HPUX_IA_OPENGL_LIB_PATH} 
     98            /boot/develop/lib/x86/ 
    9799    ) 
    98100 
    99101    # On Unix OpenGL most certainly always requires X11. 
  • bootstrap

    diff -Naur cmake-2.8.1/bootstrap cmake-2.8.1-haiku/bootstrap
    old new  
    132132    cmake_default_prefix="c:/Program Files/CMake" 
    133133  fi 
    134134elif ${cmake_system_haiku}; then 
    135   cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` 
     135  cmake_default_prefix=`finddir B_COMMON_DIRECTORY` 
     136  cmake_man_dir="/documentation/man" 
     137  cmake_doc_dir="/documentation/doc/cmake-${cmake_version}" 
    136138else 
    137139  cmake_default_prefix="/usr/local" 
    138140fi 

Download in other formats:

  • Original Format

Trac Powered

Powered by Trac 0.13dev-r10686
By Edgewall Software.

Visit the Trac open source project at
http://trac.edgewall.org/