Revision: 76676
http://sourceforge.net/p/brlcad/code/76676
Author: starseeker
Date: 2020-08-06 18:01:54 +0000 (Thu, 06 Aug 2020)
Log Message:
-----------
Push the conditionals and the ignore files into the plugin build logic
Modified Paths:
--------------
brlcad/trunk/src/libdm/CMakeLists.txt
brlcad/trunk/src/libdm/X/CMakeLists.txt
brlcad/trunk/src/libdm/glx/CMakeLists.txt
brlcad/trunk/src/libdm/osgl/CMakeLists.txt
brlcad/trunk/src/libdm/plot/CMakeLists.txt
brlcad/trunk/src/libdm/postscript/CMakeLists.txt
brlcad/trunk/src/libdm/qt/CMakeLists.txt
brlcad/trunk/src/libdm/tk/CMakeLists.txt
brlcad/trunk/src/libdm/txt/CMakeLists.txt
brlcad/trunk/src/libdm/wgl/CMakeLists.txt
Modified: brlcad/trunk/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/CMakeLists.txt 2020-08-06 17:40:33 UTC (rev
76675)
+++ brlcad/trunk/src/libdm/CMakeLists.txt 2020-08-06 18:01:54 UTC (rev
76676)
@@ -18,35 +18,18 @@
BRLCAD_LIB_INCLUDE_DIRS(dm DM_INCLUDE_DIRS DM_LOCAL_INCLUDE_DIRS)
-if(BRLCAD_ENABLE_TCL)
- add_subdirectory(plot)
- add_subdirectory(txt)
-endif(BRLCAD_ENABLE_TCL)
+# Backend implementations
+add_subdirectory(X)
+add_subdirectory(glx)
+add_subdirectory(osgl)
+add_subdirectory(plot)
+add_subdirectory(postscript)
+add_subdirectory(qt)
+add_subdirectory(tk)
+add_subdirectory(txt)
+add_subdirectory(wgl)
-if(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_TK)
- add_subdirectory(X)
- if(BRLCAD_ENABLE_OPENGL)
- add_subdirectory(glx)
- endif(BRLCAD_ENABLE_OPENGL)
-endif(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_TK)
-
-if(WIN32 AND BRLCAD_ENABLE_OPENGL)
- add_subdirectory(wgl)
-endif(WIN32 AND BRLCAD_ENABLE_OPENGL)
-
-if(BRLCAD_ENABLE_TK)
- if(BRLCAD_ENABLE_DM_TK)
- add_subdirectory(tk)
- endif(BRLCAD_ENABLE_DM_TK)
- if(BRLCAD_ENABLE_OSG)
- add_subdirectory(osgl)
- endif(BRLCAD_ENABLE_OSG)
-endif(BRLCAD_ENABLE_TK)
-
-if(BRLCAD_ENABLE_QT)
- add_subdirectory(qt)
-endif(BRLCAD_ENABLE_QT)
-
+# Main libdm library
set(LIBDM_SRCS
null/dm-Null.c
null/if_null.c
@@ -82,20 +65,6 @@
BRLCAD_ADDLIB(libdm "${LIBDM_SRCS}"
"librt;libicv;libbu;libpkg;${OPENGL_LIBRARIES};${PNG_LIBRARIES}")
set_target_properties(libdm PROPERTIES VERSION 20.0.1 SOVERSION 20)
-#if(BRLCAD_ENABLE_OSG)
-# BRLCAD_ADDEXEC(osg-test osgl/osg-test.cpp "librt;libbu;${OSG_LIBRARIES}"
NO_STRICT NO_INSTALL)
-# if(HIDE_INTERNAL_SYMBOLS)
-# if (TARGET osg OR HIDE_INTERNAL_SYMBOLS_EXT)
-# set_property(TARGET libdm APPEND PROPERTY COMPILE_DEFINITIONS
"FREETYPE_DLL_IMPORTS")
-# endif (TARGET osg OR HIDE_INTERNAL_SYMBOLS_EXT)
-# if(TARGET libdm-obj)
-# if (TARGET osg OR HIDE_INTERNAL_SYMBOLS_EXT)
-# set_property(TARGET libdm-obj APPEND PROPERTY COMPILE_DEFINITIONS
"FREETYPE_DLL_IMPORTS")
-# endif (TARGET osg OR HIDE_INTERNAL_SYMBOLS_EXT)
-# endif(TARGET libdm-obj)
-# endif(HIDE_INTERNAL_SYMBOLS)
-#endif(BRLCAD_ENABLE_OSG)
-
if (TARGET profont_ProFont_ttf_cp)
add_dependencies(libdm profont_ProFont_ttf_cp)
endif (TARGET profont_ProFont_ttf_cp)
@@ -106,55 +75,8 @@
CMakeLists.txt
README
TODO
- X/CMakeLists.txt
- X/color.c
- X/dm-X.c
- X/dm-X.h
- X/fb_X.h
- X/if_X24.c
- glx/CMakeLists.txt
- glx/dm-glx.h
- glx/dm-ogl.c
- glx/dm-ogl.h
- glx/fb_ogl.h
- glx/if_ogl.c
if_TEMPLATE.c
null/dm-Null.h
- osgl/CMakeLists.txt
- osgl/dm-osgl.cpp
- osgl/dm-osgl.h
- osgl/fb_osgl.h
- osgl/fontstash/LICENSE.fontstash
- osgl/fontstash/README.md
- osgl/fontstash/fontstash.h
- osgl/fontstash/glfontstash.h
- osgl/fontstash/stb_truetype.h
- osgl/if_osgl.cpp
- osgl/osg-test.cpp
- osgl/osg_bob.cpp
- osgl/osg_fb_manipulator.h
- plot/CMakeLists.txt
- plot/dm-plot.c
- plot/dm-plot.h
- postscript/CMakeLists.txt
- postscript/dm-ps.c
- postscript/dm-ps.h
- qt/CMakeLists.txt
- qt/dm-qt.cpp
- qt/dm-qt.h
- qt/fb_qt.h
- qt/if_qt.cpp
- tk/CMakeLists.txt
- tk/dm-tk.c
- tk/dm-tk.h
- tk/if_tk.c
- txt/CMakeLists.txt
- txt/dm-txt.c
- wgl/CMakeLists.txt
- wgl/dm-wgl.c
- wgl/dm-wgl.h
- wgl/fb_wgl.h
- wgl/if_wgl.c
include/private.h
include/calltable.h
)
Modified: brlcad/trunk/src/libdm/X/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/X/CMakeLists.txt 2020-08-06 17:40:33 UTC (rev
76675)
+++ brlcad/trunk/src/libdm/X/CMakeLists.txt 2020-08-06 18:01:54 UTC (rev
76676)
@@ -1,16 +1,3 @@
-
-find_package(X11)
-find_package(TCL)
-
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${BRLCAD_BINARY_DIR}/include
- ${BRLCAD_SOURCE_DIR}/include
- ${X11_INCLUDE_DIR}
- ${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
- )
-
set(X_SRCS
dm-X.c
color.c
@@ -17,20 +4,40 @@
if_X24.c
)
-set_property(SOURCE dm-X.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
-set_property(SOURCE if_X24.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+if(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_TK)
-add_definitions(-DDM_PLUGIN)
+ find_package(X11)
+ find_package(TCL)
-add_library(dm-X SHARED ${X_SRCS})
-target_link_libraries(dm-X libdm libbu ${TCL_LIBRARY} ${TK_LIBRARY}
${X11_LIBRARIES})
-set_property(TARGET dm-X APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-VALIDATE_STYLE(dm-X "${X_SRCS}")
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${X11_INCLUDE_DIR}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ )
-PLUGIN_SETUP(dm-X dm)
+ set_property(SOURCE dm-X.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+ set_property(SOURCE if_X24.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
-CMAKEFILES(dm-X.h)
+ add_definitions(-DDM_PLUGIN)
+ add_library(dm-X SHARED ${X_SRCS})
+ target_link_libraries(dm-X libdm libbu ${TCL_LIBRARY} ${TK_LIBRARY}
${X11_LIBRARIES})
+ set_property(TARGET dm-X APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
+ VALIDATE_STYLE(dm-X "${X_SRCS}")
+
+ PLUGIN_SETUP(dm-X dm)
+
+endif(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_TK)
+
+CMAKEFILES(
+ CMakeLists.txt
+ ${X_SRCS}
+ dm-X.h
+ )
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/trunk/src/libdm/glx/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/glx/CMakeLists.txt 2020-08-06 17:40:33 UTC (rev
76675)
+++ brlcad/trunk/src/libdm/glx/CMakeLists.txt 2020-08-06 18:01:54 UTC (rev
76676)
@@ -1,38 +1,47 @@
-find_package(TCL)
-find_package(X11)
-find_package(GL)
-
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${BRLCAD_BINARY_DIR}/include
- ${BRLCAD_SOURCE_DIR}/include
- ${BU_INCLUDE_DIRS}
- ${X11_INCLUDE_DIR}
- ${OPENGL_INCLUDE_DIR_GL}
- ${OPENGL_INCLUDE_DIR_GLX}
- ${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
- )
-
set(OGL_SRCS
dm-ogl.c
if_ogl.c
)
-set_property(SOURCE dm-ogl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
-set_property(SOURCE if_ogl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+if(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_TK AND BRLCAD_ENABLE_OPENGL)
-add_definitions(-DDM_PLUGIN)
+ find_package(TCL)
+ find_package(X11)
+ find_package(GL)
-add_library(dm-ogl SHARED ${OGL_SRCS})
-target_link_libraries(dm-ogl libdm libbu ${X11_LIBRARIES} ${OPENGL_LIBRARIES}
${TCL_LIBRARY} ${TK_LIBRARY})
-set_property(TARGET dm-ogl APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-VALIDATE_STYLE(dm-ogl "${OGL_SRCS}")
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
+ ${X11_INCLUDE_DIR}
+ ${OPENGL_INCLUDE_DIR_GL}
+ ${OPENGL_INCLUDE_DIR_GLX}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ )
-PLUGIN_SETUP(dm-ogl dm)
+ set_property(SOURCE dm-ogl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+ set_property(SOURCE if_ogl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
-CMAKEFILES(dm-ogl.h)
+ add_definitions(-DDM_PLUGIN)
+
+ add_library(dm-ogl SHARED ${OGL_SRCS})
+ target_link_libraries(dm-ogl libdm libbu ${X11_LIBRARIES}
${OPENGL_LIBRARIES} ${TCL_LIBRARY} ${TK_LIBRARY})
+ set_property(TARGET dm-ogl APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
+ VALIDATE_STYLE(dm-ogl "${OGL_SRCS}")
+
+ PLUGIN_SETUP(dm-ogl dm)
+
+endif(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_TK AND BRLCAD_ENABLE_OPENGL)
+
+CMAKEFILES(
+ CMakeLists.txt
+ ${OGL_SRCS}
+ dm-ogl.h
+ )
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/trunk/src/libdm/osgl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/osgl/CMakeLists.txt 2020-08-06 17:40:33 UTC (rev
76675)
+++ brlcad/trunk/src/libdm/osgl/CMakeLists.txt 2020-08-06 18:01:54 UTC (rev
76676)
@@ -1,53 +1,72 @@
-# Make sure we know about required components
-find_package(X11)
-find_package(GL)
-#find_package(OpenThreads)
-#find_package(OpenSceneGraph)
-find_package(TCL)
-
-# Include directories needed by libdm users
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${BRLCAD_BINARY_DIR}/include
- ${BRLCAD_SOURCE_DIR}/include
- ${BU_INCLUDE_DIRS}
- ${RT_INCLUDE_DIRS}
- ${X11_INCLUDE_DIR}
- ${OPENGL_INCLUDE_DIR_GL}
- ${OPENGL_INCLUDE_DIR_GLX}
- ${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
- ${OPENTHREADS_INCLUDE_DIR}
- ${OSG_INCLUDE_DIR}
- )
-
-set(OSGL_LIBRARIES
- ${OPENGL_LIBRARIES}
- ${TCL_LIBRARY}
- ${TK_LIBRARY}
- ${OSG_LIBRARY}
- ${OSGTEXT_LIBRARY}
- ${OSGVIEWER_LIBRARY}
- )
-
set(OSGL_SRCS
dm-osgl.cpp
if_osgl.cpp
)
-set_property(SOURCE dm-osgl.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
-set_property(SOURCE if_osgl.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+if(BRLCAD_ENABLE_TK AND BRLCAD_ENABLE_OSG)
-add_definitions(-DDM_PLUGIN)
+ # Make sure we know about required components
+ find_package(X11)
+ find_package(GL)
+ #find_package(OpenThreads)
+ #find_package(OpenSceneGraph)
+ find_package(TCL)
-add_library(dm-osgl SHARED ${OSGL_SRCS})
-target_link_libraries(dm-osgl libdm librt libbu ${OSGL_LIBRARIES})
-set_property(TARGET dm-osgl APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-VALIDATE_STYLE(dm-osgl "${OSGL_SRCS}")
+ # Include directories needed by libdm users
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
+ ${RT_INCLUDE_DIRS}
+ ${X11_INCLUDE_DIR}
+ ${OPENGL_INCLUDE_DIR_GL}
+ ${OPENGL_INCLUDE_DIR_GLX}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ ${OPENTHREADS_INCLUDE_DIR}
+ ${OSG_INCLUDE_DIR}
+ )
-PLUGIN_SETUP(dm-osgl dm)
+ set(OSGL_LIBRARIES
+ ${OPENGL_LIBRARIES}
+ ${TCL_LIBRARY}
+ ${TK_LIBRARY}
+ ${OSG_LIBRARY}
+ ${OSGTEXT_LIBRARY}
+ ${OSGVIEWER_LIBRARY}
+ )
+ set_property(SOURCE dm-osgl.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+ set_property(SOURCE if_osgl.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+
+ add_definitions(-DDM_PLUGIN)
+
+ add_library(dm-osgl SHARED ${OSGL_SRCS})
+ target_link_libraries(dm-osgl libdm librt libbu ${OSGL_LIBRARIES})
+ set_property(TARGET dm-osgl APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
+ VALIDATE_STYLE(dm-osgl "${OSGL_SRCS}")
+
+ PLUGIN_SETUP(dm-osgl dm)
+
+endif(BRLCAD_ENABLE_TK AND BRLCAD_ENABLE_OSG)
+
+#if(BRLCAD_ENABLE_OSG)
+# BRLCAD_ADDEXEC(osg-test osg-test.cpp "librt;libbu;${OSG_LIBRARIES}"
NO_STRICT NO_INSTALL)
+# if(HIDE_INTERNAL_SYMBOLS)
+# if (TARGET osg OR HIDE_INTERNAL_SYMBOLS_EXT)
+# set_property(TARGET libdm APPEND PROPERTY COMPILE_DEFINITIONS
"FREETYPE_DLL_IMPORTS")
+# endif (TARGET osg OR HIDE_INTERNAL_SYMBOLS_EXT)
+# if(TARGET libdm-obj)
+# if (TARGET osg OR HIDE_INTERNAL_SYMBOLS_EXT)
+# set_property(TARGET libdm-obj APPEND PROPERTY COMPILE_DEFINITIONS
"FREETYPE_DLL_IMPORTS")
+# endif (TARGET osg OR HIDE_INTERNAL_SYMBOLS_EXT)
+# endif(TARGET libdm-obj)
+# endif(HIDE_INTERNAL_SYMBOLS)
+#endif(BRLCAD_ENABLE_OSG)
+
CMAKEFILES(
+ ${OSGL_SRCS}
dm-osgl.h
fb_osgl.h
osg-test.cpp
Modified: brlcad/trunk/src/libdm/plot/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/plot/CMakeLists.txt 2020-08-06 17:40:33 UTC (rev
76675)
+++ brlcad/trunk/src/libdm/plot/CMakeLists.txt 2020-08-06 18:01:54 UTC (rev
76676)
@@ -1,26 +1,34 @@
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${BRLCAD_BINARY_DIR}/include
- ${BRLCAD_SOURCE_DIR}/include
- ${BU_INCLUDE_DIRS}
- ${TCL_INCLUDE_PATH}
- )
-
set(PLOT_SRCS
dm-plot.c
)
-add_definitions(-DDM_PLUGIN)
-add_library(dm-plot SHARED ${PLOT_SRCS})
-target_link_libraries(dm-plot libdm libbu ${TCL_LIBRARY})
-set_property(TARGET dm-plot APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-VALIDATE_STYLE(dm-plot "${PLOT_SRCS}")
+if(BRLCAD_ENABLE_TCL)
-PLUGIN_SETUP(dm-plot dm)
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
+ ${TCL_INCLUDE_PATH}
+ )
-CMAKEFILES(dm-plot.h)
+ add_definitions(-DDM_PLUGIN)
+ add_library(dm-plot SHARED ${PLOT_SRCS})
+ target_link_libraries(dm-plot libdm libbu ${TCL_LIBRARY})
+ set_property(TARGET dm-plot APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
+ VALIDATE_STYLE(dm-plot "${PLOT_SRCS}")
+
+ PLUGIN_SETUP(dm-plot dm)
+
+endif(BRLCAD_ENABLE_TCL)
+
+CMAKEFILES(
+ ${PLOT_SRCS}
+ dm-plot.h
+ )
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/trunk/src/libdm/postscript/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/postscript/CMakeLists.txt 2020-08-06 17:40:33 UTC
(rev 76675)
+++ brlcad/trunk/src/libdm/postscript/CMakeLists.txt 2020-08-06 18:01:54 UTC
(rev 76676)
@@ -1,25 +1,36 @@
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${BRLCAD_BINARY_DIR}/include
- ${BRLCAD_SOURCE_DIR}/include
- ${BU_INCLUDE_DIRS}
- )
-
set(PS_SRCS
dm-ps.c
)
-add_definitions(-DDM_PLUGIN)
+if(BRLCAD_ENABLE_TCL)
-add_library(dm-ps SHARED ${PS_SRCS})
-target_link_libraries(dm-ps libdm libbu)
-set_property(TARGET dm-ps APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-VALIDATE_STYLE(dm-ps "${PS_SRCS}")
+ find_package(TCL)
-PLUGIN_SETUP(dm-ps dm)
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
+ ${TCL_INCLUDE_PATH}
+ )
-CMAKEFILES(dm-ps.h)
+ add_definitions(-DDM_PLUGIN)
+ add_library(dm-ps SHARED ${PS_SRCS})
+ target_link_libraries(dm-ps libdm libbu)
+ set_property(TARGET dm-ps APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
+ VALIDATE_STYLE(dm-ps "${PS_SRCS}")
+
+ PLUGIN_SETUP(dm-ps dm)
+
+endif(BRLCAD_ENABLE_TCL)
+
+CMAKEFILES(
+ CMakeLists.txt
+ ${PS_SRCS}
+ dm-ps.h
+ )
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/trunk/src/libdm/qt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/qt/CMakeLists.txt 2020-08-06 17:40:33 UTC (rev
76675)
+++ brlcad/trunk/src/libdm/qt/CMakeLists.txt 2020-08-06 18:01:54 UTC (rev
76676)
@@ -1,45 +1,51 @@
-# Make sure we know about required components
-find_package(X11)
-find_package(GL)
-find_package(Qt5Widgets QUIET)
-find_package(TCL)
-
-# Include directories needed by libdm users
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/../include
- ${BRLCAD_BINARY_DIR}/include
- ${BRLCAD_SOURCE_DIR}/include
- ${BU_INCLUDE_DIRS}
- ${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
- ${Qt5Widgets_INCLUDE_DIRS}
- )
-
-set(QT_LIBRARIES
- ${TCL_LIBRARY}
- ${TK_LIBRARY}
- ${Qt5Widgets_LIBRARIES}
- )
-
set(QT_SRCS
dm-qt.cpp
if_qt.cpp
)
-set_property(SOURCE dm-qt.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
-set_property(SOURCE if_qt.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+if(BRLCAD_ENABLE_QT)
-add_definitions(-DDM_PLUGIN)
+ # Make sure we know about required components
+ find_package(X11)
+ find_package(GL)
+ find_package(Qt5Widgets QUIET)
+ find_package(TCL)
-add_library(dm-qt SHARED ${QT_SRCS})
-target_link_libraries(dm-qt libdm libbu ${QT_LIBRARIES})
-set_property(TARGET dm-qt APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-VALIDATE_STYLE(dm-qt "${QT_SRCS}")
+ # Include directories needed by libdm users
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../include
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ ${Qt5Widgets_INCLUDE_DIRS}
+ )
-PLUGIN_SETUP(dm-qt dm)
+ set(QT_LIBRARIES
+ ${TCL_LIBRARY}
+ ${TK_LIBRARY}
+ ${Qt5Widgets_LIBRARIES}
+ )
+ set_property(SOURCE dm-qt.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+ set_property(SOURCE if_qt.cpp APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+
+ add_definitions(-DDM_PLUGIN)
+
+ add_library(dm-qt SHARED ${QT_SRCS})
+ target_link_libraries(dm-qt libdm libbu ${QT_LIBRARIES})
+ set_property(TARGET dm-qt APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
+ VALIDATE_STYLE(dm-qt "${QT_SRCS}")
+
+ PLUGIN_SETUP(dm-qt dm)
+
+endif(BRLCAD_ENABLE_QT)
+
CMAKEFILES(
+ CMakeLists.txt
+ ${QT_SRCS}
fb_qt.h
)
Modified: brlcad/trunk/src/libdm/tk/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/tk/CMakeLists.txt 2020-08-06 17:40:33 UTC (rev
76675)
+++ brlcad/trunk/src/libdm/tk/CMakeLists.txt 2020-08-06 18:01:54 UTC (rev
76676)
@@ -1,33 +1,41 @@
-find_package(TCL)
-
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${BRLCAD_BINARY_DIR}/include
- ${BRLCAD_SOURCE_DIR}/include
- ${BU_INCLUDE_DIRS}
- ${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
- )
-
set(TK_SRCS
dm-tk.c
if_tk.c
)
-set_property(SOURCE dm-tk.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
-set_property(SOURCE if_tk24.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+if(BRLCAD_ENABLE_TK AND BRLCAD_ENABLE_DM_TK)
-add_definitions(-DDM_PLUGIN)
+ find_package(TCL)
-add_library(dm-tk SHARED ${TK_SRCS})
-target_link_libraries(dm-tk libdm libbu ${TCL_LIBRARY} ${TK_LIBRARY})
-set_property(TARGET dm-tk APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-VALIDATE_STYLE(dm-tk "${TK_SRCS}")
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ )
-PLUGIN_SETUP(dm-tk dm)
+ set_property(SOURCE dm-tk.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+ set_property(SOURCE if_tk24.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
-CMAKEFILES(dm-tk.h)
+ add_definitions(-DDM_PLUGIN)
+ add_library(dm-tk SHARED ${TK_SRCS})
+ target_link_libraries(dm-tk libdm libbu ${TCL_LIBRARY} ${TK_LIBRARY})
+ set_property(TARGET dm-tk APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
+ VALIDATE_STYLE(dm-tk "${TK_SRCS}")
+
+ PLUGIN_SETUP(dm-tk dm)
+
+endif(BRLCAD_ENABLE_TK AND BRLCAD_ENABLE_DM_TK)
+
+CMAKEFILES(
+ CMakeLists.txt
+ ${TK_SRCS}
+ dm-tk.h
+ )
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/trunk/src/libdm/txt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/txt/CMakeLists.txt 2020-08-06 17:40:33 UTC (rev
76675)
+++ brlcad/trunk/src/libdm/txt/CMakeLists.txt 2020-08-06 18:01:54 UTC (rev
76676)
@@ -1,25 +1,36 @@
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${BRLCAD_BINARY_DIR}/include
- ${BRLCAD_SOURCE_DIR}/include
- ${BU_INCLUDE_DIRS}
- ${TCL_INCLUDE_PATH}
- )
-
set(TXT_SRCS
dm-txt.c
if_debug.c
)
-add_definitions(-DDM_PLUGIN)
+if(BRLCAD_ENABLE_TCL)
-add_library(dm-txt SHARED ${TXT_SRCS})
-target_link_libraries(dm-txt libdm libbu ${TCL_LIBRARY})
-set_property(TARGET dm-txt APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-VALIDATE_STYLE(dm-txt "${TXT_SRCS}")
+ find_package(TCL)
-PLUGIN_SETUP(dm-txt dm)
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
+ ${TCL_INCLUDE_PATH}
+ )
+ add_definitions(-DDM_PLUGIN)
+
+ add_library(dm-txt SHARED ${TXT_SRCS})
+ target_link_libraries(dm-txt libdm libbu ${TCL_LIBRARY})
+ set_property(TARGET dm-txt APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
+ VALIDATE_STYLE(dm-txt "${TXT_SRCS}")
+
+ PLUGIN_SETUP(dm-txt dm)
+
+endif(BRLCAD_ENABLE_TCL)
+
+CMAKEFILES(
+ CMakeLists.txt
+ ${TXT_SRCS}
+ )
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/trunk/src/libdm/wgl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/wgl/CMakeLists.txt 2020-08-06 17:40:33 UTC (rev
76675)
+++ brlcad/trunk/src/libdm/wgl/CMakeLists.txt 2020-08-06 18:01:54 UTC (rev
76676)
@@ -1,34 +1,42 @@
-find_package(GL)
-find_package(TCL)
-
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${BRLCAD_BINARY_DIR}/include
- ${BRLCAD_SOURCE_DIR}/include
- ${OPENGL_INCLUDE_DIR_GL}
- ${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
- )
-
set(WGL_SRCS
dm-wgl.c
if_wgl.c
)
-set_property(SOURCE dm-wgl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
-set_property(SOURCE if_wgl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+if(WIN32 AND BRLCAD_ENABLE_OPENGL)
-add_definitions(-DDM_PLUGIN)
+ find_package(GL)
+ find_package(TCL)
-add_library(dm-wgl SHARED ${WGL_SRCS})
-target_link_libraries(dm-wgl libdm libbu ${TCL_LIBRARY} ${TK_LIBRARY}
${OPENGL32_LIBRARY} ${OPENGL_LIBRARIES})
-set_property(TARGET dm-wgl APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
-VALIDATE_STYLE(dm-wgl "${WGL_SRCS}")
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${OPENGL_INCLUDE_DIR_GL}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ )
-PLUGIN_SETUP(dm-wgl dm)
+ set_property(SOURCE dm-wgl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+ set_property(SOURCE if_wgl.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
-CMAKEFILES(dm-wgl.h)
+ add_definitions(-DDM_PLUGIN)
+ add_library(dm-wgl SHARED ${WGL_SRCS})
+ target_link_libraries(dm-wgl libdm libbu ${TCL_LIBRARY} ${TK_LIBRARY}
${OPENGL32_LIBRARY} ${OPENGL_LIBRARIES})
+ set_property(TARGET dm-wgl APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
+ VALIDATE_STYLE(dm-wgl "${WGL_SRCS}")
+
+ PLUGIN_SETUP(dm-wgl dm)
+
+endif(WIN32 AND BRLCAD_ENABLE_OPENGL)
+
+CMAKEFILES(
+ CMakeLists.txt
+ ${WGL_SRCS}
+ dm-wgl.h
+ )
+
# Local Variables:
# tab-width: 8
# mode: cmake
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
