From 55e797ffafa0d24fa5a3053d6fbeb5ebceabca54 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 21 Aug 2017 02:33:45 +0200 Subject: [PATCH] Provide proper INSTALL targets for .pro files Plus: reduce compiler warnings --- src/ant/ant.pro | 3 +- src/app.pri | 10 +++ src/buddies/src/bd/bd.pro | 3 +- src/buddies/src/buddy_app.pri | 4 +- src/buddies/unit_tests/unit_tests.pro | 8 +- src/db/db.pro | 3 +- src/edt/edt.pro | 3 +- src/ext/ext.pro | 3 +- src/gsi/gsi.pro | 3 +- src/gsiqt/gsiqt.pro | 3 +- src/img/img.pro | 3 +- src/klayout.pri | 3 - src/klayout_main/klayout_main.pro | 4 +- src/lay/lay.pro | 3 +- src/laybasic/laybasic.pro | 3 +- src/lib.pri | 10 +++ src/lib/lib.pro | 3 +- src/lib_ut.pri | 9 -- src/plugins/plugin_ut.pri | 19 ---- src/pya/pya.pro | 3 +- src/pyastub/pyastub.pro | 3 +- src/rba/rba.pro | 3 +- src/rbastub/rbastub.pro | 3 +- src/rdb/rdb.pro | 3 +- src/tl/tl.pro | 3 +- src/unit_tests/tlCommandLineParser.cc | 120 +++++++++++++------------- 26 files changed, 107 insertions(+), 131 deletions(-) create mode 100644 src/app.pri create mode 100644 src/lib.pri delete mode 100644 src/plugins/plugin_ut.pri diff --git a/src/ant/ant.pro b/src/ant/ant.pro index 7f4196f8c..4442d858b 100644 --- a/src/ant/ant.pro +++ b/src/ant/ant.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_ant include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_ANT_LIBRARY -TEMPLATE = lib - HEADERS = \ antConfig.h \ antConfigPage.h \ diff --git a/src/app.pri b/src/app.pri new file mode 100644 index 000000000..d5e3f9115 --- /dev/null +++ b/src/app.pri @@ -0,0 +1,10 @@ + +TEMPLATE = app + +inst_target.path = $$PREFIX +win32 { + inst_target.files = $$DESTDIR/$${TARGET}.exe +} else { + inst_target.files = $$DESTDIR/$${TARGET} +} +INSTALLS = inst_target diff --git a/src/buddies/src/bd/bd.pro b/src/buddies/src/bd/bd.pro index 46a9d36fd..80509f221 100644 --- a/src/buddies/src/bd/bd.pro +++ b/src/buddies/src/bd/bd.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/../../.. TARGET = klayout_bd include($$PWD/../../../klayout.pri) +include($$PWD/../../../lib.pri) DEFINES += MAKE_BD_LIBRARY -TEMPLATE = lib - SOURCES = \ bdInit.cc \ bdReaderOptions.cc \ diff --git a/src/buddies/src/buddy_app.pri b/src/buddies/src/buddy_app.pri index a5f31ade2..a030eef9b 100644 --- a/src/buddies/src/buddy_app.pri +++ b/src/buddies/src/buddy_app.pri @@ -1,12 +1,12 @@ include($$PWD/../../klayout.pri) -TEMPLATE = app - PRO_BASENAME = $$basename(_PRO_FILE_) TARGET = $$replace(PRO_BASENAME, ".pro", "") DESTDIR = $$OUT_PWD/../../.. +include($$PWD/../../app.pri) + # Since the main function is entirely unspecific, we can put it into a common # place - it's not part of the bd sources. SOURCES = $$PWD/bd/main.cc diff --git a/src/buddies/unit_tests/unit_tests.pro b/src/buddies/unit_tests/unit_tests.pro index 39fc66b8c..651710769 100644 --- a/src/buddies/unit_tests/unit_tests.pro +++ b/src/buddies/unit_tests/unit_tests.pro @@ -1,4 +1,7 @@ +DESTDIR_UT = $$OUT_PWD/../.. +DESTDIR = $$OUT_PWD/.. + TARGET = bd_tests include($$PWD/../../klayout.pri) @@ -13,7 +16,8 @@ SOURCES = \ bdStrmxorTests.cc \ -INCLUDEPATH += ../src/bd -DEPENDPATH += ../src/bd +INCLUDEPATH += ../src/bd ../../db ../../tl ../../gsi ../../laybasic ../../lay ../../ut +DEPENDPATH += ../src/bd ../../db ../../tl ../../gsi ../../laybasic ../../lay ../../ut +LIBS += -L$$DESTDIR_UT -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_lay -lklayout_ut LIBS += -L$$DESTDIR -lklayout_bd diff --git a/src/db/db.pro b/src/db/db.pro index b43b57f12..6141125ae 100644 --- a/src/db/db.pro +++ b/src/db/db.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_db include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_DB_LIBRARY -TEMPLATE = lib - SOURCES = \ dbArray.cc \ dbBox.cc \ diff --git a/src/edt/edt.pro b/src/edt/edt.pro index 943ca8920..c4c841c14 100644 --- a/src/edt/edt.pro +++ b/src/edt/edt.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_edt include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_EDT_LIBRARY -TEMPLATE = lib - HEADERS = \ edtConfig.h \ edtDialogs.h \ diff --git a/src/ext/ext.pro b/src/ext/ext.pro index 11b3d9edd..0fddb6484 100644 --- a/src/ext/ext.pro +++ b/src/ext/ext.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_ext include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_EXT_LIBRARY -TEMPLATE = lib - HEADERS += \ extBooleanOperationsDialogs.h \ extDEFImporter.h \ diff --git a/src/gsi/gsi.pro b/src/gsi/gsi.pro index 1fba8435b..b13a1c41e 100644 --- a/src/gsi/gsi.pro +++ b/src/gsi/gsi.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_gsi include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_GSI_LIBRARY -TEMPLATE = lib - SOURCES = \ gsi.cc \ gsiClassBase.cc \ diff --git a/src/gsiqt/gsiqt.pro b/src/gsiqt/gsiqt.pro index 9f7c1da0f..b6111c36f 100644 --- a/src/gsiqt/gsiqt.pro +++ b/src/gsiqt/gsiqt.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_gsiqt include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_GSIQT_LIBRARY -TEMPLATE = lib - # NOTE: db is required since some bridges to db are provided (i.e db::Polygon) INCLUDEPATH += ../tl ../gsi ../db ../gsiqt DEPENDPATH += ../tl ../gsi ../db ../gsiqt diff --git a/src/img/img.pro b/src/img/img.pro index 2c5c97004..ca6bd6618 100644 --- a/src/img/img.pro +++ b/src/img/img.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_img include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_IMG_LIBRARY -TEMPLATE = lib - HEADERS = \ imgLandmarksDialog.h \ imgNavigator.h \ diff --git a/src/klayout.pri b/src/klayout.pri index 4c72148f2..8a33efbf6 100644 --- a/src/klayout.pri +++ b/src/klayout.pri @@ -44,9 +44,6 @@ equals(HAVE_QT5, "1") { CONFIG += designer } -target.path = $$PREFIX -INSTALLS += target - # only support the required symbols for shared object load performance win32 { QMAKE_LFLAGS += -Wl,--exclude-all-symbols diff --git a/src/klayout_main/klayout_main.pro b/src/klayout_main/klayout_main.pro index d85f09aae..16c01a594 100644 --- a/src/klayout_main/klayout_main.pro +++ b/src/klayout_main/klayout_main.pro @@ -3,10 +3,10 @@ DESTDIR = $$OUT_PWD/.. include($$PWD/../klayout.pri) -TEMPLATE = app - TARGET = klayout +include($$PWD/../app.pri) + HEADERS = \ FORMS = \ diff --git a/src/lay/lay.pro b/src/lay/lay.pro index 94d345676..2896a3a84 100644 --- a/src/lay/lay.pro +++ b/src/lay/lay.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_lay include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_LAY_LIBRARY -TEMPLATE = lib - HEADERS = \ layApplication.h \ layClipDialog.h \ diff --git a/src/laybasic/laybasic.pro b/src/laybasic/laybasic.pro index 4c226c4e9..418c45833 100644 --- a/src/laybasic/laybasic.pro +++ b/src/laybasic/laybasic.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_laybasic include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_LAYBASIC_LIBRARY -TEMPLATE = lib - FORMS = \ AlignCellOptionsDialog.ui \ BookmarkManagementForm.ui \ diff --git a/src/lib.pri b/src/lib.pri new file mode 100644 index 000000000..45300b0ce --- /dev/null +++ b/src/lib.pri @@ -0,0 +1,10 @@ + +TEMPLATE = lib + +inst_target.path = $$PREFIX +win32 { + inst_target.files = $$DESTDIR/$${TARGET}.dll +} else { + inst_target.files = $$DESTDIR/lib$${TARGET}.so +} +INSTALLS = inst_target diff --git a/src/lib/lib.pro b/src/lib/lib.pro index 1bf90db61..a882cf04c 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_lib include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_LIB_LIBRARY -TEMPLATE = lib - HEADERS = \ libBasicArc.h \ libBasicCircle.h \ diff --git a/src/lib_ut.pri b/src/lib_ut.pri index 635dcefd1..ad5c99a9a 100644 --- a/src/lib_ut.pri +++ b/src/lib_ut.pri @@ -1,15 +1,6 @@ -DESTDIR_UT = $$OUT_PWD/../.. -DESTDIR = $$OUT_PWD/.. - TEMPLATE = lib -INCLUDEPATH += ../src ../../db ../../tl ../../gsi ../../laybasic ../../lay ../../ut -DEPENDPATH += ../src ../../db ../../tl ../../gsi ../../laybasic ../../lay ../../ut -LIBS += -L$$DESTDIR_UT -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_lay -lklayout_ut - -QMAKE_RPATHDIR += $$DESTDIR - # Only on Windows, DESTDIR_TARGET is usable. On this platform, a blank happens to appear between # $(DESTDIR) and $(TARGET) win32 { diff --git a/src/plugins/plugin_ut.pri b/src/plugins/plugin_ut.pri deleted file mode 100644 index 174698f52..000000000 --- a/src/plugins/plugin_ut.pri +++ /dev/null @@ -1,19 +0,0 @@ - -DESTDIR_UT = $$OUT_PWD/../../.. -DESTDIR = $$OUT_PWD/.. - -TEMPLATE = lib - -INCLUDEPATH += ../src ../../../db ../../../tl ../../../gsi ../../../laybasic ../../../lay ../../../ut -DEPENDPATH += ../src ../../../db ../../../tl ../../../gsi ../../../laybasic ../../../lay ../../../ut -LIBS += -L$$DESTDIR_UT -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_lay -lklayout_ut - -QMAKE_RPATHDIR += $$DESTDIR - -# Only on Windows, DESTDIR_TARGET is usable. On this platform, a blank happens to appear between -# $(DESTDIR) and $(TARGET) -win32 { - QMAKE_POST_LINK += $(COPY) $(DESTDIR_TARGET) $$DESTDIR_UT/$${TARGET}.ut -} else { - QMAKE_POST_LINK += $(COPY) $(DESTDIR)$(TARGET) $$DESTDIR_UT/$${TARGET}.ut -} diff --git a/src/pya/pya.pro b/src/pya/pya.pro index 1468d62f6..0e1624aaa 100644 --- a/src/pya/pya.pro +++ b/src/pya/pya.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_pya include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_PYA_LIBRARY -TEMPLATE = lib - SOURCES = \ pya.cc \ pyaConvert.cc \ diff --git a/src/pyastub/pyastub.pro b/src/pyastub/pyastub.pro index e60aadc94..5c43a3991 100644 --- a/src/pyastub/pyastub.pro +++ b/src/pyastub/pyastub.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_pyastub include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_PYA_LIBRARY -TEMPLATE = lib - SOURCES = pya.cc INCLUDEPATH += ../tl ../gsi diff --git a/src/rba/rba.pro b/src/rba/rba.pro index 838f8b4b5..b7bd2ef05 100644 --- a/src/rba/rba.pro +++ b/src/rba/rba.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_rba include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_RBA_LIBRARY -TEMPLATE = lib - SOURCES = rba.cc \ rbaConvert.cc \ rbaInspector.cc \ diff --git a/src/rbastub/rbastub.pro b/src/rbastub/rbastub.pro index 2b7d6abe4..c86e1478c 100644 --- a/src/rbastub/rbastub.pro +++ b/src/rbastub/rbastub.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_rbastub include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_RBA_LIBRARY -TEMPLATE = lib - HEADERS = rbaCommon.h SOURCES = rba.cc diff --git a/src/rdb/rdb.pro b/src/rdb/rdb.pro index e13cd4e1d..b07690753 100644 --- a/src/rdb/rdb.pro +++ b/src/rdb/rdb.pro @@ -3,11 +3,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_rdb include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_RDB_LIBRARY -TEMPLATE = lib - FORMS = \ RESOURCES = \ diff --git a/src/tl/tl.pro b/src/tl/tl.pro index acb2d42a2..bf78d33c6 100644 --- a/src/tl/tl.pro +++ b/src/tl/tl.pro @@ -3,13 +3,12 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_tl include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_TL_LIBRARY LIBS += -lz -TEMPLATE = lib - FORMS = \ PasswordDialog.ui diff --git a/src/unit_tests/tlCommandLineParser.cc b/src/unit_tests/tlCommandLineParser.cc index b0beddabe..45dbb400a 100644 --- a/src/unit_tests/tlCommandLineParser.cc +++ b/src/unit_tests/tlCommandLineParser.cc @@ -43,23 +43,23 @@ TEST(1) << tl::arg ("-f|--flong=value", &f, ""); { - char *argv[] = { "x", "y" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "y" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (a, "y"); EXPECT_EQ (b, 0); { - char *argv[] = { "x", "z", "17" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "z", "17" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (a, "z"); EXPECT_EQ (b, 17); b = 0; { - char *argv[] = { "x", "u", "-c" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "-c" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (a, "u"); EXPECT_EQ (b, 0); @@ -68,24 +68,24 @@ TEST(1) b = 0; c = true; { - char *argv[] = { "x", "u", "-cc" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "-cc" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (a, "u"); EXPECT_EQ (b, 0); EXPECT_EQ (c, false); { - char *argv[] = { "x", "u", "-c", "-cc" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "-c", "-cc" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (c, false); b = 0; c = false; { - char *argv[] = { "x", "u", "-c", "-p=21" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "-c", "-p=21" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (a, "u"); EXPECT_EQ (b, 0); @@ -95,8 +95,8 @@ TEST(1) b = 0; c = false; { - char *argv[] = { "x", "u", "-p", "22", "-c" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "-p", "22", "-c" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (a, "u"); EXPECT_EQ (b, 0); @@ -105,31 +105,31 @@ TEST(1) e = false; { - char *argv[] = { "x", "u", "--plong", "23" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "--plong", "23" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (a, "u"); EXPECT_EQ (d, 23); EXPECT_EQ (e, false); { - char *argv[] = { "x", "u", "--plong=24", "--elong" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "--plong=24", "--elong" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (a, "u"); EXPECT_EQ (d, 24); EXPECT_EQ (e, true); { - char *argv[] = { "x", "u", "-c", "-f=foo" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "-c", "-f=foo" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (a, "u"); EXPECT_EQ (f, "foo"); { - char *argv[] = { "x", "u", "--flong", "bar" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "--flong", "bar" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (a, "u"); EXPECT_EQ (f, "bar"); @@ -174,23 +174,23 @@ TEST(2) << tl::arg ("-f|--flong=value", &v, &Values::set_f, ""); { - char *argv[] = { "x", "y" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "y" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (v.a, "y"); EXPECT_EQ (v.b, 0); { - char *argv[] = { "x", "z", "17" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "z", "17" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (v.a, "z"); EXPECT_EQ (v.b, 17); v.b = 0; { - char *argv[] = { "x", "u", "-c" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "-c" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (v.a, "u"); EXPECT_EQ (v.b, 0); @@ -199,24 +199,24 @@ TEST(2) v.b = 0; v.c = true; { - char *argv[] = { "x", "u", "-cc" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "-cc" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (v.a, "u"); EXPECT_EQ (v.b, 0); EXPECT_EQ (v.c, false); { - char *argv[] = { "x", "u", "-c", "-cc" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "-c", "-cc" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (v.c, false); v.b = 0; v.c = false; { - char *argv[] = { "x", "u", "-c", "-p=21" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "-c", "-p=21" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (v.a, "u"); EXPECT_EQ (v.b, 0); @@ -226,8 +226,8 @@ TEST(2) v.b = 0; v.c = false; { - char *argv[] = { "x", "u", "-p", "22", "-c" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "-p", "22", "-c" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (v.a, "u"); EXPECT_EQ (v.b, 0); @@ -236,31 +236,31 @@ TEST(2) v.e = false; { - char *argv[] = { "x", "u", "--plong", "23" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "--plong", "23" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (v.a, "u"); EXPECT_EQ (v.d, 23); EXPECT_EQ (v.e, false); { - char *argv[] = { "x", "u", "--plong=24", "--elong" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "--plong=24", "--elong" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (v.a, "u"); EXPECT_EQ (v.d, 24); EXPECT_EQ (v.e, true); { - char *argv[] = { "x", "u", "-c", "-f=foo" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "-c", "-f=foo" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (v.a, "u"); EXPECT_EQ (v.f, "foo"); { - char *argv[] = { "x", "u", "--flong", "bar" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "u", "--flong", "bar" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (v.a, "u"); EXPECT_EQ (v.f, "bar"); @@ -277,8 +277,8 @@ TEST(3) << tl::arg ("-b", &b, ""); { - char *argv[] = { "x", "r,u,v" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "r,u,v" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (int (a.size ()), 3); EXPECT_EQ (a[0], "r"); @@ -288,8 +288,8 @@ TEST(3) a.clear (); { - char *argv[] = { "x", "\"r,u\",v" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "\"r,u\",v" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (int (a.size ()), 2); EXPECT_EQ (a[0], "r,u"); @@ -298,8 +298,8 @@ TEST(3) a.clear (); { - char *argv[] = { "x", "'\"'", "-b=1,5,-13" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "'\"'", "-b=1,5,-13" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (int (a.size ()), 1); EXPECT_EQ (a[0], "\""); @@ -311,8 +311,8 @@ TEST(3) a.clear (); b.clear (); { - char *argv[] = { "x", "", "-b", "-13,21" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "", "-b", "-13,21" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (int (a.size ()), 0); EXPECT_EQ (int (b.size ()), 2); @@ -331,8 +331,8 @@ TEST(4) << tl::arg ("*-b|--blong", &b, ""); { - char *argv[] = { "x", "-a", "r,u,v" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "-a", "r,u,v" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (int (a.size ()), 1); EXPECT_EQ (a[0], "r,u,v"); @@ -341,8 +341,8 @@ TEST(4) a.clear (); b.clear (); { - char *argv[] = { "x", "-b", "1", "-a=r", "-a", "u", "--along=v", "--blong=2" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "-b", "1", "-a=r", "-a", "u", "--along=v", "--blong=2" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (int (a.size ()), 3); EXPECT_EQ (int (b.size ()), 2); @@ -366,8 +366,8 @@ TEST(5) << tl::arg ("?*c", &c, ""); { - char *argv[] = { "x", "y", "r,u,v" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "y", "r,u,v" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (int (b.size ()), 3); EXPECT_EQ (int (c.size ()), 0); @@ -381,8 +381,8 @@ TEST(5) c.clear (); { - char *argv[] = { "x", "y", "r,u,v", "a,b", "c", "d" }; - cmd.parse (sizeof (argv) / sizeof (argv[0]), argv); + const char *argv[] = { "x", "y", "r,u,v", "a,b", "c", "d" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); } EXPECT_EQ (int (b.size ()), 3); EXPECT_EQ (int (c.size ()), 3);