Revision: 76861
http://sourceforge.net/p/brlcad/code/76861
Author: starseeker
Date: 2020-08-21 12:30:38 +0000 (Fri, 21 Aug 2020)
Log Message:
-----------
Make a couple of build system adjustments (set target folders, mark as
advanced). Major change is to do for libdm what we did for libged and make a
single target for apps to use as a dependency lister, rather than calling out
individual backends - that's not robust to changes in backend target names and
would be fragile in the long run.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/src/adrt/CMakeLists.txt
brlcad/trunk/src/archer/CMakeLists.txt
brlcad/trunk/src/art/CMakeLists.txt
brlcad/trunk/src/burst/CMakeLists.txt
brlcad/trunk/src/burst/old/CMakeLists.txt
brlcad/trunk/src/fb/CMakeLists.txt
brlcad/trunk/src/fbserv/CMakeLists.txt
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
brlcad/trunk/src/libged/CMakeLists.txt
brlcad/trunk/src/mged/CMakeLists.txt
brlcad/trunk/src/remrt/CMakeLists.txt
brlcad/trunk/src/rt/CMakeLists.txt
brlcad/trunk/src/rtwizard/CMakeLists.txt
brlcad/trunk/src/sig/CMakeLists.txt
brlcad/trunk/src/util/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev 76860)
+++ brlcad/trunk/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev 76861)
@@ -3682,6 +3682,7 @@
mark_as_advanced(LIBRARY_OUTPUT_PATH)
mark_as_advanced(CMAKE_CXX_COMPILER)
mark_as_advanced(CMAKE_C_COMPILER)
+mark_as_advanced(CMAKE_AR)
# ----------------------------------------------------------------------------
# If options have been defined that we are going to document, by now they've
Modified: brlcad/trunk/src/adrt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/adrt/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/adrt/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -73,7 +73,7 @@
BRLCAD_ADDDATA(isst.tcl tclscripts/isst)
BRLCAD_ADDEXEC(isst isst.c "${isst_libs}" GUI)
- ADD_TARGET_DEPS(isst isst_tcl_cp dm-ogl dm-wgl)
+ ADD_TARGET_DEPS(isst isst_tcl_cp dm_plugins)
foreach(item ${tclindex_target_list})
add_dependencies(isst ${item})
endforeach(item ${tclindex_target_list})
Modified: brlcad/trunk/src/archer/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/archer/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/archer/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -19,7 +19,7 @@
BRLCAD_ADDEXEC(archer archer.c "${archer_libs}" GUI)
add_dependencies(archer archer_launch_tcl_cp)
add_dependencies(archer rtwizard)
- ADD_TARGET_DEPS(archer Tkhtml Tktable itcl_pkgIndex itk_pkgIndex dm-ogl
dm-wgl)
+ ADD_TARGET_DEPS(archer Tkhtml Tktable itcl_pkgIndex itk_pkgIndex dm_plugins)
foreach(item ${tclindex_target_list})
add_dependencies(archer ${item})
Modified: brlcad/trunk/src/art/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/art/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev 76860)
+++ brlcad/trunk/src/art/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev 76861)
@@ -47,7 +47,7 @@
)
BRLCAD_ADDEXEC(art "${ART_SRCS}"
"${RT_STD_LIBS};${Appleseed_LIBRARIES};${Appleseed_BOOST_SYSTEM_LIB};${Appleseed_OPENIMAGEIO_LIB}"
TEST_USESDATA)
- ADD_TARGET_DEPS(art dm-ogl dm-wgl)
+ ADD_TARGET_DEPS(art dm_plugins)
endif(Appleseed_FOUND)
set(art_ignore_files
Modified: brlcad/trunk/src/burst/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/burst/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/burst/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -24,7 +24,7 @@
)
BRLCAD_ADDEXEC(nburst "${burst_SOURCES}" "librt;libdm;libbu;${M_LIBRARY}")
-ADD_TARGET_DEPS(nburst dm-ogl dm-wgl)
+ADD_TARGET_DEPS(nburst dm_plugins)
set(burst_ignore
CMakeLists.txt
Modified: brlcad/trunk/src/burst/old/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/burst/old/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/burst/old/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -27,7 +27,7 @@
BRLCAD_ADDEXEC(burst "${burst_old_SOURCES}" "librt;libdm;${M_LIBRARY}")
-ADD_TARGET_DEPS(burst dm-ogl dm-wgl)
+ADD_TARGET_DEPS(burst dm_plugins)
set(burst_old_noinst_HEADERS
CMakeLists.txt
Modified: brlcad/trunk/src/fb/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/fb/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev 76860)
+++ brlcad/trunk/src/fb/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev 76861)
@@ -13,73 +13,73 @@
add_definitions(-DIF_WGL)
endif(MSVC)
BRLCAD_ADDEXEC(bw-fb bw-fb.c libdm)
-ADD_TARGET_DEPS(bw-fb dm-ogl dm-wgl)
+ADD_TARGET_DEPS(bw-fb dm_plugins)
BRLCAD_ADDEXEC(fb-bw fb-bw.c libdm)
-ADD_TARGET_DEPS(fb-bw dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fb-bw dm_plugins)
BRLCAD_ADDEXEC(fb-fb fb-fb.c libdm)
-ADD_TARGET_DEPS(fb-fb dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fb-fb dm_plugins)
BRLCAD_ADDEXEC(fb-pix "fb-pix.c;cmap-crunch.c" libdm)
-ADD_TARGET_DEPS(fb-pix dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fb-pix dm_plugins)
BRLCAD_ADDEXEC(fb-png "fb-png.c;cmap-crunch.c" "libdm;${PNG_LIBRARIES}")
-ADD_TARGET_DEPS(fb-png dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fb-png dm_plugins)
BRLCAD_ADDEXEC(fbcbars fbcbars.c libdm)
-ADD_TARGET_DEPS(fbcbars dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fbcbars dm_plugins)
BRLCAD_ADDEXEC(fbclear fbclear.c libdm)
-ADD_TARGET_DEPS(fbclear dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fbclear dm_plugins)
BRLCAD_ADDEXEC(fbcmap fbcmap.c libdm)
-ADD_TARGET_DEPS(fbcmap dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fbcmap dm_plugins)
if(TARGET libtermio)
BRLCAD_ADDEXEC(fbcolor fbcolor.c "libdm;libtermio")
- ADD_TARGET_DEPS(fbcolor dm-ogl dm-wgl)
+ ADD_TARGET_DEPS(fbcolor dm_plugins)
else(TARGET libtermio)
CMAKEFILES(fbcolor.c)
endif(TARGET libtermio)
BRLCAD_ADDEXEC(fbfade "fbfade.c;ioutil.c" libdm)
-ADD_TARGET_DEPS(fbfade dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fbfade dm_plugins)
BRLCAD_ADDEXEC(fbframe fbframe.c libdm)
-ADD_TARGET_DEPS(fbframe dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fbframe dm_plugins)
BRLCAD_ADDEXEC(fbfree fbfree.c libdm)
-ADD_TARGET_DEPS(fbfree dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fbfree dm_plugins)
BRLCAD_ADDEXEC(fbgamma fbgamma.c "libdm;${M_LIBRARY}")
-ADD_TARGET_DEPS(fbgamma dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fbgamma dm_plugins)
BRLCAD_ADDEXEC(fbgrid fbgrid.c libdm)
-ADD_TARGET_DEPS(fbgrid dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fbgrid dm_plugins)
BRLCAD_ADDEXEC(fbhelp fbhelp.c libdm)
-ADD_TARGET_DEPS(fbhelp dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fbhelp dm_plugins)
BRLCAD_ADDEXEC(fblabel fblabel.c libdm)
-ADD_TARGET_DEPS(fblabel dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fblabel dm_plugins)
BRLCAD_ADDEXEC(fbline fbline.c libdm)
-ADD_TARGET_DEPS(fbline dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fbline dm_plugins)
if(TARGET libtermio)
BRLCAD_ADDEXEC(fbpoint fbpoint.c "libdm;libbu;libtermio;libpkg")
- ADD_TARGET_DEPS(fbpoint dm-ogl dm-wgl)
+ ADD_TARGET_DEPS(fbpoint dm_plugins)
else(TARGET libtermio)
CMAKEFILES(fbpoint.c)
endif(TARGET libtermio)
BRLCAD_ADDEXEC(fbstretch "fbstretch.c;ioutil.c" libdm)
-ADD_TARGET_DEPS(fbstretch dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fbstretch dm_plugins)
if(TARGET libtermio)
BRLCAD_ADDEXEC(fbzoom fbzoom.c "libdm;libtermio")
- ADD_TARGET_DEPS(fbzoom dm-ogl dm-wgl)
+ ADD_TARGET_DEPS(fbzoom dm_plugins)
else(TARGET libtermio)
CMAKEFILES(fbzoom.c)
endif(TARGET libtermio)
BRLCAD_ADDEXEC(gif-fb "gif-fb.c;ioutil.c" libdm)
-ADD_TARGET_DEPS(gif-fb dm-ogl dm-wgl)
+ADD_TARGET_DEPS(gif-fb dm_plugins)
BRLCAD_ADDEXEC(gif2fb gif2fb.c libdm)
-ADD_TARGET_DEPS(gif2fb dm-ogl dm-wgl)
+ADD_TARGET_DEPS(gif2fb dm_plugins)
BRLCAD_ADDEXEC(pix-fb pix-fb.c libdm)
-ADD_TARGET_DEPS(pix-fb dm-ogl dm-wgl)
+ADD_TARGET_DEPS(pix-fb dm_plugins)
BRLCAD_ADDEXEC(pixautosize pixautosize.c libdm)
-ADD_TARGET_DEPS(pixautosize dm-ogl dm-wgl)
+ADD_TARGET_DEPS(pixautosize dm_plugins)
BRLCAD_ADDEXEC(plot3-fb plot3-fb.c libdm)
-ADD_TARGET_DEPS(plot3-fb dm-ogl dm-wgl)
+ADD_TARGET_DEPS(plot3-fb dm_plugins)
BRLCAD_ADDEXEC(png-fb png-fb.c "libdm;${PNG_LIBRARIES}")
-ADD_TARGET_DEPS(png-fb dm-ogl dm-wgl)
+ADD_TARGET_DEPS(png-fb dm_plugins)
BRLCAD_ADDEXEC(spm-fb spm-fb.c "libdm;libbn")
-ADD_TARGET_DEPS(spm-fb dm-ogl dm-wgl)
+ADD_TARGET_DEPS(spm-fb dm_plugins)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/fbserv/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/fbserv/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/fbserv/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -3,7 +3,7 @@
)
BRLCAD_ADDEXEC(fbserv "fbserv.c;server.c" libdm)
-ADD_TARGET_DEPS(fbserv dm-ogl dm-wgl)
+ADD_TARGET_DEPS(fbserv dm_plugins)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/libdm/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -18,6 +18,27 @@
BRLCAD_LIB_INCLUDE_DIRS(dm DM_INCLUDE_DIRS DM_LOCAL_INCLUDE_DIRS)
+add_custom_command(
+ OUTPUT "${CMAKE_BINARY_DIR}/dm_plugins.sentinel"
+ COMMAND ${CMAKE_COMMAND} -E touch "${CMAKE_BINARY_DIR}/dm_plugins.sentinel"
+ )
+add_custom_target(dm_plugins_sentinel
+ DEPENDS ${CMAKE_BINARY_DIR}/dm_plugins.sentinel
+ )
+set_target_properties(dm_plugins_sentinel PROPERTIES FOLDER "BRL-CAD
Plugins/dm")
+
+function(dm_plugin_library name)
+ add_library(${name} ${ARGN})
+ add_dependencies(dm_plugins_sentinel ${name})
+endfunction(dm_plugin_library name)
+
+# This target is supplied so applications wanting to run libdm
+# commands at build time can depend on the plugins being built as well as
+# libdm itself (otherwise LIBGED commands might fail due to their plugins not
+# yet having been built.)
+add_custom_target(dm_plugins ALL DEPENDS dm_plugins_sentinel)
+set_target_properties(dm_plugins PROPERTIES FOLDER "BRL-CAD Plugins")
+
# Backend implementations
add_subdirectory(X)
add_subdirectory(glx)
Modified: brlcad/trunk/src/libdm/X/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/X/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/libdm/X/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -23,7 +23,7 @@
add_definitions(-DDM_PLUGIN)
- add_library(dm-X SHARED ${X_SRCS})
+ dm_plugin_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}")
Modified: brlcad/trunk/src/libdm/glx/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/glx/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/libdm/glx/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -27,7 +27,7 @@
add_definitions(-DDM_PLUGIN)
- add_library(dm-ogl SHARED ${OGL_SRCS})
+ dm_plugin_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}")
Modified: brlcad/trunk/src/libdm/osgl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/osgl/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/libdm/osgl/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -42,7 +42,7 @@
add_definitions(-DDM_PLUGIN)
- add_library(dm-osgl SHARED ${OSGL_SRCS})
+ dm_plugin_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}")
Modified: brlcad/trunk/src/libdm/plot/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/plot/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/libdm/plot/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -15,7 +15,7 @@
add_definitions(-DDM_PLUGIN)
- add_library(dm-plot SHARED ${PLOT_SRCS})
+ dm_plugin_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}")
Modified: brlcad/trunk/src/libdm/postscript/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/postscript/CMakeLists.txt 2020-08-20 23:30:57 UTC
(rev 76860)
+++ brlcad/trunk/src/libdm/postscript/CMakeLists.txt 2020-08-21 12:30:38 UTC
(rev 76861)
@@ -16,7 +16,7 @@
add_definitions(-DDM_PLUGIN)
- add_library(dm-ps SHARED ${PS_SRCS})
+ dm_plugin_library(dm-ps SHARED ${PS_SRCS})
target_link_libraries(dm-ps libdm libbu ${TCL_LIBRARY})
set_property(TARGET dm-ps APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
VALIDATE_STYLE(dm-ps "${PS_SRCS}")
Modified: brlcad/trunk/src/libdm/qt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/qt/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/libdm/qt/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -34,7 +34,7 @@
add_definitions(-DDM_PLUGIN)
- add_library(dm-qt SHARED ${QT_SRCS})
+ dm_plugin_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}")
Modified: brlcad/trunk/src/libdm/tk/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/tk/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/libdm/tk/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -21,7 +21,7 @@
add_definitions(-DDM_PLUGIN)
- add_library(dm-tk SHARED ${TK_SRCS})
+ dm_plugin_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}")
Modified: brlcad/trunk/src/libdm/txt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/txt/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/libdm/txt/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -17,7 +17,7 @@
add_definitions(-DDM_PLUGIN)
- add_library(dm-txt SHARED ${TXT_SRCS})
+ dm_plugin_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}")
Modified: brlcad/trunk/src/libdm/wgl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/wgl/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/libdm/wgl/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -22,7 +22,7 @@
add_definitions(-DDM_PLUGIN)
- add_library(dm-wgl SHARED ${WGL_SRCS})
+ dm_plugin_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}")
Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/libged/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -8,6 +8,8 @@
add_custom_target(ged_plugins_sentinel
DEPENDS ${CMAKE_BINARY_DIR}/ged_plugins.sentinel
)
+set_target_properties(ged_plugins_sentinel PROPERTIES FOLDER "BRL-CAD
Plugins/ged")
+
function(ged_plugin_library name)
add_library(${name} ${ARGN})
add_dependencies(ged_plugins_sentinel ${name})
@@ -18,7 +20,9 @@
# libged itself (otherwise LIBGED commands might fail due to their plugins not
# yet having been built.)
add_custom_target(ged_plugins ALL DEPENDS ged_plugins_sentinel)
+set_target_properties(ged_plugins PROPERTIES FOLDER "BRL-CAD Plugins")
+
set(LIBGED_SOURCES
exec.cpp
exec_mapping.cpp
Modified: brlcad/trunk/src/mged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/mged/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/mged/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -74,7 +74,7 @@
BRLCAD_INCLUDE_DIRS(MGED_INCLUDE_DIRS)
BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "${mged_libs}")
- ADD_TARGET_DEPS(mged Tkhtml Tktable itcl_pkgIndex itk_pkgIndex dm-ogl dm-wgl)
+ ADD_TARGET_DEPS(mged Tkhtml Tktable itcl_pkgIndex itk_pkgIndex dm_plugins)
# mged depends on the creation/installation of all the
# tclscripts.
Modified: brlcad/trunk/src/remrt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/remrt/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/remrt/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -15,11 +15,11 @@
)
BRLCAD_ADDEXEC(remrt "../rt/opt.c;ihost.c;remrt.c" "liboptical;libdm")
- ADD_TARGET_DEPS(remrt dm-ogl dm-wgl)
+ ADD_TARGET_DEPS(remrt dm_plugins)
BRLCAD_ADDEXEC(rtsrv
"../rt/usage.cpp;../rt/view.c;../rt/do.c;../rt/heatgraph.c;../rt/opt.c;../rt/scanline.c;../rt/worker.c;rtsrv.c"
"libdm;liboptical;libpkg;libicv")
set_property(TARGET rtsrv APPEND PROPERTY COMPILE_DEFINITIONS "RTSRV")
- ADD_TARGET_DEPS(rtsrv dm-ogl dm-wgl)
+ ADD_TARGET_DEPS(rtsrv dm_plugins)
endif (NOT WIN32)
CMAKEFILES(
Modified: brlcad/trunk/src/rt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/rt/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev 76860)
+++ brlcad/trunk/src/rt/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev 76861)
@@ -57,13 +57,13 @@
BRLCAD_ADDEXEC(reshoot "reshoot.c"
"${CMAKE_THREAD_LIBS_INIT};librt;libdm;liboptical;libicv")
BRLCAD_ADDEXEC(rtshot "rtshot.c" "${RT_STD_LIBS};libdm")
-ADD_TARGET_DEPS(rtshot dm-ogl dm-wgl)
+ADD_TARGET_DEPS(rtshot dm_plugins)
BRLCAD_ADDEXEC(rtscale "read-rtlog.c;rtscale.c"
"${CMAKE_THREAD_LIBS_INIT};librt;libdm;liboptical;libicv;${M_LIBRARY}")
-ADD_TARGET_DEPS(rtscale dm-ogl dm-wgl)
+ADD_TARGET_DEPS(rtscale dm_plugins)
BRLCAD_ADDEXEC(rt "${LIBRTUIF_SOURCES};view.c"
"${OPENCL_LIBS};${RT_STD_LIBS};libdm")
-ADD_TARGET_DEPS(rt dm-ogl dm-wgl dm-txt)
+ADD_TARGET_DEPS(rt dm_plugins dm-txt)
BRLCAD_ADDEXEC(rtarea "${LIBRTUIF_SOURCES};viewarea.c" "${RT_STD_LIBS}")
set_property(TARGET rtarea APPEND PROPERTY COMPILE_DEFINITIONS "RT_TXT_OUTPUT")
@@ -72,7 +72,7 @@
set_property(TARGET rtcheck APPEND PROPERTY COMPILE_DEFINITIONS
"RT_TXT_OUTPUT")
BRLCAD_ADDEXEC(rtedge "${LIBRTUIF_SOURCES};viewedge.c" "${RT_STD_LIBS};libdm")
-ADD_TARGET_DEPS(rtedge dm-ogl dm-wgl)
+ADD_TARGET_DEPS(rtedge dm_plugins)
BRLCAD_ADDEXEC(rtg3 "${LIBRTUIF_SOURCES};viewg3.c" "${RT_STD_LIBS}")
set_property(TARGET rtg3 APPEND PROPERTY COMPILE_DEFINITIONS "RT_TXT_OUTPUT")
@@ -81,13 +81,13 @@
set_property(TARGET rthide APPEND PROPERTY COMPILE_DEFINITIONS "RT_TXT_OUTPUT")
BRLCAD_ADDEXEC(rtsil "${LIBRTUIF_SOURCES};viewsil.c" "${RT_STD_LIBS};libdm")
-ADD_TARGET_DEPS(rtxray dm-ogl dm-wgl)
+ADD_TARGET_DEPS(rtxray dm_plugins)
BRLCAD_ADDEXEC(rtweight "${LIBRTUIF_SOURCES};viewweight.c"
"libanalyze;${RT_STD_LIBS}")
set_property(TARGET rtweight APPEND PROPERTY COMPILE_DEFINITIONS
"RT_TXT_OUTPUT")
BRLCAD_ADDEXEC(rtxray "${LIBRTUIF_SOURCES};viewxray.c" "${RT_STD_LIBS};libdm")
-ADD_TARGET_DEPS(rtxray dm-ogl dm-wgl)
+ADD_TARGET_DEPS(rtxray dm_plugins)
set(rt_ignore_files
CMakeLists.txt
Modified: brlcad/trunk/src/rtwizard/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/rtwizard/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/rtwizard/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -13,7 +13,7 @@
)
BRLCAD_ADDEXEC(rtwizard "${RTWIZARD_SRCS}"
"libtclcad;librt;libdm;liboptical;libicv;${ITCL_LIBRARY};${ITK_LIBRARY};${CMAKE_THREAD_LIBS_INIT};${M_LIBRARY}")
- ADD_TARGET_DEPS(rtwizard rt rtedge fbserv fb-png fb-pix fbclear fblabel
fbfree fbline fb-fb pix-bw bwmod bw-pix pixmatte pix-fb tkpng dm-ogl dm-wgl)
+ ADD_TARGET_DEPS(rtwizard rt rtedge fbserv fb-png fb-pix fbclear fblabel
fbfree fbline fb-fb pix-bw bwmod bw-pix pixmatte pix-fb tkpng dm_plugins)
foreach(item ${tclindex_target_list})
add_dependencies(rtwizard ${item})
endforeach(item ${tclindex_target_list})
Modified: brlcad/trunk/src/sig/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/sig/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev 76860)
+++ brlcad/trunk/src/sig/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev 76861)
@@ -11,7 +11,7 @@
BRLCAD_ADDEXEC(dauto2 dauto2.c libbu)
BRLCAD_ADDEXEC(dconv dconv.c "libbu;libfft")
BRLCAD_ADDEXEC(ddisp ddisp.c libdm)
-ADD_TARGET_DEPS(ddisp dm-ogl dm-wgl)
+ADD_TARGET_DEPS(ddisp dm_plugins)
BRLCAD_ADDEXEC(dfft "dfft.c;interp.c;butter.c" "libbu;libfft")
BRLCAD_ADDEXEC(dmod dmod.c "libbu;${M_LIBRARY}")
BRLCAD_ADDEXEC(dpeak dpeak.c libbu)
Modified: brlcad/trunk/src/util/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/util/CMakeLists.txt 2020-08-20 23:30:57 UTC (rev
76860)
+++ brlcad/trunk/src/util/CMakeLists.txt 2020-08-21 12:30:38 UTC (rev
76861)
@@ -28,7 +28,7 @@
if(BRLCAD_ENABLE_TK)
BRLCAD_ADDEXEC(bombardier bombardier.c
"libtclcad;libbu;${TK_LIBRARY};${TCL_LIBRARY}")
BRLCAD_ADDEXEC(plot3-dm plot3-dm.c
"libtclcad;libdm;libbu;${TK_LIBRARY};${TCL_LIBRARY};${M_LIBRARY}")
- ADD_TARGET_DEPS(plot3-dm dm-ogl dm-wgl)
+ ADD_TARGET_DEPS(plot3-dm dm_plugins)
else(BRLCAD_ENABLE_TK)
CMAKEFILES(
bombardier.c
@@ -48,16 +48,16 @@
BRLCAD_ADDEXEC(ap-pix ap-pix.c libbu)
BRLCAD_ADDEXEC(asc-plot3 asc-plot3.c "libbn;libbu")
BRLCAD_ADDEXEC(bw-a bw-a.c "libdm;libbu")
-ADD_TARGET_DEPS(bw-a dm-ogl dm-wgl)
+ADD_TARGET_DEPS(bw-a dm_plugins)
BRLCAD_ADDEXEC(bw-pix bw-pix.c "libbu;libicv")
BRLCAD_ADDEXEC(bw-png bw-png.c "libdm;libbu;${PNG_LIBRARIES}")
-ADD_TARGET_DEPS(bw-png dm-ogl dm-wgl)
+ADD_TARGET_DEPS(bw-png dm_plugins)
BRLCAD_ADDEXEC(bw-ps bw-ps.c libbu)
BRLCAD_ADDEXEC(bwcrop bwcrop.c libbu)
BRLCAD_ADDEXEC(bwdiff bwdiff.c libbu)
BRLCAD_ADDEXEC(bwfilter bwfilter.c "libicv;libbu")
BRLCAD_ADDEXEC(bwhist bwhist.c libdm)
-ADD_TARGET_DEPS(bwhist dm-ogl dm-wgl)
+ADD_TARGET_DEPS(bwhist dm_plugins)
BRLCAD_ADDEXEC(bwhisteq bwhisteq.c libbu)
BRLCAD_ADDEXEC(bwmod bwmod.c "libbu;${M_LIBRARY}")
BRLCAD_ADDEXEC(bwrect bwrect.c "libbu;libicv")
@@ -69,17 +69,17 @@
BRLCAD_ADDEXEC(cv cv.c libbu)
BRLCAD_ADDEXEC(decimate decimate.c libbu)
BRLCAD_ADDEXEC(double-asc double-asc.c "libdm;libbu")
-ADD_TARGET_DEPS(double-asc dm-ogl dm-wgl)
+ADD_TARGET_DEPS(double-asc dm_plugins)
BRLCAD_ADDEXEC(dpix-pix dpix-pix.c libbu)
BRLCAD_ADDEXEC(gencolor gencolor.c libbu)
BRLCAD_ADDEXEC(halftone halftone.c "librt;libdm;libbu")
-ADD_TARGET_DEPS(halftone dm-ogl dm-wgl)
+ADD_TARGET_DEPS(halftone dm_plugins)
# This is intended to replace all of the img-img utils eventually
BRLCAD_ADDEXEC(icv icv.cpp "libicv;libbu")
BRLCAD_ADDEXEC(imgdims imgdims.c "libdm;libbu")
-ADD_TARGET_DEPS(imgdims dm-ogl dm-wgl)
+ADD_TARGET_DEPS(imgdims dm_plugins)
BRLCAD_ADDEXEC(loop loop.c libbu)
BRLCAD_ADDEXEC(lowp lowp.c libbu)
BRLCAD_ADDEXEC(mac-pix mac-pix.c libbu)
@@ -87,9 +87,9 @@
BRLCAD_ADDEXEC(pix-alias pix-alias.c libbu)
BRLCAD_ADDEXEC(pix-bw pix-bw.c "libbu;libicv")
BRLCAD_ADDEXEC(pix-png pix-png.c "libdm;libbu;${PNG_LIBRARIES}")
-ADD_TARGET_DEPS(pix-png dm-ogl dm-wgl)
+ADD_TARGET_DEPS(pix-png dm_plugins)
BRLCAD_ADDEXEC(pix-ppm pix-ppm.c "libdm;libbu")
-ADD_TARGET_DEPS(pix-ppm dm-ogl dm-wgl)
+ADD_TARGET_DEPS(pix-ppm dm_plugins)
BRLCAD_ADDEXEC(pix-ps pix-ps.c libbu)
BRLCAD_ADDEXEC(pix-spm pix-spm.c libbn)
BRLCAD_ADDEXEC(pix-sun pix-sun.c libbu)
@@ -96,10 +96,10 @@
BRLCAD_ADDEXEC(pix3filter pix3filter.c libbu)
BRLCAD_ADDEXEC(pixbackgnd pixbackgnd.c libbu)
BRLCAD_ADDEXEC(pixbgstrip pixbgstrip.c "libdm;libbu")
-ADD_TARGET_DEPS(pixbgstrip dm-ogl dm-wgl)
+ADD_TARGET_DEPS(pixbgstrip dm_plugins)
BRLCAD_ADDEXEC(pixblend pixblend.c libbu)
BRLCAD_ADDEXEC(pixborder pixborder.c "libdm;libbn;libbu;${M_LIBRARY}")
-ADD_TARGET_DEPS(pixborder dm-ogl dm-wgl)
+ADD_TARGET_DEPS(pixborder dm_plugins)
BRLCAD_ADDEXEC(pixbustup pixbustup.c libbu)
BRLCAD_ADDEXEC(pixclump pixclump.c "libbn;libbu")
BRLCAD_ADDEXEC(pixcolors pixcolors.c libbu)
@@ -111,17 +111,17 @@
BRLCAD_ADDEXEC(pixfade pixfade.c "libicv;libbu")
BRLCAD_ADDEXEC(pixfilter pixfilter.c libbu)
BRLCAD_ADDEXEC(pixhalve pixhalve.c "libdm;libbu")
-ADD_TARGET_DEPS(pixhalve dm-ogl dm-wgl)
+ADD_TARGET_DEPS(pixhalve dm_plugins)
BRLCAD_ADDEXEC(pixhist pixhist.c "libdm;libbu")
-ADD_TARGET_DEPS(pixhist dm-ogl dm-wgl)
+ADD_TARGET_DEPS(pixhist dm_plugins)
BRLCAD_ADDEXEC(pixhist3d pixhist3d.c "libdm;libbu")
-ADD_TARGET_DEPS(pixhist3d dm-ogl dm-wgl)
+ADD_TARGET_DEPS(pixhist3d dm_plugins)
BRLCAD_ADDEXEC(pixhist3d-plot3 pixhist3d-plot3.c "libbn;libbu")
BRLCAD_ADDEXEC(pixinterp2x pixinterp2x.c libbu)
BRLCAD_ADDEXEC(pixmatte pixmatte.c libbu)
BRLCAD_ADDEXEC(pixmerge pixmerge.c libbu)
BRLCAD_ADDEXEC(pixmorph pixmorph.c "libdm;libbu;${M_LIBRARY}")
-ADD_TARGET_DEPS(pixmorph dm-ogl dm-wgl)
+ADD_TARGET_DEPS(pixmorph dm_plugins)
BRLCAD_ADDEXEC(pixrect pixrect.c "libbu;libicv")
BRLCAD_ADDEXEC(pixrot pixrot.c libbu)
BRLCAD_ADDEXEC(pixsaturate pixsaturate.c libbu)
@@ -151,7 +151,7 @@
CMAKEFILES(ttcp.c)
endif(NOT WIN32)
BRLCAD_ADDEXEC(wavelet wavelet.c "libdm;libbn;libbu")
-ADD_TARGET_DEPS(wavelet dm-ogl dm-wgl)
+ADD_TARGET_DEPS(wavelet dm_plugins)
install(PROGRAMS morphedit.tcl DESTINATION bin)
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
