From d05e9ba1bc43d9ebd277bd55f3423988ea727211 Mon Sep 17 00:00:00 2001
From: Brad Barber <bradb@shore.net>
Date: Sat, 23 Jan 2010 12:18:33 -0500
Subject: [PATCH] Copy HEADER and OTHERFILES from libqhull.pro to libqhullp.pro
Fix comments on warnings
---
project/libqhull/libqhull.pro | 7 ++-
project/libqhullcpp/libqhullcpp.pro | 4 +-
project/libqhullp/libqhullp.pro | 72 ++++++++++++++++++++++++++++-
project/qconvex/qconvex.pro | 4 +-
project/qdelaunay/qdelaunay.pro | 4 +-
project/qhalf/qhalf.pro | 4 +-
project/qhull/qhull.pro | 4 +-
project/qhulltest/qhulltest.pro | 4 +-
project/qvoronoi/qvoronoi.pro | 4 +-
project/rbox/rbox.pro | 4 +-
project/user_eg/user_eg.pro | 4 +-
project/user_eg2/user_eg2.pro | 4 +-
project/user_eg3/user_eg3.pro | 4 +-
13 files changed, 97 insertions(+), 26 deletions(-)
diff --git a/project/libqhull/libqhull.pro b/project/libqhull/libqhull.pro
index 868a182..bbe1a92 100644
--- a/project/libqhull/libqhull.pro
+++ b/project/libqhull/libqhull.pro
@@ -10,8 +10,8 @@ CONFIG -= app_bundle qt
# Appears to be needed for gcc 4.1, 4.2, and 4.3 with -O2
#QMAKE_CFLAGS += -fno-strict-aliasing
QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings
-QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors
-#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors
+QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings
+#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions
build_pass:CONFIG(debug, debug|release):{
TARGET = qhulld
OBJECTS_DIR = ../../tmp/libqhull/Debug
@@ -58,6 +58,9 @@ OTHER_FILES += Announce.txt
OTHER_FILES += CMakeLists.txt
OTHER_FILES += COPYING.txt
OTHER_FILES += File_id.diz
+OTHER_FILES += eg/q_eg
+OTHER_FILES += eg/q_egtest
+OTHER_FILES += eg/q_test
OTHER_FILES += html/index.htm
OTHER_FILES += html/qconvex.htm
OTHER_FILES += html/qdelau_f.htm
diff --git a/project/libqhullcpp/libqhullcpp.pro b/project/libqhullcpp/libqhullcpp.pro
index 19d1f81..8602cc9 100644
--- a/project/libqhullcpp/libqhullcpp.pro
+++ b/project/libqhullcpp/libqhullcpp.pro
@@ -24,8 +24,8 @@ MOC_DIR = ../../tmp/moc
RCC_DIR = ../../tmp/rcc
INCLUDEPATH = ../../cpp;../../cpp/road;../../tmp
QMAKE_CXXFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wwrite-strings
-QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors
-#QMAKE_CXXFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors
+QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings
+#QMAKE_CXXFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions
VPATH = ../..
SOURCES += cpp/Coordinates.cpp
diff --git a/project/libqhullp/libqhullp.pro b/project/libqhullp/libqhullp.pro
index 6e5dac1..970f2da 100644
--- a/project/libqhullp/libqhullp.pro
+++ b/project/libqhullp/libqhullp.pro
@@ -11,8 +11,8 @@ DEFINES += qh_QHpointer
# Appears to be needed for gcc 4.1, 4.2, and 4.3 with -O2
#QMAKE_CFLAGS += -fno-strict-aliasing
QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings
-QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors
-#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors
+QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings
+#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions
build_pass:CONFIG(debug, debug|release):{
TARGET = qhullpd
OBJECTS_DIR = ../../tmp/libqhullp/Debug
@@ -42,3 +42,71 @@ SOURCES += src/mem.c
SOURCES += src/usermem.c
SOURCES += src/userprintf.c
SOURCES += src/random.c
+
+# Headers and other files duplicated from libqhull.pro for convenience
+HEADERS += src/geom.h
+HEADERS += src/io.h
+HEADERS += src/libqhull.h
+HEADERS += src/mem.h
+HEADERS += src/merge.h
+HEADERS += src/poly.h
+HEADERS += src/random.h
+# qhull.h is for backwards compatibility
+HEADERS += src/qhull_a.h
+HEADERS += src/qset.h
+HEADERS += src/stat.h
+HEADERS += src/user.h
+
+OTHER_FILES += Announce.txt
+OTHER_FILES += CMakeLists.txt
+OTHER_FILES += COPYING.txt
+OTHER_FILES += File_id.diz
+OTHER_FILES += eg/q_eg
+OTHER_FILES += eg/q_egtest
+OTHER_FILES += eg/q_test
+OTHER_FILES += html/index.htm
+OTHER_FILES += html/qconvex.htm
+OTHER_FILES += html/qdelau_f.htm
+OTHER_FILES += html/qdelaun.htm
+OTHER_FILES += html/qhalf.htm
+OTHER_FILES += html/qh-code.htm
+OTHER_FILES += html/qh-eg.htm
+OTHER_FILES += html/qh-faq.htm
+OTHER_FILES += html/qh-get.htm
+OTHER_FILES += html/qh-impre.htm
+OTHER_FILES += html/qh-optc.htm
+OTHER_FILES += html/qh-optf.htm
+OTHER_FILES += html/qh-optg.htm
+OTHER_FILES += html/qh-opto.htm
+OTHER_FILES += html/qh-optp.htm
+OTHER_FILES += html/qh-optq.htm
+OTHER_FILES += html/qh-optt.htm
+OTHER_FILES += html/qh-quick.htm
+OTHER_FILES += html/qhull.htm
+OTHER_FILES += html/qhull.man
+OTHER_FILES += html/qhull.txt
+OTHER_FILES += html/qhull-cpp.xml
+OTHER_FILES += html/qvoron_f.htm
+OTHER_FILES += html/qvoronoi.htm
+OTHER_FILES += html/rbox.htm
+OTHER_FILES += html/rbox.man
+OTHER_FILES += html/rbox.txt
+OTHER_FILES += index.htm
+OTHER_FILES += README.txt
+OTHER_FILES += REGISTER.txt
+OTHER_FILES += src/Changes.txt
+OTHER_FILES += src/CMakeLists.txt
+OTHER_FILES += src/index.htm
+OTHER_FILES += src/Make-config.sh
+OTHER_FILES += src/Makefile.txt
+OTHER_FILES += src/Mborland
+OTHER_FILES += src/qh-geom.htm
+OTHER_FILES += src/qh-globa.htm
+OTHER_FILES += src/qh-io.htm
+OTHER_FILES += src/qh-mem.htm
+OTHER_FILES += src/qh-merge.htm
+OTHER_FILES += src/qh-poly.htm
+OTHER_FILES += src/qh-qhull.htm
+OTHER_FILES += src/qh-set.htm
+OTHER_FILES += src/qh-stat.htm
+OTHER_FILES += src/qh-user.htm
diff --git a/project/qconvex/qconvex.pro b/project/qconvex/qconvex.pro
index 1c8bbb8..3e7786c 100644
--- a/project/qconvex/qconvex.pro
+++ b/project/qconvex/qconvex.pro
@@ -9,8 +9,8 @@ CONFIG += console warn_on
CONFIG -= app_bundle
LIBS += -L../..
QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings
-QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors
-#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors
+QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings
+#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions
build_pass:CONFIG(debug, debug|release):{
LIBS += libqhulld
PRE_TARGETDEPS += ../../libqhulld.a
diff --git a/project/qdelaunay/qdelaunay.pro b/project/qdelaunay/qdelaunay.pro
index e683ea1..6ca740c 100644
--- a/project/qdelaunay/qdelaunay.pro
+++ b/project/qdelaunay/qdelaunay.pro
@@ -9,8 +9,8 @@ CONFIG += console warn_on
CONFIG -= app_bundle
LIBS += -L../..
QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings
-QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors
-#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors
+QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings
+#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions
build_pass:CONFIG(debug, debug|release):{
LIBS += libqhulld
PRE_TARGETDEPS += ../../libqhulld.a
diff --git a/project/qhalf/qhalf.pro b/project/qhalf/qhalf.pro
index f5a6223..cac4097 100644
--- a/project/qhalf/qhalf.pro
+++ b/project/qhalf/qhalf.pro
@@ -9,8 +9,8 @@ CONFIG += console warn_on
CONFIG -= app_bundle
LIBS += -L../..
QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings
-QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors
-#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors
+QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings
+#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions
build_pass:CONFIG(debug, debug|release):{
LIBS += libqhulld
PRE_TARGETDEPS += ../../libqhulld.a
diff --git a/project/qhull/qhull.pro b/project/qhull/qhull.pro
index e07f892..9911e34 100644
--- a/project/qhull/qhull.pro
+++ b/project/qhull/qhull.pro
@@ -9,8 +9,8 @@ CONFIG += console warn_on
CONFIG -= app_bundle
LIBS += -L../..
QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings
-QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors
-#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors
+QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings
+#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions
build_pass:CONFIG(debug, debug|release):{
LIBS += libqhulld
PRE_TARGETDEPS += ../../libqhulld.a
diff --git a/project/qhulltest/qhulltest.pro b/project/qhulltest/qhulltest.pro
index 19ac3cd..5fee164 100644
--- a/project/qhulltest/qhulltest.pro
+++ b/project/qhulltest/qhulltest.pro
@@ -10,8 +10,8 @@ CONFIG -= app_bundle
LIBS += -L../..
DEFINES += qh_QHpointer
QMAKE_CXXFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wwrite-strings
-QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors
-#QMAKE_CXXFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors
+QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings
+#QMAKE_CXXFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions
build_pass:CONFIG(debug, debug|release):{
LIBS += libqhullcppd
PRE_TARGETDEPS += ../../libqhullcppd.a
diff --git a/project/qvoronoi/qvoronoi.pro b/project/qvoronoi/qvoronoi.pro
index 83721f8..b2fce33 100644
--- a/project/qvoronoi/qvoronoi.pro
+++ b/project/qvoronoi/qvoronoi.pro
@@ -9,8 +9,8 @@ CONFIG += console warn_on
CONFIG -= app_bundle
LIBS += -L../..
QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings
-QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors
-#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors
+QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings
+#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions
build_pass:CONFIG(debug, debug|release):{
LIBS += libqhulld
PRE_TARGETDEPS += ../../libqhulld.a
diff --git a/project/rbox/rbox.pro b/project/rbox/rbox.pro
index c7ce876..c47eeb3 100644
--- a/project/rbox/rbox.pro
+++ b/project/rbox/rbox.pro
@@ -7,8 +7,8 @@ TEMPLATE = app
CONFIG += console warn_on
LIBS += -L../..
QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings
-QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors
-#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors
+QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings
+#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions
build_pass:CONFIG(debug, debug|release):{
LIBS += libqhulld
PRE_TARGETDEPS += ../../libqhulld.a
diff --git a/project/user_eg/user_eg.pro b/project/user_eg/user_eg.pro
index a77b143..d0def9b 100644
--- a/project/user_eg/user_eg.pro
+++ b/project/user_eg/user_eg.pro
@@ -9,8 +9,8 @@ CONFIG -= app_bundle
LIBS += -L../..
DEFINES += qh_QHpointer
QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings
-QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors
-#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors
+QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings
+#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions
build_pass:CONFIG(debug, debug|release):{
LIBS += libqhullpd
PRE_TARGETDEPS += ../../libqhullpd.a
diff --git a/project/user_eg2/user_eg2.pro b/project/user_eg2/user_eg2.pro
index 8752100..6ecaf0f 100644
--- a/project/user_eg2/user_eg2.pro
+++ b/project/user_eg2/user_eg2.pro
@@ -8,8 +8,8 @@ CONFIG += console warn_on
CONFIG -= app_bundle
LIBS += -L../..
QMAKE_CFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wshadow -Wwrite-strings
-QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors
-#QMAKE_CFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors
+QMAKE_CFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings
+#QMAKE_CFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions
build_pass:CONFIG(debug, debug|release):{
LIBS += libqhulld
PRE_TARGETDEPS += ../../libqhulld.a
diff --git a/project/user_eg3/user_eg3.pro b/project/user_eg3/user_eg3.pro
index fb575f5..048ffcd 100644
--- a/project/user_eg3/user_eg3.pro
+++ b/project/user_eg3/user_eg3.pro
@@ -8,8 +8,8 @@ CONFIG += console warn_on
LIBS += -L../..
DEFINES += qh_QHpointer
QMAKE_CXXFLAGS_WARN_ON += -Werror -Wall -Wcast-qual -Wextra -Wwrite-strings
-QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int errors
-#QMAKE_CXXFLAGS_WARN_ON += -Wconversion # no workaround for bit-field conversion errors
+QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion # Many size_t vs. int warnings
+#QMAKE_CXXFLAGS_WARN_ON += -Wconversion # No workaround for bit-field conversions
build_pass:CONFIG(debug, debug|release):{
LIBS += libqhullcppd
PRE_TARGETDEPS += ../../libqhullcppd.a
--
GitLab