Revision: 75505
http://sourceforge.net/p/brlcad/code/75505
Author: starseeker
Date: 2020-04-21 19:39:33 +0000 (Tue, 21 Apr 2020)
Log Message:
-----------
Limit the built-in files to the framebuffer definitions (which aren't yet
incorporated into the plugin setup.)
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
Modified: brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-21
19:34:31 UTC (rev 75504)
+++ brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-21
19:39:33 UTC (rev 75505)
@@ -51,7 +51,7 @@
# Add the individual OS specific files and definitions
if(WIN32 AND BRLCAD_ENABLE_OPENGL)
list(APPEND libdm_DEFINES DM_WGL IF_WGL)
- set(dmw32_srcs wgl/dm-wgl.c wgl/if_wgl.c)
+ set(dmw32_srcs wgl/if_wgl.c)
set(DM_EXTRA_LIBS ${DM_EXTRA_LIBS} ${OPENGL_LIBRARIES})
set_property(SOURCE wgl/dm-wgl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
set_property(SOURCE wgl/if_wgl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
@@ -63,7 +63,7 @@
if(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_TK)
list(APPEND libdm_DEFINES DM_X IF_X)
- set(dmx11_srcs X/dm-X.c X/if_X24.c X/color.c)
+ set(dmx11_srcs X/if_X24.c X/color.c)
set(DM_EXTRA_LIBS ${DM_EXTRA_LIBS} ${X11_LIBRARIES})
set_property(SOURCE X/dm-X.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
set_property(SOURCE X/if_X24.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
@@ -71,7 +71,7 @@
if(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_OPENGL AND BRLCAD_ENABLE_TK)
list(APPEND libdm_DEFINES DM_OGL IF_OGL)
- set(dmogl_srcs glx/dm-ogl.c glx/if_ogl.c)
+ set(dmogl_srcs glx/if_ogl.c)
set(DM_EXTRA_LIBS ${DM_EXTRA_LIBS} ${OPENGL_LIBRARIES})
set_property(SOURCE glx/dm-ogl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
set_property(SOURCE glx/if_ogl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
@@ -80,7 +80,7 @@
if(BRLCAD_ENABLE_TK AND NOT WIN32)
list(APPEND libdm_DEFINES DM_TK IF_TK)
set(DM_EXTRA_LIBS ${DM_EXTRA_LIBS} ${TCL_LIBRARY} ${TK_LIBRARY})
- set(dmtk_srcs tk/dm-tk.c tk/if_tk.c)
+ set(dmtk_srcs tk/if_tk.c)
set_property(SOURCE tk/dm-tk.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
set_property(SOURCE tk/if_tk.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
endif(BRLCAD_ENABLE_TK AND NOT WIN32)
@@ -89,8 +89,7 @@
CHECK_CXX_FLAG(Wno-float-equal)
list(APPEND libdm_DEFINES DM_QT IF_QT)
- set(dmqt_srcs qt/dm-qt.cpp qt/if_qt.cpp)
- set_property(SOURCE qt/dm-qt.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+ set(dmqt_srcs qt/if_qt.cpp)
set_property(SOURCE qt/if_qt.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -104,8 +103,7 @@
)
if(BRLCAD_ENABLE_OSG AND BRLCAD_ENABLE_TK)
list(APPEND libdm_DEFINES DM_OSGL IF_OSGL)
- set(dmosg_srcs osgl/dm-osgl.cpp osgl/if_osgl.cpp)
- set_property(SOURCE osgl/dm-osgl.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+ set(dmosg_srcs osgl/if_osgl.cpp)
set_property(SOURCE osgl/if_osgl.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
set(OSG_LIBRARIES
${OPENGL_LIBRARIES}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
