Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:11.4
qhull
susepatches.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File susepatches.diff of Package qhull
diff --git a/CMakeLists.txt b/CMakeLists.txt index 61c978e..1b2434a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,41 @@ project(qhull) -cmake_minimum_required(VERSION 2.4) -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) +cmake_minimum_required(VERSION 2.6) + + +set(QHULL_VERSION "2010.1.next") + +if(INCLUDE_INSTALL_DIR) +else() +set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include) +endif() +if(LIB_INSTALL_DIR) +else() +set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib) +endif() +if(BIN_INSTALL_DIR) +else() +set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin) +endif() +if(DOC_INSTALL_DIR) +else() +set(DOC_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/packages/qhull) +endif() + +message(STATUS) +message(STATUS "========== qhull Build Information ==========") +message(STATUS "Build Version: ${QHULL_VERSION}") +message(STATUS "Install Prefix (CMAKE_INSTALL_PREFIX): ${CMAKE_INSTALL_PREFIX}") +message(STATUS "Binary Directory (BIN_INSTALL_DIR): ${BIN_INSTALL_DIR}") +message(STATUS "Library Directory (LIB_INSTALL_DIR): ${LIB_INSTALL_DIR}") +message(STATUS "Include Directory (INCLUDE_INSTALL_DIR): ${INCLUDE_INSTALL_DIR}") +message(STATUS "Documentation Directory (DOC_INSTALL_DIR): ${DOC_INSTALL_DIR}") +message(STATUS) +message(STATUS "To change any of these options, override them using -D{OPTION_NAME} on the commandline.") +message(STATUS "To build and install qhull, run \"make\" and \"make install\"") +message(STATUS) + add_subdirectory(src) -install(DIRECTORY html DESTINATION share/doc/qhull) + +install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 45e246e..e1b244d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,10 +28,10 @@ target_link_libraries(qhull m) if(UNIX) if(APPLE) set_target_properties(qhull PROPERTIES - INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") + INSTALL_NAME_DIR "${LIB_INSTALL_DIR}") else(APPLE) set_target_properties(qhull PROPERTIES - INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" + INSTALL_RPATH "${LIB_INSTALL_DIR}" INSTALL_RPATH_USE_LINK_PATH TRUE BUILD_WITH_INSTALL_RPATH FALSE) endif(APPLE) @@ -67,7 +67,7 @@ add_executable(qhalf ${qhalf_SOURCES}) target_link_libraries(qhalf qhull) install(TARGETS qhull qhullstatic qhullcmd rbox qconvex qdelaunay qvoronoi qhalf - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) -install(FILES libqhull.h DESTINATION include) + RUNTIME DESTINATION ${BIN_INSTALL_DIR} + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) +install(FILES libqhull.h DESTINATION ${INCLUDE_INSTALL_DIR}) diff --git a/src/global.c b/src/global.c index 3c6141a..4c9f56c 100644 --- a/src/global.c +++ b/src/global.c @@ -614,7 +614,7 @@ void qh_initflags(char *command) { if (command <= &qh qhull_command[0] || command > &qh qhull_command[0] + sizeof(qh qhull_command)) { if (command != &qh qhull_command[0]) { *qh qhull_command= '\0'; - strncat( qh qhull_command, command, sizeof( qh qhull_command)); + strncat(qh qhull_command, command, sizeof(qh qhull_command)-strlen(qh qhull_command)-1); } while (*s && !isspace(*s)) /* skip program name */ s++; diff --git a/src/rboxlib.c b/src/rboxlib.c index 4f11d22..17d01ac 100644 --- a/src/rboxlib.c +++ b/src/rboxlib.c @@ -124,7 +124,7 @@ int qh_rboxpoints(FILE* fout, FILE* ferr, char* rbox_command) { } *command= '\0'; - strncat(command, rbox_command, sizeof(command)); + strncat(command, rbox_command, sizeof(command)-strlen(command)-1); while (*s && !isspace(*s)) /* skip program name */ s++; @@ -346,8 +346,8 @@ int qh_rboxpoints(FILE* fout, FILE* ferr, char* rbox_command) { } }else if (israndom) { seed= (int)time(&timedata); - sprintf(seedbuf, " t%d", seed); /* appends an extra t, not worth removing */ - strncat(command, seedbuf, sizeof(command)); + printf(seedbuf, " t%d", seed); /* appends an extra t, not worth removing */ + strncat(command, seedbuf, sizeof(command)-strlen(command)-1); t= strstr(command, " t "); if (t) strcpy(t+1, t+3); /* remove " t " */
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor