Revision: 41861
http://brlcad.svn.sourceforge.net/brlcad/?rev=41861&view=rev
Author: starseeker
Date: 2010-12-30 18:59:20 +0000 (Thu, 30 Dec 2010)
Log Message:
-----------
Turn on strict for MGED in CMake. Need BC_WITH_PARSER definition. Building
without it exposed a problem with cmd_parse_points parameters being unused
unless BC_WITH_PARSER is defined. Also fixed MGED loading of Itcl.
Modified Paths:
--------------
brlcad/branches/cmake/src/mged/CMakeLists.txt
brlcad/branches/cmake/src/mged/cmd.c
brlcad/branches/cmake/src/mged/setup.c
Modified: brlcad/branches/cmake/src/mged/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/mged/CMakeLists.txt 2010-12-30 18:58:04 UTC
(rev 41860)
+++ brlcad/branches/cmake/src/mged/CMakeLists.txt 2010-12-30 18:59:20 UTC
(rev 41861)
@@ -112,10 +112,13 @@
ENDIF(NOT WIN32)
IF(NOT WIN32)
- BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "libtclcad libged libwdb libdm
libtermio ${pointstarget}")
+ BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "libtclcad libged libwdb libdm
libtermio ${pointstarget}" STRICT)
ELSE(NOT WIN32)
BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "libtclcad libged libwdb libdm
ws2_32.lib opengl32.lib")
ENDIF(NOT WIN32)
+IF(LEX_EXECUTABLE AND YACC_EXECUTABLE)
+ SET_TARGET_PROPERTIES(mged PROPERTIES COMPILE_FLAGS "-DBC_WITH_PARSER")
+ENDIF(LEX_EXECUTABLE AND YACC_EXECUTABLE)
BRLCAD_ADDEXEC(cad_boundp cad_boundp.c libbu)
Modified: brlcad/branches/cmake/src/mged/cmd.c
===================================================================
--- brlcad/branches/cmake/src/mged/cmd.c 2010-12-30 18:58:04 UTC (rev
41860)
+++ brlcad/branches/cmake/src/mged/cmd.c 2010-12-30 18:59:20 UTC (rev
41861)
@@ -2063,26 +2063,32 @@
/* XXX needs to be provided from points header */
extern int parse_point_file(ClientData clientData, Tcl_Interp *interpreter,
int argc, const char *argv[]);
+#ifndef BC_WITH_PARSERS
+int
+cmd_parse_points(ClientData UNUSED(clientData),
+ Tcl_Interp *UNUSED(interpreter),
+ int UNUSED(argc),
+ const char *UNUSED(argv[]))
+{
+ bu_log("parse_points was disabled in this compilation of mged due to
system limitations\n");
+ return TCL_ERROR;
+}
+#else
int
cmd_parse_points(ClientData clientData,
Tcl_Interp *interpreter,
int argc,
const char *argv[])
{
-
-#ifndef BC_WITH_PARSERS
- bu_log("parse_points was disabled in this compilation of mged due to
system limitations\n");
- return TCL_ERROR;
-#else
- if (argc != 2) {
+ if (argc != 2) {
bu_log("parse_points only supports a single file name right now\n");
bu_log("doing nothing\n");
return TCL_ERROR;
}
return parse_point_file(clientData, interpreter, argc-1, &(argv[1]));
+}
#endif
-}
int
Modified: brlcad/branches/cmake/src/mged/setup.c
===================================================================
--- brlcad/branches/cmake/src/mged/setup.c 2010-12-30 18:58:04 UTC (rev
41860)
+++ brlcad/branches/cmake/src/mged/setup.c 2010-12-30 18:59:20 UTC (rev
41861)
@@ -523,8 +523,9 @@
init_tcl=0;
/* Initialize [incr Tcl] */
- if (Tcl_Eval(interp, "package require Itcl") != TCL_OK) {
- return TCL_ERROR;
+ if (Tcl_Eval(*interpreter, "package require Itcl") != TCL_OK) {
+ bu_log("Itcl_Init ERROR:\n%s\n", Tcl_GetStringResult(*interpreter));
+ break;
}
/* don't actually want to loop forever */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
