Revision: 40473
http://brlcad.svn.sourceforge.net/brlcad/?rev=40473&view=rev
Author: starseeker
Date: 2010-09-05 16:06:55 +0000 (Sun, 05 Sep 2010)
Log Message:
-----------
OK, this builds mged but does not yet produce a working mged.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/cmake/src/mged/CMakeLists.txt
brlcad/branches/cmake/src/mged/points/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-05 16:05:25 UTC (rev
40472)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-05 16:06:55 UTC (rev
40473)
@@ -1133,6 +1133,7 @@
ADD_SUBDIRECTORY(src/halftone)
ADD_SUBDIRECTORY(src/irprep)
ADD_SUBDIRECTORY(src/lgt)
+ADD_SUBDIRECTORY(src/mged)
# Now that everything is configured, print a summary of the build settings.
This is a bit complicated, but
# the basic idea is to print labels, "smart" spacers around those labels to
line everything up, and the
Added: brlcad/branches/cmake/src/mged/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/mged/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/mged/CMakeLists.txt 2010-09-05 16:06:55 UTC
(rev 40473)
@@ -0,0 +1,107 @@
+ADD_SUBDIRECTORY(points)
+
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/points
+ ${BRLCAD_STD_INCLUDES}
+ ${BRLCAD_TERMLIB_INCLUDE_DIR}
+ ${BRLCAD_PNG_INCLUDE_DIR}
+ ${X11_INCLUDE_DIR}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+)
+
+IF(WIN32 AND BRLCAD-ENABLE_OPENGL)
+ SET(MGED_DM_SOURCES "${MGED_DM_SOURCES};dm-wgl.c")
+ SET(MGED_DEFINES "${MGED_DEFINES} -DDM_WGL -DIF_WGL")
+ENDIF(WIN32 AND BRLCAD-ENABLE_OPENGL)
+
+IF(BRLCAD-ENABLE_X11 AND BRLCAD-ENABLE_OPENGL)
+ SET(MGED_DM_SOURCES "${MGED_DM_SOURCES};dm-ogl.c")
+ SET(MGED_DEFINES "${MGED_DEFINES} -DDM_OGL -DIF_OGL")
+ENDIF(BRLCAD-ENABLE_X11 AND BRLCAD-ENABLE_OPENGL)
+
+IF(BRLCAD-ENABLE_X11)
+ SET(MGED_DM_SOURCES "${MGED_DM_SOURCES};dm-X.c")
+ SET(MGED_DEFINES "${MGED_DEFINES} -DDM_X -DIF_X")
+ENDIF(BRLCAD-ENABLE_X11)
+
+#IF(TK_LIBRARY)
+# SET(MGED_DM_SOURCES "${MGED_DM_SOURCES};dm-tk.c")
+# SET(MGED_DEFINES "${MGED_DEFINES} -DDM_TK -DIF_TK")
+#ENDIF(TK_LIBRARY)
+
+#IF(BRLCAD-ENABLE_RTGL)
+# SET(MGED_DM_SOURCES "${MGED_DM_SOURCES};dm-rtgl.c")
+# SET(MGED_DEFINES "${MGED_DEFINES} -DDM_RTGL -DIF_RTGL")
+#ENDIF(TK_LIBRARY)
+
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+ ${MGED_DEFINES}
+)
+
+SET(MGED_SOURCES
+ adc.c
+ animedit.c
+ arbs.c
+ attach.c
+ axes.c
+ bodyio.c
+ buttons.c
+ chgmodel.c
+ chgtree.c
+ chgview.c
+ cmd.c
+ clone.c
+ color_scheme.c
+ columns.c
+ dir.c
+ ${MGED_DM_SOURCES}
+ dm-generic.c
+ dm-plot.c
+ dm-ps.c
+ dodraw.c
+ doevent.c
+ dozoom.c
+ edarb.c
+ edars.c
+ edpipe.c
+ edsol.c
+ facedef.c
+ fbserv.c
+ grid.c
+ hideline.c
+ history.c
+ mater.c
+ menu.c
+ mged.c
+ mover.c
+ muves.c
+ overlay.c
+ plot.c
+ polyif.c
+ predictor.c
+ qray.c
+ rect.c
+ rtif.c
+ scroll.c
+ set.c
+ setup.c
+ share.c
+ solids_on_ray.c
+ tedit.c
+ titles.c
+ track.c
+ update.c
+ usepen.c
+ utility1.c
+ vparse.c
+ vrlink.c
+)
+
+BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "points termio wdb ged dm tclcad")
+
+BRLCAD_ADDEXEC(cad_boundp cad_boundp.c bu)
+
+BRLCAD_ADDEXEC(cad_parea cad_parea.c bu)
Property changes on: brlcad/branches/cmake/src/mged/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/branches/cmake/src/mged/points/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/mged/points/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/mged/points/CMakeLists.txt 2010-09-05
16:06:55 UTC (rev 40473)
@@ -0,0 +1,25 @@
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${BRLCAD_STD_INCLUDES}
+)
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+)
+
+YACC_TARGET(MGEDPointsParser points_parse.y
+ ${CMAKE_CURRENT_BINARY_DIR}/points_parse.c)
+LEX_TARGET(MGEDPointsScanner points_scan.l
+ ${CMAKE_CURRENT_BINARY_DIR}/points_scan.c COMPILE_FLAGS "-l")
+ADD_LEX_YACC_DEPENDENCY(MGEDPointsScanner MGEDPointsParser)
+
+SET(MGED_POINTS_SRCS
+ ${YACC_MGEDPointsParser_OUTPUTS}
+ ${LEX_MGEDPointsScanner_OUTPUTS}
+ count.c
+ process.c
+ main.c
+)
+
+BRLCAD_ADDLIB(points "${MGED_POINTS_SRCS}" bu)
+SET_TARGET_PROPERTIES(points PROPERTIES COMPILE_DEFINITIONS "ENABLE_POINTS")
Property changes on: brlcad/branches/cmake/src/mged/points/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
