Revision: 40457
http://brlcad.svn.sourceforge.net/brlcad/?rev=40457&view=rev
Author: starseeker
Date: 2010-09-03 20:34:57 +0000 (Fri, 03 Sep 2010)
Log Message:
-----------
OK, time to face the music. libdm is going to need FindOpenGL logic roughly as
sophisticated as the FindTCL logic - we will need X11 OpenGL on OSX. Wonder if
COMPILE_FLAGS or some other approach can do per-target building and build both
X11 and Aqua code... probably not needed though.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/cmake/src/libdm/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-03 19:47:32 UTC (rev
40456)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-03 20:34:57 UTC (rev
40457)
@@ -1088,6 +1088,7 @@
ADD_SUBDIRECTORY(src/fbserv)
ADD_SUBDIRECTORY(src/rt)
#ADD_SUBDIRECTORY(src/librtserver)
+ADD_SUBDIRECTORY(src/libdm)
# 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/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libdm/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/libdm/CMakeLists.txt 2010-09-03 20:34:57 UTC
(rev 40457)
@@ -0,0 +1,65 @@
+IF(WIN32 AND BRLCAD-ENABLE_OPENGL)
+ SET(DM_DEFINES "${DM_DEFINES} -DDM_WGL -DIF_WGL")
+ENDIF(WIN32 AND BRLCAD-ENABLE_OPENGL)
+
+IF(BRLCAD-ENABLE_X11)
+ SET(DM_DEFINES "${DM_DEFINES} -DDM_X -DIF_X")
+ENDIF(BRLCAD-ENABLE_X11)
+
+IF(BRLCAD-ENABLE_X11 AND BRLCAD-ENABLE_OPENGL)
+ SET(DM_DEFINES "${DM_DEFINES} -DDM_OGL -DIF_OGL")
+ENDIF(BRLCAD-ENABLE_X11 AND BRLCAD-ENABLE_OPENGL)
+
+IF(BRLCAD-ENABLE_RTGL)
+ SET(DM_DEFINES "${DM_DEFINES} -DDM_RTGL -DIF_RTGL")
+ENDIF(BRLCAD-ENABLE_RTGL)
+
+IF(TK_LIBRARY)
+ SET(DM_DEFINES "${DM_DEFINES} -DDM_TK -DIF_TK")
+ENDIF(TK_LIBRARY)
+
+
+SET(LIBDM_SRCS
+ adc.c
+ axes.c
+ clip.c
+ color.c
+ dm-Null.c
+ dm-X.c
+ dm-tk.c
+ dm-generic.c
+ dm-ogl.c
+ dm-rtgl.c
+ dm-plot.c
+ dm-ps.c
+ dm-wgl.c
+ dm_obj.c
+ focus.c
+ grid.c
+ knob.c
+ labels.c
+ options.c
+ query.c
+ rect.c
+ scale.c
+ tcl.c
+ vers.c
+)
+
+include_directories(
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BRLCAD_TERMLIB_INCLUDE_DIR}
+ ${X11_X11_INCLUDE_DIR}
+)
+
+add_definitions(
+ -DHAVE_CONFIG_H
+ -DBRLCADBUILD
+ ${DM_DEFINES}
+)
+
+add_library(dm ${LIBDM_SRCS})
+target_link_libraries(dm librt fb ged ${X11_LIBRARIES} ${OPENGL_LIBRARIES})
+INSTALL(TARGETS dm LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+
Property changes on: brlcad/branches/cmake/src/libdm/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
