Revision: 77777
          http://sourceforge.net/p/brlcad/code/77777
Author:   starseeker
Date:     2020-11-21 00:13:12 +0000 (Sat, 21 Nov 2020)
Log Message:
-----------
Update the gcv plugin setup to match the libdm/libged approach.

Modified Paths:
--------------
    brlcad/trunk/src/adrt/CMakeLists.txt
    brlcad/trunk/src/conv/3dm/CMakeLists.txt
    brlcad/trunk/src/conv/CMakeLists.txt
    brlcad/trunk/src/conv/gcv/CMakeLists.txt
    brlcad/trunk/src/conv/raw/CMakeLists.txt
    brlcad/trunk/src/libgcv/CMakeLists.txt
    brlcad/trunk/src/libgcv/gcv.c
    brlcad/trunk/src/libgcv/plugins/CMakeLists.txt
    brlcad/trunk/src/libgcv/plugins/asc/CMakeLists.txt
    brlcad/trunk/src/libgcv/plugins/decimate/CMakeLists.txt
    brlcad/trunk/src/libgcv/plugins/fastgen4/CMakeLists.txt
    brlcad/trunk/src/libgcv/plugins/gdal/CMakeLists.txt
    brlcad/trunk/src/libgcv/plugins/obj/CMakeLists.txt
    brlcad/trunk/src/libgcv/plugins/rhino/CMakeLists.txt
    brlcad/trunk/src/libgcv/plugins/stl/CMakeLists.txt
    brlcad/trunk/src/libgcv/plugins/vol/CMakeLists.txt
    brlcad/trunk/src/libgcv/plugins/vrml/CMakeLists.txt

Modified: brlcad/trunk/src/adrt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/adrt/CMakeLists.txt        2020-11-21 00:11:46 UTC (rev 
77776)
+++ brlcad/trunk/src/adrt/CMakeLists.txt        2020-11-21 00:13:12 UTC (rev 
77777)
@@ -42,7 +42,7 @@
   )
 BRLCAD_ADDLIB(librender "${LIBRENDER_SRCS}" "libgcv")
 set_target_properties(librender PROPERTIES VERSION 20.0.1 SOVERSION 20)
-add_dependencies(librender libgcv_plugins)
+add_dependencies(librender gcv_plugins)
 
 set(tie_HDRS
   adrt.h

Modified: brlcad/trunk/src/conv/3dm/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/3dm/CMakeLists.txt    2020-11-21 00:11:46 UTC (rev 
77776)
+++ brlcad/trunk/src/conv/3dm/CMakeLists.txt    2020-11-21 00:13:12 UTC (rev 
77777)
@@ -4,7 +4,7 @@
 BRLCAD_INCLUDE_DIRS(3DM_INCLUDE_DIRS)
 
 BRLCAD_ADDEXEC(3dm-g 3dm-g.c "libgcv")
-add_dependencies(3dm-g libgcv_plugins)
+add_dependencies(3dm-g gcv_plugins)
 
 CMAKEFILES(CMakeLists.txt)
 

Modified: brlcad/trunk/src/conv/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/CMakeLists.txt        2020-11-21 00:11:46 UTC (rev 
77776)
+++ brlcad/trunk/src/conv/CMakeLists.txt        2020-11-21 00:13:12 UTC (rev 
77777)
@@ -61,10 +61,10 @@
 BRLCAD_ADDEXEC(g-dot g-dot.c "libged;libbu")
 
 BRLCAD_ADDEXEC(g-dxf dxf/g-dxf.c "librt;libgcv;libnmg;libbu")
-add_dependencies(g-dxf libgcv_plugins)
+add_dependencies(g-dxf gcv_plugins)
 
 BRLCAD_ADDEXEC(g-egg g-egg.c "libwdb;libgcv;libnmg")
-add_dependencies(g-egg libgcv_plugins)
+add_dependencies(g-egg gcv_plugins)
 
 BRLCAD_ADDEXEC(g-nff g-nff.c "libwdb;libnmg;${M_LIBRARY}")
 
@@ -81,7 +81,7 @@
 BRLCAD_ADDEXEC(stl-g stl/stl-g.c "libwdb;librt;libbu;${WINSOCK_LIB}")
 
 BRLCAD_ADDEXEC(g-stl stl/g-stl.c "librt;libgcv;libnmg;libbu;${WINSOCK_LIB}")
-add_dependencies(g-stl libgcv_plugins)
+add_dependencies(g-stl gcv_plugins)
 
 BRLCAD_ADDEXEC(g4-g5 g4-g5.c "librt;libbu" NO_INSTALL)
 

Modified: brlcad/trunk/src/conv/gcv/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/gcv/CMakeLists.txt    2020-11-21 00:11:46 UTC (rev 
77776)
+++ brlcad/trunk/src/conv/gcv/CMakeLists.txt    2020-11-21 00:13:12 UTC (rev 
77777)
@@ -7,7 +7,7 @@
 
 
 BRLCAD_ADDEXEC(gcv gcv.c "libgcv;libbn;libbu;${M_LIBRARY}")
-add_dependencies(gcv libgcv_plugins)
+add_dependencies(gcv gcv_plugins)
 
 CMAKEFILES(gcv.sh)
 CMAKEFILES(CMakeLists.txt)

Modified: brlcad/trunk/src/conv/raw/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/raw/CMakeLists.txt    2020-11-21 00:11:46 UTC (rev 
77776)
+++ brlcad/trunk/src/conv/raw/CMakeLists.txt    2020-11-21 00:13:12 UTC (rev 
77777)
@@ -14,7 +14,7 @@
 BRLCAD_ADDEXEC(raw-g "${rawg_SRCS}" "libwdb;librt;libbu" NO_STRICT)
 
 BRLCAD_ADDEXEC(g-raw g-raw.c "librt;libgcv;libnmg;libbu;${WINSOCK_LIB}")
-add_dependencies(g-raw libgcv_plugins)
+add_dependencies(g-raw gcv_plugins)
 
 set(RAW_IGNORE_FILES
   Bot.h

Modified: brlcad/trunk/src/libgcv/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/CMakeLists.txt      2020-11-21 00:11:46 UTC (rev 
77776)
+++ brlcad/trunk/src/libgcv/CMakeLists.txt      2020-11-21 00:13:12 UTC (rev 
77777)
@@ -14,7 +14,7 @@
 else(MSVC)
   set(LIBGCV_PLUGINS_PATH "${LIB_DIR}")
 endif(MSVC)
-set(LIBGCV_PLUGINS_DIRECTORY "libgcv_plugins")
+set(LIBGCV_PLUGINS_DIRECTORY "gcv")
 add_subdirectory(plugins)
 
 set(LIBGCV_SOURCES

Modified: brlcad/trunk/src/libgcv/gcv.c
===================================================================
--- brlcad/trunk/src/libgcv/gcv.c       2020-11-21 00:11:46 UTC (rev 77776)
+++ brlcad/trunk/src/libgcv/gcv.c       2020-11-21 00:13:12 UTC (rev 77777)
@@ -347,23 +347,8 @@
 HIDDEN const char *
 _gcv_plugins_get_path(void)
 {
-    const char *brlcad_libs_path;
-    struct bu_vls buffer;
-    const char *result;
-
-    /* LIBGCV_PLUGINS_PATH is where the plugin dir resides, defined via 
cppflag */
-    brlcad_libs_path = bu_brlcad_dir(LIBGCV_PLUGINS_PATH, 0);
-
-    if (!brlcad_libs_path)
-       return NULL;
-
-    bu_vls_init(&buffer);
-    /* LIBGCV_PLUGINS_DIRECTORY is the name of the plugin dir, defined via 
cppflag */
-    bu_vls_sprintf(&buffer, "%s%c%s", brlcad_libs_path, BU_DIR_SEPARATOR,
-                  LIBGCV_PLUGINS_DIRECTORY);
-    result = bu_brlcad_root(bu_vls_addr(&buffer), 0);
-    bu_vls_free(&buffer);
-
+    const char *pdir = bu_dir(NULL, 0, BU_DIR_LIBEXEC, 
LIBGCV_PLUGINS_DIRECTORY, NULL);
+    const char *result = bu_strdup(pdir);
     return result;
 }
 

Modified: brlcad/trunk/src/libgcv/plugins/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/plugins/CMakeLists.txt      2020-11-21 00:11:46 UTC 
(rev 77776)
+++ brlcad/trunk/src/libgcv/plugins/CMakeLists.txt      2020-11-21 00:13:12 UTC 
(rev 77777)
@@ -1,56 +1,37 @@
-add_custom_target(libgcv_plugins)
-set_target_properties(libgcv_plugins PROPERTIES FOLDER "BRL-CAD Shared 
Libraries")
+add_custom_command(
+  OUTPUT "${CMAKE_BINARY_DIR}/gcv_plugins.sentinel"
+  COMMAND ${CMAKE_COMMAND} -E touch "${CMAKE_BINARY_DIR}/gcv_plugins.sentinel"
+  )
+add_custom_target(gcv_plugins_sentinel
+  DEPENDS ${CMAKE_BINARY_DIR}/gcv_plugins.sentinel
+  )
+set_target_properties(gcv_plugins_sentinel PROPERTIES FOLDER "BRL-CAD 
Plugins/gcv")
 
+function(gcv_plugin_library name)
+  add_library(${name} ${ARGN})
+  add_dependencies(gcv_plugins_sentinel ${name})
+endfunction(gcv_plugin_library name)
 
-function(LIBGCV_ADD_PLUGIN plugin_name sources libs)
-  set(target_name libgcv_${plugin_name})
-  BRLCAD_ADDLIB(${target_name} "${sources}" "libgcv;${libs}" SHARED NO_INSTALL 
FOLDER "LibGCV Plugins")
-  target_include_directories(${target_name} PRIVATE "${GCV_INCLUDE_DIRS}")
+# This target is supplied so applications wanting to run gcv commands at build
+# time can depend on the plugins being built as well as libgcv itself 
(otherwise
+# gcv commands might fail due to their plugins not yet having been built.)
+add_custom_target(gcv_plugins ALL DEPENDS gcv_plugins_sentinel)
+set_target_properties(gcv_plugins PROPERTIES FOLDER "BRL-CAD Plugins")
 
-  set(DIR_TYPES LIBRARY RUNTIME ARCHIVE)
-  if(NOT CMAKE_CONFIGURATION_TYPES)
-    foreach(DIR_TYPE ${DIR_TYPES})
-      get_property(current_output_dir TARGET ${target_name} PROPERTY 
${DIR_TYPE}_OUTPUT_DIRECTORY)
-      set_property(TARGET ${target_name} PROPERTY ${DIR_TYPE}_OUTPUT_DIRECTORY 
"${current_output_dir}/${LIBGCV_PLUGINS_DIRECTORY}")
-    endforeach(DIR_TYPE ${DIR_TYPES})
-  else(NOT CMAKE_CONFIGURATION_TYPES)
-    set(CFG_ROOT ${${PROJECT_NAME}_BINARY_DIR})
-    foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
-      if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
-       set(CFG_ROOT ${${PROJECT_NAME}_BINARY_DIR}/${CFG_TYPE})
-      endif(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
-      string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
-      foreach(DIR_TYPE ${DIR_TYPES})
-       get_property(current_output_dir TARGET ${target_name} PROPERTY 
${DIR_TYPE}_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
-       set_property(TARGET ${target_name} PROPERTY 
${DIR_TYPE}_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER} 
"${current_output_dir}/${LIBGCV_PLUGINS_DIRECTORY}")
-      endforeach(DIR_TYPE ${DIR_TYPES})
-    endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
-  endif(NOT CMAKE_CONFIGURATION_TYPES)
+add_subdirectory(asc)
+add_subdirectory(decimate)
+add_subdirectory(fastgen4)
+add_subdirectory(gdal)
+add_subdirectory(obj)
+add_subdirectory(rhino)
+add_subdirectory(stl)
+add_subdirectory(vol)
+add_subdirectory(vrml)
 
-  install(TARGETS ${target_name}
-    RUNTIME DESTINATION ${BIN_DIR}/${LIBGCV_PLUGINS_DIRECTORY}
-    LIBRARY DESTINATION ${LIB_DIR}/${LIBGCV_PLUGINS_DIRECTORY}
-    ARCHIVE DESTINATION ${LIB_DIR}/${LIBGCV_PLUGINS_DIRECTORY}
-    )
+CMAKEFILES(
+  CMakeLists.txt
+  )
 
-  add_dependencies(libgcv_plugins ${target_name})
-endfunction(LIBGCV_ADD_PLUGIN plugin_name sources libs)
-
-
-function(GET_LIBGCV_PLUGINS)
-  file(GLOB cmakelist_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
*/CMakeLists.txt)
-
-  foreach(file ${cmakelist_files})
-    get_filename_component(plugin_directory "${file}" PATH)
-    add_subdirectory(${plugin_directory})
-  endforeach(file ${cmakelist_files})
-endfunction(GET_LIBGCV_PLUGINS)
-
-
-GET_LIBGCV_PLUGINS()
-
-CMAKEFILES(CMakeLists.txt)
-
 # Local Variables:
 # tab-width: 8
 # mode: cmake

Modified: brlcad/trunk/src/libgcv/plugins/asc/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/plugins/asc/CMakeLists.txt  2020-11-21 00:11:46 UTC 
(rev 77776)
+++ brlcad/trunk/src/libgcv/plugins/asc/CMakeLists.txt  2020-11-21 00:13:12 UTC 
(rev 77777)
@@ -1,12 +1,20 @@
-LIBGCV_ADD_PLUGIN(asc "asc.cpp;asc_v4.cpp;asc_v5.cpp" "librt;libbu")
-
-CMAKEFILES(
+set(ASC_SRCS
   asc.cpp
   asc_v4.cpp
   asc_v5.cpp
   )
-CMAKEFILES(CMakeLists.txt)
 
+gcv_plugin_library(gcv-asc SHARED ${ASC_SRCS})
+target_link_libraries(gcv-asc librt libbu)
+set_property(TARGET gcv-asc APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD 
HAVE_CONFIG_H)
+VALIDATE_STYLE(gcv-asc "${ASC_SRCS}")
+PLUGIN_SETUP(gcv-asc gcv)
+
+CMAKEFILES(
+  ${ASC_SRCS}
+  CMakeLists.txt
+  )
+
 # Local Variables:
 # tab-width: 8
 # mode: cmake

Modified: brlcad/trunk/src/libgcv/plugins/decimate/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/plugins/decimate/CMakeLists.txt     2020-11-21 
00:11:46 UTC (rev 77776)
+++ brlcad/trunk/src/libgcv/plugins/decimate/CMakeLists.txt     2020-11-21 
00:13:12 UTC (rev 77777)
@@ -1,2 +1,22 @@
-LIBGCV_ADD_PLUGIN(decimate "decimate.c" "librt")
-CMAKEFILES(CMakeLists.txt)
+set(DECIMATE_SRCS
+  decimate.c
+  )
+
+gcv_plugin_library(gcv-decimate SHARED ${DECIMATE_SRCS})
+target_link_libraries(gcv-decimate librt)
+set_property(TARGET gcv-decimate APPEND PROPERTY COMPILE_DEFINITIONS 
BRLCADBUILD HAVE_CONFIG_H)
+VALIDATE_STYLE(gcv-decimate "${DECIMATE_SRCS}")
+PLUGIN_SETUP(gcv-decimate gcv)
+
+CMAKEFILES(
+  ${DECIMATE_SRCS}
+  CMakeLists.txt
+  )
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+

Modified: brlcad/trunk/src/libgcv/plugins/fastgen4/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/plugins/fastgen4/CMakeLists.txt     2020-11-21 
00:11:46 UTC (rev 77776)
+++ brlcad/trunk/src/libgcv/plugins/fastgen4/CMakeLists.txt     2020-11-21 
00:13:12 UTC (rev 77777)
@@ -1,4 +1,24 @@
-LIBGCV_ADD_PLUGIN(fastgen4 "fastgen4_read.c;fastgen4_write.cpp" "librt;libbu")
+set(FASTGEN4_SRCS
+  fastgen4_read.c
+  fastgen4_write.cpp
+  )
 
-CMAKEFILES(NOTES)
-CMAKEFILES(CMakeLists.txt)
+gcv_plugin_library(gcv-fastgen4 SHARED ${FASTGEN4_SRCS})
+target_link_libraries(gcv-fastgen4 librt libbu)
+set_property(TARGET gcv-fastgen4 APPEND PROPERTY COMPILE_DEFINITIONS 
BRLCADBUILD HAVE_CONFIG_H)
+VALIDATE_STYLE(gcv-fastgen4 "${FASTGEN4_SRCS}")
+PLUGIN_SETUP(gcv-fastgen4 gcv)
+
+CMAKEFILES(
+  ${FASTGEN4_SRCS}
+  CMakeLists.txt
+  NOTES
+  )
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+

Modified: brlcad/trunk/src/libgcv/plugins/gdal/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/plugins/gdal/CMakeLists.txt 2020-11-21 00:11:46 UTC 
(rev 77776)
+++ brlcad/trunk/src/libgcv/plugins/gdal/CMakeLists.txt 2020-11-21 00:13:12 UTC 
(rev 77777)
@@ -1,10 +1,24 @@
+set(GDAL_SRCS
+  gdal.cpp
+  gdal_ll.cpp
+  )
+
 if(GDAL_LIBRARY AND GDAL_INCLUDE_DIR)
+
   include_directories(SYSTEM ${GDAL_INCLUDE_DIR})
-  LIBGCV_ADD_PLUGIN(gdal "gdal.cpp;gdal_ll.cpp" "librt;libbu;${GDAL_LIBRARY}")
+
+  gcv_plugin_library(gcv-gdal SHARED ${GDAL_SRCS})
+  target_link_libraries(gcv-gdal librt libbu ${GDAL_LIBRARY})
+  set_property(TARGET gcv-gdal APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD 
HAVE_CONFIG_H)
+  VALIDATE_STYLE(gcv-gdal "${GDAL_SRCS}")
+  PLUGIN_SETUP(gcv-gdal gcv)
+
 endif(GDAL_LIBRARY AND GDAL_INCLUDE_DIR)
 
-CMAKEFILES(gdal.cpp)
-CMAKEFILES(CMakeLists.txt)
+CMAKEFILES(
+  ${GDAL_SRCS}
+  CMakeLists.txt
+  )
 
 # Local Variables:
 # tab-width: 8

Modified: brlcad/trunk/src/libgcv/plugins/obj/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/plugins/obj/CMakeLists.txt  2020-11-21 00:11:46 UTC 
(rev 77776)
+++ brlcad/trunk/src/libgcv/plugins/obj/CMakeLists.txt  2020-11-21 00:13:12 UTC 
(rev 77777)
@@ -12,13 +12,21 @@
   ${CMAKE_CURRENT_BINARY_DIR}/wfobj
   )
 
-LIBGCV_ADD_PLUGIN(obj "obj_read.c;obj_write.c;tri_face.c" "librt;libwfobj")
+set(OBJ_SRCS
+  obj_read.c
+  obj_write.c
+  tri_face.c
+  )
 
+gcv_plugin_library(gcv-obj SHARED ${OBJ_SRCS})
+target_link_libraries(gcv-obj librt libwfobj)
+set_property(TARGET gcv-obj APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD 
HAVE_CONFIG_H)
+VALIDATE_STYLE(gcv-obj "${OBJ_SRCS}")
+PLUGIN_SETUP(gcv-obj gcv)
+
 set(obj_ignore_files
   CMakeLists.txt
-  obj_read.c
-  obj_write.c
-  tri_face.c
+  ${OBJ_SRCS}
   tri_face.h
   wfobj/CMake/FindLEMON.cmake
   wfobj/CMake/FindPERPLEX.cmake

Modified: brlcad/trunk/src/libgcv/plugins/rhino/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/plugins/rhino/CMakeLists.txt        2020-11-21 
00:11:46 UTC (rev 77776)
+++ brlcad/trunk/src/libgcv/plugins/rhino/CMakeLists.txt        2020-11-21 
00:13:12 UTC (rev 77777)
@@ -1,2 +1,22 @@
-LIBGCV_ADD_PLUGIN(rhino "rhino_read.cpp" 
"librt;libwdb;libbg;${OPENNURBS_LIBRARIES}")
-CMAKEFILES(CMakeLists.txt)
+set(RHINO_SRCS
+  rhino_read.cpp
+  )
+
+gcv_plugin_library(gcv-rhino SHARED ${RHINO_SRCS})
+target_link_libraries(gcv-rhino librt libwdb libbg ${OPENNURBS_LIBRARIES})
+set_property(TARGET gcv-rhino APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD 
HAVE_CONFIG_H)
+VALIDATE_STYLE(gcv-rhino "${RHINO_SRCS}")
+PLUGIN_SETUP(gcv-rhino gcv)
+
+CMAKEFILES(
+  ${RHINO_SRCS}
+  CMakeLists.txt
+  )
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+

Modified: brlcad/trunk/src/libgcv/plugins/stl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/plugins/stl/CMakeLists.txt  2020-11-21 00:11:46 UTC 
(rev 77776)
+++ brlcad/trunk/src/libgcv/plugins/stl/CMakeLists.txt  2020-11-21 00:13:12 UTC 
(rev 77777)
@@ -1,2 +1,23 @@
-LIBGCV_ADD_PLUGIN(stl "stl_read.c;stl_write.c" "librt")
-CMAKEFILES(CMakeLists.txt)
+set(STL_SRCS
+  stl_read.c
+  stl_write.c
+  )
+
+gcv_plugin_library(gcv-stl SHARED ${STL_SRCS})
+target_link_libraries(gcv-stl librt)
+set_property(TARGET gcv-stl APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD 
HAVE_CONFIG_H)
+VALIDATE_STYLE(gcv-stl "${STL_SRCS}")
+PLUGIN_SETUP(gcv-stl gcv)
+
+CMAKEFILES(
+  ${STL_SRCS}
+  CMakeLists.txt
+  )
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+

Modified: brlcad/trunk/src/libgcv/plugins/vol/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/plugins/vol/CMakeLists.txt  2020-11-21 00:11:46 UTC 
(rev 77776)
+++ brlcad/trunk/src/libgcv/plugins/vol/CMakeLists.txt  2020-11-21 00:13:12 UTC 
(rev 77777)
@@ -1,5 +1,22 @@
-LIBGCV_ADD_PLUGIN(vol "png_read.c" "librt;libbu")
+set(VOL_SRCS
+  png_read.c
+  )
 
+gcv_plugin_library(gcv-vol SHARED ${VOL_SRCS})
+target_link_libraries(gcv-vol librt libbu)
+set_property(TARGET gcv-vol APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD 
HAVE_CONFIG_H)
+VALIDATE_STYLE(gcv-vol "${VOL_SRCS}")
+PLUGIN_SETUP(gcv-vol gcv)
+
 CMAKEFILES(
-       CMakeLists.txt
-       )
+  ${VOL_SRCS}
+  CMakeLists.txt
+  )
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+

Modified: brlcad/trunk/src/libgcv/plugins/vrml/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libgcv/plugins/vrml/CMakeLists.txt 2020-11-21 00:11:46 UTC 
(rev 77776)
+++ brlcad/trunk/src/libgcv/plugins/vrml/CMakeLists.txt 2020-11-21 00:13:12 UTC 
(rev 77777)
@@ -1,4 +1,4 @@
-set(LIBGCV_VRML_SOURCES
+set(VRML_SRCS
   vrml_read/file_util.cpp
   vrml_read/node.cpp
   vrml_read/node_type.cpp
@@ -9,11 +9,15 @@
   vrml_write.c
   )
 
+gcv_plugin_library(gcv-vrml SHARED ${VRML_SRCS})
+target_link_libraries(gcv-vrml librt libbn libbu)
+set_property(TARGET gcv-vrml APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD 
HAVE_CONFIG_H)
+VALIDATE_STYLE(gcv-vrml "${VRML_SRCS}")
+PLUGIN_SETUP(gcv-vrml gcv)
 
-LIBGCV_ADD_PLUGIN(vrml "${LIBGCV_VRML_SOURCES}" "librt;libbn;libbu")
-
 CMAKEFILES(
   CMakeLists.txt
+  ${VRML_SRCS}
   vrml_read/file_util.h
   vrml_read/node.h
   vrml_read/node_type.h

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

Reply via email to