From: <ai...@us...> - 2010-04-04 04:47:11
|
Revision: 10884 http://plplot.svn.sourceforge.net/plplot/?rev=10884&view=rev Author: airwin Date: 2010-04-04 04:47:05 +0000 (Sun, 04 Apr 2010) Log Message: ----------- Update to Werner's "merged" version which combines my ideas with his for improving the qhull build. Any further work on this file should be committed here until the qhull developers accept our work. This version should replace src/CMakeLists.txt in the qhull source tree. Modified Paths: -------------- trunk/cmake/external/libqhull/CMakeLists.txt Modified: trunk/cmake/external/libqhull/CMakeLists.txt =================================================================== --- trunk/cmake/external/libqhull/CMakeLists.txt 2010-04-03 17:58:39 UTC (rev 10883) +++ trunk/cmake/external/libqhull/CMakeLists.txt 2010-04-04 04:47:05 UTC (rev 10884) @@ -1,98 +1,151 @@ -# CMakeLists.txt for the qhull library and executables -# Put this file in the main directory, create and cd into a build directory, -# and run this cmake command: -# cmake -G "MinGW Makefiles" -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=../local .. -# or similar. +project(qhull_lib) +# Configurable items here. +option(USE_RPATH "Use -rpath when linking libraries, executables" ON) + +# libraries are all shared by default +option(BUILD_SHARED_LIBS "Build shared libraries" ON) + +# Change before each release whenever there has been an API change of any +# kind. +set(qhull_SOVERSION 5) +set(qhull_VERSION ${qhull_SOVERSION}.0.0) + # no shared library support for win32 compilers except cygwin, mingw -IF( WIN32 AND NOT CYGWIN AND NOT MINGW ) - IF( BUILD_SHARED_LIBS ) - SET( BUILD_SHARED_LIBS OFF ) - MESSAGE( " >> There is no shared library support for your Windows compiler!\n >> Turning option off." ) - ENDIF( BUILD_SHARED_LIBS ) -ENDIF( WIN32 AND NOT CYGWIN AND NOT MINGW ) +if(WIN32 AND NOT CYGWIN AND NOT MINGW) + if(BUILD_SHARED_LIBS) + set(BUILD_SHARED_LIBS OFF) + message( " >> There is no shared library support for your Windows compiler!\n >> Turning option off." ) + endif(BUILD_SHARED_LIBS) +endif(WIN32 AND NOT CYGWIN AND NOT MINGW) +# find math library +if(NOT WIN32) + find_library(MATH_LIB NAMES m PATHS /usr/local/lib /usr/lib) + if(NOT MATH_LIB) + message(FATAL_ERROR "Cannot find required math library") + endif(NOT MATH_LIB) +endif(NOT WIN32) + +# some extra flags for Borland C++ Compiler 5.5 +if(BORLAND) + add_definitions(-A -w-) +endif(BORLAND) + +# Order object files by frequency of execution. Small files at end. set( - qhull_LIB_SRCS - src/user.c - src/global.c - src/stat.c - src/io.c - src/geom2.c - src/poly2.c - src/merge.c - src/qhull.c - src/geom.c - src/poly.c - src/qset.c - src/mem.c + qhull_src + rboxlib.c + user.c + global.c + stat.c + io.c + geom2.c + poly2.c + merge.c + libqhull.c + geom.c + poly.c + qset.c + mem.c + usermem.c + userprintf.c + random.c ) +# header files set( - qhull_LIB_HDRS - src/geom.h - src/io.h - src/mem.h - src/merge.h - src/poly.h - src/qhull.h - src/qhull_a.h - src/qset.h - src/stat.h - src/user.h + qhull_hdr + geom.h + io.h + libqhull.h + mem.h + merge.h + poly.h + qhull.h + qhull_a.h + qset.h + random.h + stat.h + user.h ) -set( - qhull_HTML_FILES - qhull.man rbox.man qh-in.htm qh-optg.htm qh-optt.htm qh-optp.htm - index.htm qh-quick.htm qh-impre.htm qh-eg.htm - qh-optc.htm qh-opto.htm qh-optf.htm qh-optq.htm - qh-c.htm qh-faq.htm qhull.htm qconvex.htm qdelaun.htm - qh-geom.htm qh-globa.htm qh-io.htm qh-mem.htm qh-merge.htm - qh-poly.htm qh-qhull.htm qh-set.htm qh-stat.htm qh-user.htm - qdelau_f.htm qhalf.htm qvoronoi.htm qvoron_f.htm rbox.htm +add_library( + qhull + ${qhull_src} ) +target_link_libraries( + qhull + ${MATH_LIB} +) -IF(BORLAND) - ADD_DEFINITIONS(-A -w-) -ENDIF(BORLAND) +set_target_properties( + qhull + PROPERTIES + SOVERSION ${qhull_SOVERSION} + VERSION ${qhull_VERSION} + ) -ADD_LIBRARY( - qhull - ${qhull_LIB_SRCS} +if(UNIX) + if(APPLE) + set_target_properties(qhull PROPERTIES + INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") + else(APPLE) + set_target_properties(qhull PROPERTIES + INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" + INSTALL_RPATH_USE_LINK_PATH TRUE + BUILD_WITH_INSTALL_RPATH FALSE) + endif(APPLE) +endif(UNIX) + +install( + TARGETS qhull + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib ) -# add samples -set( qhull_EXE qconvex qhalf qvoronoi user_eg user_eg2) -foreach(EXE ${qhull_EXE}) - ADD_EXECUTABLE( ${EXE} src/${EXE}.c ) - TARGET_LINK_LIBRARIES( ${EXE} qhull ) -endforeach(EXE ${qhull_EXE}) -ADD_EXECUTABLE( qhullx src/unix.c ) -TARGET_LINK_LIBRARIES( qhullx qhull ) +# samples +set(qhullcmd_SOURCES unix.c) +set(rbox_SOURCES rbox.c) +set(qconvex_SOURCES qconvex.c) +set(qdelaunay_SOURCES qdelaun.c) +set(qvoronoi_SOURCES qvoronoi.c) +set(qhalf_SOURCES qhalf.c) -ADD_EXECUTABLE( qdelaunay src/qdelaun.c ) -TARGET_LINK_LIBRARIES( qdelaunay qhull ) +set( + TARGET_LIST + qhullcmd rbox qconvex qdelaunay qvoronoi qhalf +) -ADD_EXECUTABLE( rbox src/rbox.c ) +foreach(TARGET ${TARGET_LIST}) + add_executable(${TARGET} ${${TARGET}_SOURCES}) + target_link_libraries(${TARGET} qhull) + if(USE_RPATH) + set_target_properties( + ${TARGET} + PROPERTIES + INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib + INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/bin + ) + else(USE_RPATH) + set_target_properties( + ${TARGET} + PROPERTIES + INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/bin + ) + endif(USE_RPATH) + install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +endforeach(TARGET ${TARGET_LIST}) -INSTALL( - TARGETS - qhull ${qhull_EXE} qhullx qdelaunay rbox - ARCHIVE DESTINATION - lib - LIBRARY DESTINATION - lib - RUNTIME DESTINATION - bin +set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull") + + +# install header +install( + FILES libqhull.h + DESTINATION include/qhull ) - -INSTALL( - FILES - ${qhull_LIB_HDRS} - DESTINATION - include/qhull -) \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-04-04 05:48:53
|
Revision: 10885 http://plplot.svn.sourceforge.net/plplot/?rev=10885&view=rev Author: airwin Date: 2010-04-04 05:48:47 +0000 (Sun, 04 Apr 2010) Log Message: ----------- project command removed from src/CMakeLists.txt since that is already done by top-level CMakeLists.txt in qhull-2010.1. Modified Paths: -------------- trunk/cmake/external/libqhull/CMakeLists.txt Modified: trunk/cmake/external/libqhull/CMakeLists.txt =================================================================== --- trunk/cmake/external/libqhull/CMakeLists.txt 2010-04-04 04:47:05 UTC (rev 10884) +++ trunk/cmake/external/libqhull/CMakeLists.txt 2010-04-04 05:48:47 UTC (rev 10885) @@ -1,5 +1,3 @@ -project(qhull_lib) - # Configurable items here. option(USE_RPATH "Use -rpath when linking libraries, executables" ON) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-04-05 02:56:09
|
Revision: 10886 http://plplot.svn.sourceforge.net/plplot/?rev=10886&view=rev Author: airwin Date: 2010-04-05 02:56:03 +0000 (Mon, 05 Apr 2010) Log Message: ----------- Add the private headers to what is installed. PLplot apparently does need those private headers to compile libcsironn. I believe that must have been the argument that Rafael used when he packaged qhull for Debian, because that package does include the private qhull headers. Modified Paths: -------------- trunk/cmake/external/libqhull/CMakeLists.txt Modified: trunk/cmake/external/libqhull/CMakeLists.txt =================================================================== --- trunk/cmake/external/libqhull/CMakeLists.txt 2010-04-04 05:48:47 UTC (rev 10885) +++ trunk/cmake/external/libqhull/CMakeLists.txt 2010-04-05 02:56:03 UTC (rev 10886) @@ -144,6 +144,6 @@ # install header install( - FILES libqhull.h + FILES ${qhull_hdr} DESTINATION include/qhull ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-04-16 20:18:54
|
Revision: 10914 http://plplot.svn.sourceforge.net/plplot/?rev=10914&view=rev Author: airwin Date: 2010-04-16 20:18:47 +0000 (Fri, 16 Apr 2010) Log Message: ----------- White space issues + comments on qh_QHpointer value. Modified Paths: -------------- trunk/cmake/external/libqhull/CMakeLists.txt Modified: trunk/cmake/external/libqhull/CMakeLists.txt =================================================================== --- trunk/cmake/external/libqhull/CMakeLists.txt 2010-04-15 03:41:20 UTC (rev 10913) +++ trunk/cmake/external/libqhull/CMakeLists.txt 2010-04-16 20:18:47 UTC (rev 10914) @@ -32,77 +32,82 @@ # Order object files by frequency of execution. Small files at end. set( - qhull_src - rboxlib.c - user.c - global.c - stat.c - io.c - geom2.c - poly2.c - merge.c - libqhull.c - geom.c - poly.c - qset.c - mem.c - usermem.c - userprintf.c - random.c -) + qhull_src + rboxlib.c + user.c + global.c + stat.c + io.c + geom2.c + poly2.c + merge.c + libqhull.c + geom.c + poly.c + qset.c + mem.c + usermem.c + userprintf.c + random.c + ) # header files set( - qhull_hdr - geom.h - io.h - libqhull.h - mem.h - merge.h - poly.h - qhull.h - qhull_a.h - qset.h - random.h - stat.h - user.h -) + qhull_hdr + geom.h + io.h + libqhull.h + mem.h + merge.h + poly.h + qhull.h + qhull_a.h + qset.h + random.h + stat.h + user.h + ) add_library( - qhull - ${qhull_src} -) + qhull + ${qhull_src} + ) target_link_libraries( - qhull - ${MATH_LIB} -) + qhull + ${MATH_LIB} + ) +# qh_QHpointer=1 is the value used by Debian packagers for qhull_2003.1 +# but comment it out since it causes segfaults for PLplot for qhull_2010.1, +# and not setting the value is the default which is presumably the value +# best tested by the qhull developers. set_target_properties( qhull - PROPERTIES - SOVERSION ${qhull_SOVERSION} - VERSION ${qhull_VERSION} - ) + PROPERTIES + SOVERSION ${qhull_SOVERSION} + VERSION ${qhull_VERSION} +# COMPILE_DEFINITIONS qh_QHpointer=1 + ) if(UNIX) - if(APPLE) - set_target_properties(qhull PROPERTIES - INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") - else(APPLE) - set_target_properties(qhull PROPERTIES - INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" - INSTALL_RPATH_USE_LINK_PATH TRUE - BUILD_WITH_INSTALL_RPATH FALSE) - endif(APPLE) + if(APPLE) + set_target_properties(qhull PROPERTIES + INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") + else(APPLE) + set_target_properties(qhull PROPERTIES + INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" + INSTALL_RPATH_USE_LINK_PATH TRUE + BUILD_WITH_INSTALL_RPATH FALSE) + endif(APPLE) endif(UNIX) install( - TARGETS qhull - ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib -) + TARGETS qhull + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ) # samples @@ -114,9 +119,9 @@ set(qhalf_SOURCES qhalf.c) set( - TARGET_LIST - qhullcmd rbox qconvex qdelaunay qvoronoi qhalf -) + TARGET_LIST + qhullcmd rbox qconvex qdelaunay qvoronoi qhalf + ) foreach(TARGET ${TARGET_LIST}) @@ -125,15 +130,15 @@ if(USE_RPATH) set_target_properties( ${TARGET} - PROPERTIES - INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib - INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/bin + PROPERTIES + INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib + INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/bin ) else(USE_RPATH) set_target_properties( ${TARGET} - PROPERTIES - INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/bin + PROPERTIES + INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/bin ) endif(USE_RPATH) install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) @@ -144,6 +149,6 @@ # install header install( - FILES ${qhull_hdr} - DESTINATION include/qhull -) + FILES ${qhull_hdr} + DESTINATION include/qhull + ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-08-02 17:57:56
|
Revision: 11117 http://plplot.svn.sourceforge.net/plplot/?rev=11117&view=rev Author: airwin Date: 2010-08-02 17:57:50 +0000 (Mon, 02 Aug 2010) Log Message: ----------- Initial commit of top-level CMakeLists.txt for libqhull which drops all default language support in favour of the C-language support actually needed. Added Paths: ----------- trunk/cmake/external/libqhull/CMakeLists.txt Added: trunk/cmake/external/libqhull/CMakeLists.txt =================================================================== --- trunk/cmake/external/libqhull/CMakeLists.txt (rev 0) +++ trunk/cmake/external/libqhull/CMakeLists.txt 2010-08-02 17:57:50 UTC (rev 11117) @@ -0,0 +1,8 @@ +project(qhull C) +cmake_minimum_required(VERSION 2.4) +if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) +endif(COMMAND cmake_policy) + +add_subdirectory(src) + Property changes on: trunk/cmake/external/libqhull/CMakeLists.txt ___________________________________________________________________ Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |