Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/qhull/patches/qhull-2010.1-cmake-install.patch

    Annotation of /trunk/qhull/patches/qhull-2010.1-cmake-install.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1449 - (hide annotations) (download)
    Wed Jul 27 21:43:46 2011 UTC (12 years, 9 months ago) by niro
    File size: 3343 byte(s) 
    -added qhull patches from gentoo
    1 niro 1449 diff -Nur qhull-2010.1.orig/CMakeLists.txt qhull-2010.1/CMakeLists.txt
    2     --- qhull-2010.1.orig/CMakeLists.txt 2010-10-03 23:04:04.000000000 +0100
    3     +++ qhull-2010.1/CMakeLists.txt 2010-10-03 23:26:54.000000000 +0100
    4     @@ -1,8 +1,44 @@
    5     project(qhull)
    6     -cmake_minimum_required(VERSION 2.4)
    7     -if(COMMAND cmake_policy)
    8     - cmake_policy(SET CMP0003 NEW)
    9     -endif(COMMAND cmake_policy)
    10     +cmake_minimum_required(VERSION 2.6)
    11     +
    12     +
    13     +set(QHULL_VERSION "2010.1")
    14     +
    15     +if(INCLUDE_INSTALL_DIR)
    16     +else()
    17     +set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include)
    18     +endif()
    19     +if(LIB_INSTALL_DIR)
    20     +else()
    21     +set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
    22     +endif()
    23     +if(BIN_INSTALL_DIR)
    24     +else()
    25     +set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
    26     +endif()
    27     +if(DOC_INSTALL_DIR)
    28     +else()
    29     +set(DOC_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/qhull)
    30     +endif()
    31     +
    32     +message(STATUS)
    33     +message(STATUS "========== qhull Build Information ==========")
    34     +message(STATUS "Build Version: ${QHULL_VERSION}")
    35     +message(STATUS "Install Prefix (CMAKE_INSTALL_PREFIX): ${CMAKE_INSTALL_PREFIX}")
    36     +message(STATUS "Binary Directory (BIN_INSTALL_DIR): ${BIN_INSTALL_DIR}")
    37     +message(STATUS "Library Directory (LIB_INSTALL_DIR): ${LIB_INSTALL_DIR}")
    38     +message(STATUS "Include Directory (INCLUDE_INSTALL_DIR): ${INCLUDE_INSTALL_DIR}")
    39     +message(STATUS "Documentation Directory (DOC_INSTALL_DIR): ${DOC_INSTALL_DIR}")
    40     +message(STATUS)
    41     +message(STATUS "To change any of these options, override them using -D{OPTION_NAME} on the commandline.")
    42     +message(STATUS "To build and install qhull, run \"make\" and \"make install\"")
    43     +message(STATUS)
    44     +
    45    
    46     add_subdirectory(src)
    47     +option(WITH_STATIC_LIBS "Build with a static library" OFF)
    48     +option(WITH_DOCS "Install HTML documentation" OFF)
    49    
    50     +if (WITH_DOCS)
    51     +install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR})
    52     +endif (WITH_DOCS)
    53     diff -Nur qhull-2010.1.orig/src/CMakeLists.txt qhull-2010.1/src/CMakeLists.txt
    54     --- qhull-2010.1.orig/src/CMakeLists.txt 2010-10-03 23:04:04.000000000 +0100
    55     +++ qhull-2010.1/src/CMakeLists.txt 2010-10-04 00:23:47.000000000 +0100
    56     @@ -23,8 +23,25 @@
    57    
    58     file(GLOB qhull_hdr *.h)
    59    
    60     -add_library(qhull ${qhull_src})
    61     +add_library(qhull SHARED ${qhull_src})
    62     target_link_libraries(qhull m)
    63     +if(UNIX)
    64     + if(APPLE)
    65     + set_target_properties(qhull PROPERTIES
    66     + INSTALL_NAME_DIR "${LIB_INSTALL_DIR}")
    67     + else(APPLE)
    68     + set_target_properties(qhull PROPERTIES
    69     + INSTALL_RPATH "${LIB_INSTALL_DIR}"
    70     + INSTALL_RPATH_USE_LINK_PATH TRUE
    71     + BUILD_WITH_INSTALL_RPATH FALSE)
    72     + endif(APPLE)
    73     +endif(UNIX)
    74     +
    75     +if(WITH_STATIC_LIBS)
    76     + add_library(qhullstatic STATIC ${qhull_src})
    77     + set_property(TARGET qhullstatic PROPERTY OUTPUT_NAME "qhull")
    78     + install(TARGETS qhullstatic ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
    79     +endif(WITH_STATIC_LIBS)
    80    
    81     set(qhullcmd_SOURCES unix.c)
    82     set(rbox_SOURCES rbox.c)
    83     @@ -36,6 +53,7 @@
    84    
    85     add_executable(qhullcmd ${qhullcmd_SOURCES})
    86     target_link_libraries(qhullcmd qhull)
    87     +set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull")
    88    
    89     add_executable(rbox ${rbox_SOURCES})
    90     target_link_libraries(rbox qhull)
    91     @@ -52,3 +70,7 @@
    92     add_executable(qhalf ${qhalf_SOURCES})
    93     target_link_libraries(qhalf qhull)
    94    
    95     +install(TARGETS qhull qhullcmd rbox qconvex qdelaunay qvoronoi qhalf
    96     + RUNTIME DESTINATION ${BIN_INSTALL_DIR}
    97     + LIBRARY DESTINATION ${LIB_INSTALL_DIR})
    98     +install(FILES ${qhull_hdr} DESTINATION ${INCLUDE_INSTALL_DIR}/qhull)