Revision: 76201
http://sourceforge.net/p/brlcad/code/76201
Author: starseeker
Date: 2020-06-25 17:00:43 +0000 (Thu, 25 Jun 2020)
Log Message:
-----------
Add a BRLCAD_ENABLE_TCL option (defaults to ON) and fix up remaining build
issues with Tcl fully out of the picture. Protect liboptical's sh_tcl.c to
allow liboptical to build without Tcl (should really have liboptical use a
libdm style plugin setup, but this is lower impact for now and liboptical's API
doesn't seem to expose any Tcl bits), conditionalize various other bits of the
build logic that were assuming Tcl as a given, disable a bunch of regression
tests needing Tcl based utilities... Large swaths of the code are of course
turned off (libtclcad, mged, archer, various utilities, etc.) but cmake
-DBRLCAD_ENABLE_TCL=OFF should now work. See if distcheck logic needs updating
- once a full distcheck can pass in this mode, need another distcheck-full
regression test for this configuration.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/bench/CMakeLists.txt
brlcad/trunk/db/CMakeLists.txt
brlcad/trunk/regress/CMakeLists.txt
brlcad/trunk/regress/burst/CMakeLists.txt
brlcad/trunk/regress/gchecker/CMakeLists.txt
brlcad/trunk/regress/mged/CMakeLists.txt
brlcad/trunk/regress/rtwizard/CMakeLists.txt
brlcad/trunk/regress/user/CMakeLists.txt
brlcad/trunk/src/brlman/CMakeLists.txt
brlcad/trunk/src/bwish/CMakeLists.txt
brlcad/trunk/src/conv/CMakeLists.txt
brlcad/trunk/src/conv/asc/CMakeLists.txt
brlcad/trunk/src/external/Unigraphics/CMakeLists.txt
brlcad/trunk/src/libdm/CMakeLists.txt
brlcad/trunk/src/liboptical/CMakeLists.txt
brlcad/trunk/src/libtclcad/CMakeLists.txt
brlcad/trunk/src/mged/CMakeLists.txt
brlcad/trunk/src/other/CMakeLists.txt
brlcad/trunk/src/rtwizard/CMakeLists.txt
brlcad/trunk/src/tclscripts/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev 76200)
+++ brlcad/trunk/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev 76201)
@@ -1327,10 +1327,12 @@
endif(BRLCAD_ENABLE_X11)
mark_as_advanced(OPENGL_USE_AQUA)
-# Enable/disable features requiring the Tk toolkit - usually this should
-# be on, as a lot of functionality in BRL-CAD depends on Tk
-option(BRLCAD_ENABLE_TK "Enable features requiring the Tk toolkit" ON)
-mark_as_advanced(BRLCAD_ENABLE_TK)
+# Enable/disable features requiring the Tcl/Tk toolkit - usually this should
+# be on, as a lot of functionality in BRL-CAD depends on Tcl/Tk
+
+option(BRLCAD_ENABLE_TCL "Enable features requiring the Tcl toolkit" ON)
+cmake_dependent_option(BRLCAD_ENABLE_TK "Enable features requiring the Tk
toolkit" ON "BRLCAD_ENABLE_TCL" OFF)
+mark_as_advanced(BRLCAD_ENABLE_TCL BRLCAD_ENABLE_TK)
if(NOT BRLCAD_ENABLE_X11 AND NOT BRLCAD_ENABLE_AQUA AND NOT WIN32)
set(BRLCAD_ENABLE_TK OFF)
endif(NOT BRLCAD_ENABLE_X11 AND NOT BRLCAD_ENABLE_AQUA AND NOT WIN32)
Modified: brlcad/trunk/bench/CMakeLists.txt
===================================================================
--- brlcad/trunk/bench/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev 76200)
+++ brlcad/trunk/bench/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev 76201)
@@ -36,7 +36,7 @@
viewdiff.sh
)
-if(SH_EXEC)
+if(SH_EXEC AND TARGET m35.g)
# CTest enabled short run of the benchmark suite
add_test(NAME benchmark COMMAND ${SH_EXEC}
"${CMAKE_BINARY_DIR}/bin/benchmark" run TIMEFRAME=1)
set_tests_properties(benchmark PROPERTIES LABELS "Benchmark")
@@ -64,7 +64,7 @@
add_custom_target(benchmark-clobber
${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/benchmark clobber
)
-endif(SH_EXEC)
+endif(SH_EXEC AND TARGET m35.g)
# Local Variables:
# tab-width: 8
Modified: brlcad/trunk/db/CMakeLists.txt
===================================================================
--- brlcad/trunk/db/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev 76200)
+++ brlcad/trunk/db/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev 76201)
@@ -70,11 +70,13 @@
# The rest of the conversions follow the simpler/older pattern:
if(${MODEL_TYPE} STREQUAL "asc")
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BUILD_DIR_SCRIPT}/${output_file}
- COMMAND asc2g "${CMAKE_CURRENT_SOURCE_DIR}/${in_model}"
${CMAKE_CURRENT_BUILD_DIR_SCRIPT}/${output_file}
- DEPENDS asc2g "${CMAKE_CURRENT_SOURCE_DIR}/${in_model}"
- )
+ if (BRLCAD_ENABLE_TCL)
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BUILD_DIR_SCRIPT}/${output_file}
+ COMMAND asc2g "${CMAKE_CURRENT_SOURCE_DIR}/${in_model}"
${CMAKE_CURRENT_BUILD_DIR_SCRIPT}/${output_file}
+ DEPENDS asc2g "${CMAKE_CURRENT_SOURCE_DIR}/${in_model}"
+ )
+ endif (BRLCAD_ENABLE_TCL)
endif(${MODEL_TYPE} STREQUAL "asc")
if(${MODEL_TYPE} STREQUAL "comgeom")
@@ -102,17 +104,19 @@
)
endif(${MODEL_TYPE} STREQUAL "stp")
- add_custom_target(${in_model_root}.g ALL DEPENDS
${CMAKE_CURRENT_BUILD_DIR_SCRIPT}/${output_file})
- set_target_properties(${in_model_root}.g PROPERTIES FOLDER "${folder}")
+ if(NOT ${MODEL_TYPE} STREQUAL "asc" OR BRLCAD_ENABLE_TCL)
+ add_custom_target(${in_model_root}.g ALL DEPENDS
${CMAKE_CURRENT_BUILD_DIR_SCRIPT}/${output_file})
+ set_target_properties(${in_model_root}.g PROPERTIES FOLDER "${folder}")
- # Install logic
- if(BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
- install(FILES ${CMAKE_CURRENT_BUILD_DIR_INSTALL}/${output_file}
DESTINATION ${DATA_DIR}/${rel_dir})
- endif(BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
+ # Install logic
+ if(BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
+ install(FILES ${CMAKE_CURRENT_BUILD_DIR_INSTALL}/${output_file}
DESTINATION ${DATA_DIR}/${rel_dir})
+ endif(BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
- # Clean-up
- set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
"${log_file}")
- DISTCLEAN("${log_file}")
+ # Clean-up
+ set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
"${log_file}")
+ DISTCLEAN("${log_file}")
+ endif(NOT ${MODEL_TYPE} STREQUAL "asc" OR BRLCAD_ENABLE_TCL)
endfunction(ADD_G_TARGET in_model folder)
@@ -179,34 +183,36 @@
set(conversion_g_files_fp)
set(conversion_deps_list)
- macro(Sh_Conversion_Test gfile depends_list)
- add_custom_target(convert-${gfile} COMMAND ${SH_EXEC}
${CMAKE_SOURCE_DIR}/sh/conversion.sh GED=$<TARGET_FILE:mged>
${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${gfile})
- set_target_properties(convert-${gfile} PROPERTIES
EXCLUDE_FROM_DEFAULT_BUILD 1)
- set_target_properties(convert-${gfile} PROPERTIES FOLDER "BRL-CAD
Conversion Tests")
- set(conversion_g_files ${conversion_g_files} ${gfile})
- if(NOT "${depends_list}" STREQUAL "")
- add_dependencies(convert-${gfile} ${depends_list})
- set(conversion_deps_list ${conversion_deps_list} ${depends_list})
- endif(NOT "${depends_list}" STREQUAL "")
- endmacro(Sh_Conversion_Test)
+ if (BRLCAD_ENABLE_TCL)
+ macro(Sh_Conversion_Test gfile depends_list)
+ add_custom_target(convert-${gfile} COMMAND ${SH_EXEC}
${CMAKE_SOURCE_DIR}/sh/conversion.sh GED=$<TARGET_FILE:mged>
${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${gfile})
+ set_target_properties(convert-${gfile} PROPERTIES
EXCLUDE_FROM_DEFAULT_BUILD 1)
+ set_target_properties(convert-${gfile} PROPERTIES FOLDER "BRL-CAD
Conversion Tests")
+ set(conversion_g_files ${conversion_g_files} ${gfile})
+ if(NOT "${depends_list}" STREQUAL "")
+ add_dependencies(convert-${gfile} ${depends_list})
+ set(conversion_deps_list ${conversion_deps_list} ${depends_list})
+ endif(NOT "${depends_list}" STREQUAL "")
+ endmacro(Sh_Conversion_Test)
- foreach(g_input ${G_BENCHMARK_MODELS})
- get_filename_component(GROOT "${g_input}" NAME_WE)
- Sh_Conversion_Test(${GROOT}.g "mged")
- endforeach(g_input ${G_BENCHMARK_MODELS})
- foreach(g_input ${G_SAMPLE_MODELS})
- get_filename_component(GROOT "${g_input}" NAME_WE)
- Sh_Conversion_Test(${GROOT}.g "mged")
- endforeach(g_input ${G_SAMPLE_MODELS})
+ foreach(g_input ${G_BENCHMARK_MODELS})
+ get_filename_component(GROOT "${g_input}" NAME_WE)
+ Sh_Conversion_Test(${GROOT}.g "mged")
+ endforeach(g_input ${G_BENCHMARK_MODELS})
+ foreach(g_input ${G_SAMPLE_MODELS})
+ get_filename_component(GROOT "${g_input}" NAME_WE)
+ Sh_Conversion_Test(${GROOT}.g "mged")
+ endforeach(g_input ${G_SAMPLE_MODELS})
- list(REMOVE_DUPLICATES conversion_deps_list)
- foreach(gfile ${conversion_g_files})
- set(conversion_g_files_fp ${conversion_g_files_fp}
"${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${gfile}")
- endforeach(gfile ${conversion_g_files})
- add_custom_target(convert COMMAND ${SH_EXEC}
${CMAKE_SOURCE_DIR}/sh/conversion.sh GED=$<TARGET_FILE:mged>
${conversion_g_files_fp})
- set_target_properties(convert PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
- set_target_properties(convert PROPERTIES FOLDER "BRL-CAD Conversion Tests")
- add_dependencies(convert ${conversion_deps_list})
+ list(REMOVE_DUPLICATES conversion_deps_list)
+ foreach(gfile ${conversion_g_files})
+ set(conversion_g_files_fp ${conversion_g_files_fp}
"${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${gfile}")
+ endforeach(gfile ${conversion_g_files})
+ add_custom_target(convert COMMAND ${SH_EXEC}
${CMAKE_SOURCE_DIR}/sh/conversion.sh GED=$<TARGET_FILE:mged>
${conversion_g_files_fp})
+ set_target_properties(convert PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
+ set_target_properties(convert PROPERTIES FOLDER "BRL-CAD Conversion Tests")
+ add_dependencies(convert ${conversion_deps_list})
+ endif (BRLCAD_ENABLE_TCL)
endif(SH_EXEC)
CMAKEFILES(
Modified: brlcad/trunk/regress/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev 76200)
+++ brlcad/trunk/regress/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev 76201)
@@ -60,50 +60,52 @@
if(SH_EXEC)
- add_test(NAME regress-moss COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/moss.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-moss "rt;asc2g;pixdiff;pix-png;png-pix"
TEST_DEFINED)
+ if (TARGET mged AND TARGET asc2g)
+ add_test(NAME regress-moss COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/moss.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-moss "rt;asc2g;pixdiff;pix-png;png-pix"
TEST_DEFINED)
- add_test(NAME regress-lights COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/lights.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-lights "rt;asc2g;pixdiff" TEST_DEFINED)
+ add_test(NAME regress-lights COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/lights.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-lights "rt;asc2g;pixdiff" TEST_DEFINED)
- add_test(NAME regress-solids COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/solids.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-solids "rt;mged;pixdiff;asc2pix;gencolor"
TEST_DEFINED)
+ add_test(NAME regress-solids COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/solids.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-solids "rt;mged;pixdiff;asc2pix;gencolor"
TEST_DEFINED)
- add_test(NAME regress-shaders COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/shaders.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-shaders "rt;mged;pixdiff;gencolor"
TEST_DEFINED)
+ add_test(NAME regress-shaders COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/shaders.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-shaders "rt;mged;pixdiff;gencolor"
TEST_DEFINED)
- add_test(NAME regress-spdi COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/spdi.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-spdi "rt;mged;pixdiff" TEST_DEFINED)
+ add_test(NAME regress-spdi COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/spdi.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-spdi "rt;mged;pixdiff" TEST_DEFINED)
- add_test(NAME regress-rtedge COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/rtedge.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-rtedge "rt;rtedge;pixdiff;asc2g" TEST_DEFINED)
+ add_test(NAME regress-rtedge COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/rtedge.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-rtedge "rt;rtedge;pixdiff;asc2g"
TEST_DEFINED)
- add_test(NAME regress-iges COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/iges.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-iges "iges-g;g-iges;mged;asc2g" TEST_DEFINED)
+ add_test(NAME regress-iges COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/iges.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-iges "iges-g;g-iges;mged;asc2g"
TEST_DEFINED)
- add_test(NAME regress-weight COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/weight.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-weight "rtweight;mged" TEST_DEFINED)
+ add_test(NAME regress-weight COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/weight.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-weight "rtweight;mged" TEST_DEFINED)
- add_test(NAME regress-gqa COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/gqa.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-gqa "gqa;mged" TEST_DEFINED)
+ add_test(NAME regress-gqa COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/gqa.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-gqa "gqa;mged" TEST_DEFINED)
- add_test(NAME regress-bots COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/bots.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-bots "mged;pixdiff;rt" TEST_DEFINED)
+ add_test(NAME regress-bots COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/bots.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-bots "mged;pixdiff;rt" TEST_DEFINED)
- add_test(NAME regress-mged COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/mged.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-mged mged TEST_DEFINED)
+ add_test(NAME regress-mged COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/mged.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-mged mged TEST_DEFINED)
- add_test(NAME regress-red COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/red.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-red mged TEST_DEFINED)
+ add_test(NAME regress-red COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/red.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-red mged TEST_DEFINED)
- add_test(NAME regress-nirt COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/nirt.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-nirt "mged;nirt" TEST_DEFINED)
+ add_test(NAME regress-nirt COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/nirt.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-nirt "mged;nirt" TEST_DEFINED)
- add_test(NAME regress-comgeom COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/comgeom.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-comgeom "mged;asc2g;vdeck;comgeom-g"
TEST_DEFINED)
+ add_test(NAME regress-comgeom COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/comgeom.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-comgeom "mged;asc2g;vdeck;comgeom-g"
TEST_DEFINED)
- add_test(NAME regress-dsp COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/dsp.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-dsp "mged;cv;asc2pix;rt;pix-bw" TEST_DEFINED)
+ add_test(NAME regress-dsp COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/dsp.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-dsp "mged;cv;asc2pix;rt;pix-bw"
TEST_DEFINED)
+ endif (TARGET mged AND TARGET asc2g)
add_test(NAME regress-asc2dsp COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/asc2dsp.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-asc2dsp "cv;asc2pix;pix-bw;asc2dsp"
TEST_DEFINED)
Modified: brlcad/trunk/regress/burst/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/burst/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev
76200)
+++ brlcad/trunk/regress/burst/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev
76201)
@@ -6,28 +6,30 @@
ktank_colors.ids
)
-BRLCAD_REGRESSION_TEST(regress-burst "nburst;ktank.g" EXEC burst)
+if (TARGET ktank.g)
+ BRLCAD_REGRESSION_TEST(regress-burst "nburst;ktank.g" EXEC burst)
-set(BURST_CLEAN_FILES
- ktank_burst.plot
- ktank_burst.pix
- ktank.burst
- ktank.g
- ktank_burst.shotlines
- burst_ktank.log
- )
-foreach(BCF ${BURST_CLEAN_FILES})
- DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/${BCF}")
-endforeach(BCF ${BURST_CLEAN_FILES})
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/regress-burst.log")
-
-# If we copied the input files, clear them out as well
-if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
- foreach(BIF ${BURST_INPUT_FILES})
+ set(BURST_CLEAN_FILES
+ ktank_burst.plot
+ ktank_burst.pix
+ ktank.burst
+ ktank.g
+ ktank_burst.shotlines
+ burst_ktank.log
+ )
+ foreach(BCF ${BURST_CLEAN_FILES})
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/${BCF}")
- endforeach(BIF ${BURST_INPUT_FILES})
-endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+ endforeach(BCF ${BURST_CLEAN_FILES})
+ DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/regress-burst.log")
+ # If we copied the input files, clear them out as well
+ if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+ foreach(BIF ${BURST_INPUT_FILES})
+ DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/${BCF}")
+ endforeach(BIF ${BURST_INPUT_FILES})
+ endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL
"${CMAKE_CURRENT_BINARY_DIR}")
+endif (TARGET ktank.g)
+
CMAKEFILES(
CMakeLists.txt
echo.b
Modified: brlcad/trunk/regress/gchecker/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/gchecker/CMakeLists.txt 2020-06-25 15:23:08 UTC
(rev 76200)
+++ brlcad/trunk/regress/gchecker/CMakeLists.txt 2020-06-25 17:00:43 UTC
(rev 76201)
@@ -1,10 +1,12 @@
-set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/regress-gchecker.log")
-set(GCHECKER_CLEAN_FILE
${CMAKE_CURRENT_BINARY_DIR}/gchecker_test.g.ck/ck.gchecker_test.g.overlaps)
+if (BRLCAD_ENABLE_TCL)
+ set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/regress-gchecker.log")
+ set(GCHECKER_CLEAN_FILE
${CMAKE_CURRENT_BINARY_DIR}/gchecker_test.g.ck/ck.gchecker_test.g.overlaps)
-BRLCAD_REGRESSION_TEST(regress-gchecker "gchecker;mged;gqa;rtcheck" EXEC
gchecker)
+ BRLCAD_REGRESSION_TEST(regress-gchecker "gchecker;mged;gqa;rtcheck" EXEC
gchecker)
-DISTCLEAN(${LOG_FILE})
-DISTCLEAN(${GCHECKER_CLEAN_FILE})
+ DISTCLEAN(${LOG_FILE})
+ DISTCLEAN(${GCHECKER_CLEAN_FILE})
+endif (BRLCAD_ENABLE_TCL)
CMAKEFILES(
CMakeLists.txt
Modified: brlcad/trunk/regress/mged/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/mged/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev
76200)
+++ brlcad/trunk/regress/mged/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev
76201)
@@ -81,19 +81,21 @@
set(TSCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/regress-mged.cmake.in")
-foreach(testfile ${MGED_TESTS})
- string(REGEX REPLACE "([0-9a-z_-]*).mged" "\\1" tname "${testfile}")
+if (TARGET mged)
+ foreach(testfile ${MGED_TESTS})
+ string(REGEX REPLACE "([0-9a-z_-]*).mged" "\\1" tname "${testfile}")
- file(READ "${CMAKE_CURRENT_SOURCE_DIR}/${testfile}" TEST_CONTENTS)
- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/regress_${testfile}" "source
${CMAKE_CURRENT_SOURCE_DIR}/regression_resources.tcl\n\n${TEST_CONTENTS}")
- DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/regress_${testfile}")
+ file(READ "${CMAKE_CURRENT_SOURCE_DIR}/${testfile}" TEST_CONTENTS)
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/regress_${testfile}" "source
${CMAKE_CURRENT_SOURCE_DIR}/regression_resources.tcl\n\n${TEST_CONTENTS}")
+ DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/regress_${testfile}")
- set(TARGET_NAME ${tname})
- set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/regress-mged_${TNAME}.log")
+ set(TARGET_NAME ${tname})
+ set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/regress-mged_${TNAME}.log")
- BRLCAD_REGRESSION_TEST(regress-mged_${tname} "mged" TEST_SCRIPT "${TSCRIPT}"
EXEC mged)
- DISTCLEAN("${LOG_FILE}")
-endforeach(testfile ${MGED_TESTS})
+ BRLCAD_REGRESSION_TEST(regress-mged_${tname} "mged" TEST_SCRIPT
"${TSCRIPT}" EXEC mged)
+ DISTCLEAN("${LOG_FILE}")
+ endforeach(testfile ${MGED_TESTS})
+endif (TARGET mged)
CMAKEFILES(
CMakeLists.txt
Modified: brlcad/trunk/regress/rtwizard/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/rtwizard/CMakeLists.txt 2020-06-25 15:23:08 UTC
(rev 76200)
+++ brlcad/trunk/regress/rtwizard/CMakeLists.txt 2020-06-25 17:00:43 UTC
(rev 76201)
@@ -1,5 +1,7 @@
# Tests for image generation via rtwizard
+if (TARGET rtwizard)
+
# Note: we have to set up test dependencies to avoid running multiple rtwizard
# tests at once. Correct solution is to fix the weaknesses of rtwizard that
# prevent its being run in parallel, but that will be a lot of work and until
then we
@@ -112,6 +114,8 @@
set_property(TEST regress-rtwiz_m35_edge_only_color APPEND PROPERTY DEPENDS
regress-rtwiz_m35_edge_only)
add_dependencies(regress-rtwiz_m35_edge_only_color regress-rtwiz_m35_edge_only)
+endif (TARGET rtwizard)
+
CMAKEFILES(
CMakeLists.txt
m35_A_ref.pix
Modified: brlcad/trunk/regress/user/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/user/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev
76200)
+++ brlcad/trunk/regress/user/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev
76201)
@@ -33,9 +33,11 @@
set_target_properties(cad_user PROPERTIES FOLDER "BRL-CAD Regression
Tests/user")
+if (TARGET moss.g)
set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/regress-user.log")
BRLCAD_REGRESSION_TEST(regress-user "cad_user;moss.g" EXEC cad_user)
DISTCLEAN(${LOG_FILE})
+endif (TARGET moss.g)
CMAKEFILES(
CMakeLists.txt
Modified: brlcad/trunk/src/brlman/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/brlman/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev
76200)
+++ brlcad/trunk/src/brlman/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev
76201)
@@ -1,3 +1,4 @@
+if (TARGET libtclcad)
set(BRLMAN_INCLUDE_DIRS
${BU_INCLUDE_DIRS}
${TCLCAD_INCLUDE_DIRS}
@@ -24,8 +25,14 @@
foreach(item ${tclindex_target_list})
add_dependencies(brlman ${item})
endforeach(item ${tclindex_target_list})
-CMAKEFILES(CMakeLists.txt)
+endif (TARGET libtclcad)
+CMAKEFILES(
+ CMakeLists.txt
+ brlman.c
+ brlman.tcl
+ )
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/trunk/src/bwish/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/bwish/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev
76200)
+++ brlcad/trunk/src/bwish/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev
76201)
@@ -1,50 +1,58 @@
-set(BWISH_INCLUDE_DIRS
- ${BU_INCLUDE_DIRS}
- ${TERMIO_INCLUDE_DIRS}
- ${TCLCAD_INCLUDE_DIRS}
- ${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
- )
-list(REMOVE_DUPLICATES BWISH_INCLUDE_DIRS)
-BRLCAD_INCLUDE_DIRS(BWISH_INCLUDE_DIRS)
+if(TARGET libtclcad)
+ set(BWISH_INCLUDE_DIRS
+ ${BU_INCLUDE_DIRS}
+ ${TERMIO_INCLUDE_DIRS}
+ ${TCLCAD_INCLUDE_DIRS}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ )
+ list(REMOVE_DUPLICATES BWISH_INCLUDE_DIRS)
+ BRLCAD_INCLUDE_DIRS(BWISH_INCLUDE_DIRS)
-set(btclsh_libs libtclcad libbu ${TCL_LIBRARY} ${ITCL_LIBRARY})
+ set(btclsh_libs libtclcad libbu ${TCL_LIBRARY} ${ITCL_LIBRARY})
-if(TARGET libtermio)
- set(btclsh_libs ${btclsh_libs} libtermio)
-endif(TARGET libtermio)
+ if(TARGET libtermio)
+ set(btclsh_libs ${btclsh_libs} libtermio)
+ endif(TARGET libtermio)
-# Define the btclsh target
-BRLCAD_ADDEXEC(btclsh "main.c;cmd.c;input.c" "${btclsh_libs}")
+ # Define the btclsh target
+ BRLCAD_ADDEXEC(btclsh "main.c;cmd.c;input.c" "${btclsh_libs}")
-if (TARGET itcl_pkgIndex)
- add_dependencies(btclsh itcl_pkgIndex)
-endif (TARGET itcl_pkgIndex)
+ if (TARGET itcl_pkgIndex)
+ add_dependencies(btclsh itcl_pkgIndex)
+ endif (TARGET itcl_pkgIndex)
-# If we have Tk enabled, we want bwish too
-if(BRLCAD_ENABLE_TK)
+ # If we have Tk enabled, we want bwish too
+ if(BRLCAD_ENABLE_TK)
- set(bwish_libs libtclcad libbu ${TCL_LIBRARY} ${ITCL_LIBRARY} ${TK_LIBRARY}
${ITK_LIBRARY} ${IMM32_LIBRARY} ${COMCTL32_LIBRARY})
+ set(bwish_libs libtclcad libbu ${TCL_LIBRARY} ${ITCL_LIBRARY}
${TK_LIBRARY} ${ITK_LIBRARY} ${IMM32_LIBRARY} ${COMCTL32_LIBRARY})
- if(TARGET libtermio)
- set(bwish_libs ${bwish_libs} libtermio)
- endif(TARGET libtermio)
+ if(TARGET libtermio)
+ set(bwish_libs ${bwish_libs} libtermio)
+ endif(TARGET libtermio)
- BRLCAD_ADDEXEC(bwish "main.c;cmd.c;input.c" "${bwish_libs}" GUI)
- set_property(TARGET bwish APPEND PROPERTY COMPILE_DEFINITIONS "BWISH=1")
- set_target_properties(bwish PROPERTIES FOLDER "BRL-CAD Executables")
+ BRLCAD_ADDEXEC(bwish "main.c;cmd.c;input.c" "${bwish_libs}" GUI)
+ set_property(TARGET bwish APPEND PROPERTY COMPILE_DEFINITIONS "BWISH=1")
+ set_target_properties(bwish PROPERTIES FOLDER "BRL-CAD Executables")
- if (TARGET itcl_pkgIndex)
- add_dependencies(bwish itcl_pkgIndex)
- endif (TARGET itcl_pkgIndex)
- if (TARGET itk_pkgIndex)
- add_dependencies(bwish itk_pkgIndex)
- endif (TARGET itk_pkgIndex)
+ if (TARGET itcl_pkgIndex)
+ add_dependencies(bwish itcl_pkgIndex)
+ endif (TARGET itcl_pkgIndex)
+ if (TARGET itk_pkgIndex)
+ add_dependencies(bwish itk_pkgIndex)
+ endif (TARGET itk_pkgIndex)
-endif(BRLCAD_ENABLE_TK)
-CMAKEFILES(CMakeLists.txt)
+ endif(BRLCAD_ENABLE_TK)
+endif(TARGET libtclcad)
+CMAKEFILES(
+ CMakeLists.txt
+ cmd.c
+ input.c
+ main.c
+ )
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/trunk/src/conv/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev
76200)
+++ brlcad/trunk/src/conv/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev
76201)
@@ -23,7 +23,6 @@
${GCV_INCLUDE_DIRS}
${SYSV_INCLUDE_DIRS}
${WDB_INCLUDE_DIRS}
- ${TCLCAD_INCLUDE_DIRS}
${REGEX_INCLUDE_DIR}
${WFOBJ_INCLUDE_DIRS}
)
@@ -52,7 +51,10 @@
BRLCAD_ADDEXEC(dxf-g dxf/dxf-g.c
"libwdb;librt;libnmg;libbn;libbu;${M_LIBRARY}")
-BRLCAD_ADDEXEC(enf-g enf-g.c "libwdb;${TCL_LIBRARY};${M_LIBRARY}")
+if(BRLCAD_ENABLE_TCL)
+ include_directories(${TCLCAD_INCLUDE_DIRS})
+ BRLCAD_ADDEXEC(enf-g enf-g.c "libwdb;${TCL_LIBRARY};${M_LIBRARY}")
+endif(BRLCAD_ENABLE_TCL)
BRLCAD_ADDEXEC(g-dot g-dot.c "libged;libbu")
Modified: brlcad/trunk/src/conv/asc/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/asc/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev
76200)
+++ brlcad/trunk/src/conv/asc/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev
76201)
@@ -5,29 +5,40 @@
set(ASC_CONV_INCLUDE_DIRS
${BU_INCLUDE_DIRS}
- ${BN_INCLUDE_DIRS}
- ${RT_INCLUDE_DIRS}
- ${GED_INCLUDE_DIRS}
- ${GCV_INCLUDE_DIRS}
- ${SYSV_INCLUDE_DIRS}
- ${WDB_INCLUDE_DIRS}
- ${TCLCAD_INCLUDE_DIRS}
- ${REGEX_INCLUDE_DIR}
)
BRLCAD_INCLUDE_DIRS(ASC_CONV_INCLUDE_DIRS)
BRLCAD_ADDEXEC(asc2dsp asc2dsp.c libbu)
-BRLCAD_ADDEXEC(asc2g asc2g.c
"libtclcad;libged;libwdb;librt;libnmg;libbu;${WINSOCK_LIB};${M_LIBRARY}")
-
BRLCAD_ADDEXEC(asc2pix asc2pix.c libbu)
BRLCAD_ADDEXEC(pix2asc pix2asc.c libbu)
-BRLCAD_ADDEXEC(g2asc g2asc.c "libtclcad;librt;libnmg;libbu;${WINSOCK_LIB}")
+if (TARGET libtclcad)
-CMAKEFILES(CMakeLists.txt)
+ set(ASC_CONV_INCLUDE_DIRS
+ ${BN_INCLUDE_DIRS}
+ ${RT_INCLUDE_DIRS}
+ ${GED_INCLUDE_DIRS}
+ ${GCV_INCLUDE_DIRS}
+ ${SYSV_INCLUDE_DIRS}
+ ${WDB_INCLUDE_DIRS}
+ ${TCLCAD_INCLUDE_DIRS}
+ ${REGEX_INCLUDE_DIR}
+ )
+ BRLCAD_INCLUDE_DIRS(ASC_CONV_INCLUDE_DIRS)
+ BRLCAD_ADDEXEC(asc2g asc2g.c
"libtclcad;libged;libwdb;librt;libnmg;libbu;${WINSOCK_LIB};${M_LIBRARY}")
+ BRLCAD_ADDEXEC(g2asc g2asc.c "libtclcad;librt;libnmg;libbu;${WINSOCK_LIB}")
+
+endif (TARGET libtclcad)
+
+CMAKEFILES(
+ CMakeLists.txt
+ asc2g.c
+ g2asc.c
+ )
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/trunk/src/external/Unigraphics/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/external/Unigraphics/CMakeLists.txt 2020-06-25
15:23:08 UTC (rev 76200)
+++ brlcad/trunk/src/external/Unigraphics/CMakeLists.txt 2020-06-25
17:00:43 UTC (rev 76201)
@@ -7,43 +7,46 @@
else(NOT DEFINED BRLCAD_BUILDTEST_EXTERNALS)
- include_directories(
- "${CMAKE_CURRENT_BINARY_DIR}/../../../include"
- "${CMAKE_CURRENT_SOURCE_DIR}/../../../include"
- "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/other/openNURBS"
- "${ZLIB_INCLUDE_DIRS}"
- "${REGEX_INCLUDE_DIRS}"
- "${TCL_INCLUDE_PATH}"
- )
+ if (BRLCAD_ENABLE_TCL)
- # The build shims aren't so great at mocking the initialization
- # behavior of the real code.
- CHECK_CXX_FLAG("Wno-uninitialized")
- CHECK_CXX_FLAG("Wno-maybe-uninitialized")
+ include_directories(
+ "${CMAKE_CURRENT_BINARY_DIR}/../../../include"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../../../include"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/other/openNURBS"
+ "${ZLIB_INCLUDE_DIRS}"
+ "${REGEX_INCLUDE_DIRS}"
+ )
- set(ug_g_srcs ug-g.c ug_misc.c shim.cpp)
- add_definitions(-DTEST_BUILD)
- add_library(ug-g ${ug_g_srcs})
- target_link_libraries(ug-g librt libwdb libbrep libbg libnmg libbn libbu
${TCL_LIBRARY})
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
- set_target_properties(ug-g PROPERTIES FOLDER "BRL-CAD Executables/Build
Only")
- if(HIDE_INTERNAL_SYMBOLS)
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"BU_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"BN_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"NMG_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"BG_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"BREP_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"RT_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"DB5_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"WDB_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"TIE_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"GDIAM_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"ON_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"TINYCTHREAD_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"LZ4_DLL_IMPORT=1")
- endif(HIDE_INTERNAL_SYMBOLS)
+ # The build shims aren't so great at mocking the initialization
+ # behavior of the real code.
+ CHECK_CXX_FLAG("Wno-uninitialized")
+ CHECK_CXX_FLAG("Wno-maybe-uninitialized")
+ set(ug_g_srcs ug-g.c ug_misc.c shim.cpp)
+ add_definitions(-DTEST_BUILD)
+ add_library(ug-g ${ug_g_srcs})
+ target_link_libraries(ug-g librt libwdb libbrep libbg libnmg libbn libbu)
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
+ set_target_properties(ug-g PROPERTIES FOLDER "BRL-CAD Executables/Build
Only")
+ if(HIDE_INTERNAL_SYMBOLS)
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"BU_DLL_IMPORTS")
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"BN_DLL_IMPORTS")
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"NMG_DLL_IMPORTS")
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"BG_DLL_IMPORTS")
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"BREP_DLL_IMPORTS")
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"RT_DLL_IMPORTS")
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"DB5_DLL_IMPORTS")
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"WDB_DLL_IMPORTS")
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"TIE_DLL_IMPORTS")
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"GDIAM_DLL_IMPORTS")
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_IMPORTS")
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"ON_DLL_IMPORTS")
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"TINYCTHREAD_DLL_IMPORTS")
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"LZ4_DLL_IMPORT=1")
+ endif(HIDE_INTERNAL_SYMBOLS)
+
+ endif (BRLCAD_ENABLE_TCL)
+
# Distcheck file list
CMAKEFILES(${ug_g_srcs} conv.h log.h shim.h ug-g.1 ug_misc.h)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev
76200)
+++ brlcad/trunk/src/libdm/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev
76201)
@@ -15,8 +15,10 @@
BRLCAD_LIB_INCLUDE_DIRS(dm DM_INCLUDE_DIRS DM_LOCAL_INCLUDE_DIRS)
-add_subdirectory(plot)
-add_subdirectory(txt)
+if(BRLCAD_ENABLE_TCL)
+ add_subdirectory(plot)
+ add_subdirectory(txt)
+endif(BRLCAD_ENABLE_TCL)
# We no longer use these in libdm, but MGED hasn't caught up yet...
set(libdm_DEFINES "")
Modified: brlcad/trunk/src/liboptical/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/liboptical/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev
76200)
+++ brlcad/trunk/src/liboptical/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev
76201)
@@ -7,6 +7,9 @@
${RT_INCLUDE_DIRS}
${TCL_INCLUDE_PATH}
)
+if (BRLCAD_ENABLE_TCL)
+ set(OPTICAL_INCLUDE_DIRS ${OPTICAL_INCLUDE_DIRS} ${TCL_INCLUDE_PATH})
+endif (BRLCAD_ENABLE_TCL)
BRLCAD_LIB_INCLUDE_DIRS(optical OPTICAL_INCLUDE_DIRS "")
set(LIBOPTICAL_SOURCES
@@ -36,7 +39,6 @@
sh_spm.c
sh_stack.c
sh_stxt.c
- sh_tcl.c
sh_text.c
sh_toon.c
sh_toyota.c
@@ -49,6 +51,10 @@
wray.c
)
+if(BRLCAD_ENABLE_TCL)
+ set(LIBOPTICAL_SOURCES ${LIBOPTICAL_SOURCES} sh_tcl.c)
+endif(BRLCAD_ENABLE_TCL)
+
if(BRLCAD_ENABLE_OSL)
##########################################
@@ -107,11 +113,19 @@
set(LIBOPTICAL_SOURCES ${LIBOPTICAL_SOURCES} sh_osl.cpp)
# Link liboptical with osl-renderer library
- BRLCAD_ADDLIB(liboptical "${LIBOPTICAL_SOURCES}"
"librt;libbn;libbu;liboslrend;${TCL_LIBRARY}")
+ if (BRLCAD_ENABLE_TCL)
+ BRLCAD_ADDLIB(liboptical "${LIBOPTICAL_SOURCES}"
"librt;libbn;libbu;liboslrend;${TCL_LIBRARY}")
+ else (BRLCAD_ENABLE_TCL)
+ BRLCAD_ADDLIB(liboptical "${LIBOPTICAL_SOURCES}"
"librt;libbn;libbu;liboslrend")
+ endif (BRLCAD_ENABLE_TCL)
else(BRLCAD_ENABLE_OSL)
- BRLCAD_ADDLIB(liboptical "${LIBOPTICAL_SOURCES}"
"librt;libbn;libbu;${TCL_LIBRARY}")
+ if (BRLCAD_ENABLE_TCL)
+ BRLCAD_ADDLIB(liboptical "${LIBOPTICAL_SOURCES}"
"librt;libbn;libbu;${TCL_LIBRARY}")
+ else (BRLCAD_ENABLE_TCL)
+ BRLCAD_ADDLIB(liboptical "${LIBOPTICAL_SOURCES}" "librt;libbn;libbu")
+ endif (BRLCAD_ENABLE_TCL)
endif(BRLCAD_ENABLE_OSL)
Modified: brlcad/trunk/src/libtclcad/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libtclcad/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev
76200)
+++ brlcad/trunk/src/libtclcad/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev
76201)
@@ -1,53 +1,60 @@
-# Include directories needed by libtclcad users
-set(TCLCAD_INCLUDE_DIRS
- ${BRLCAD_BINARY_DIR}/include
- ${BRLCAD_SOURCE_DIR}/include
- ${DM_INCLUDE_DIRS}
- ${NMG_INCLUDE_DIRS}
- ${FB_INCLUDE_DIRS}
- ${GED_INCLUDE_DIRS}
- ${BN_INCLUDE_DIRS}
- ${BU_INCLUDE_DIRS}
- ${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
- )
+if (BRLCAD_ENABLE_TCL)
-# Include directories only needed by the implementation
-set(TCLCAD_LOCAL_INCLUDE_DIRS
- ${PNG_INCLUDE_DIRS}
- )
+ # Include directories needed by libtclcad users
+ set(TCLCAD_INCLUDE_DIRS
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${DM_INCLUDE_DIRS}
+ ${NMG_INCLUDE_DIRS}
+ ${FB_INCLUDE_DIRS}
+ ${GED_INCLUDE_DIRS}
+ ${BN_INCLUDE_DIRS}
+ ${BU_INCLUDE_DIRS}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ )
-BRLCAD_LIB_INCLUDE_DIRS(tclcad TCLCAD_INCLUDE_DIRS TCLCAD_LOCAL_INCLUDE_DIRS)
+ # Include directories only needed by the implementation
+ set(TCLCAD_LOCAL_INCLUDE_DIRS
+ ${PNG_INCLUDE_DIRS}
+ )
-if(BRLCAD_ENABLE_X11)
- set(TCLCAD_XLIBS ${TCLCAD_XLIBS} ${X11_LIBRARIES})
-endif(BRLCAD_ENABLE_X11)
+ BRLCAD_LIB_INCLUDE_DIRS(tclcad TCLCAD_INCLUDE_DIRS TCLCAD_LOCAL_INCLUDE_DIRS)
-set(LIBTCLCAD_SRCS
- libfuncs.c
- tclcad.c
- tclcadAutoPath.c
- tclcad_obj.c
- tclcad_eval.c
- tclcad_init.c
- tkImgFmtPIX.c
- cmdhist_obj.c
- dm_obj.c
- fb_obj.c
- fbserv_obj.c
- dm_tcl.c
+ if(BRLCAD_ENABLE_X11)
+ set(TCLCAD_XLIBS ${TCLCAD_XLIBS} ${X11_LIBRARIES})
+ endif(BRLCAD_ENABLE_X11)
+
+ set(LIBTCLCAD_SRCS
+ libfuncs.c
+ tclcad.c
+ tclcadAutoPath.c
+ tclcad_obj.c
+ tclcad_eval.c
+ tclcad_init.c
+ tkImgFmtPIX.c
+ cmdhist_obj.c
+ dm_obj.c
+ fb_obj.c
+ fbserv_obj.c
+ dm_tcl.c
+ )
+ set_property(SOURCE tclcad_obj.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
+ BRLCAD_ADDLIB(libtclcad "${LIBTCLCAD_SRCS}"
"libged;libdm;libdm;libnmg;libbn;libbu;${TCL_LIBRARY};${TK_LIBRARY};${ITCL_LIBRARY};${ITK_LIBRARY};${TCLCAD_XLIBS}")
+ set_target_properties(libtclcad PROPERTIES VERSION 20.0.1 SOVERSION 20)
+ if (TARGET itcl_pkgIndex)
+ add_dependencies(libtclcad itcl_pkgIndex)
+ endif (TARGET itcl_pkgIndex)
+ if (TARGET itk_pkgIndex)
+ add_dependencies(libtclcad itk_pkgIndex)
+ endif (TARGET itk_pkgIndex)
+
+endif (BRLCAD_ENABLE_TCL)
+
+set(tclcad_ignore_files
+ ${LIBTCLCAD_SRCS}
+ tclcad_private.h
)
-set_property(SOURCE tclcad_obj.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
-BRLCAD_ADDLIB(libtclcad "${LIBTCLCAD_SRCS}"
"libged;libdm;libdm;libnmg;libbn;libbu;${TCL_LIBRARY};${TK_LIBRARY};${ITCL_LIBRARY};${ITK_LIBRARY};${TCLCAD_XLIBS}")
-set_target_properties(libtclcad PROPERTIES VERSION 20.0.1 SOVERSION 20)
-if (TARGET itcl_pkgIndex)
- add_dependencies(libtclcad itcl_pkgIndex)
-endif (TARGET itcl_pkgIndex)
-if (TARGET itk_pkgIndex)
- add_dependencies(libtclcad itk_pkgIndex)
-endif (TARGET itk_pkgIndex)
-
-set(tclcad_ignore_files tclcad_private.h)
CMAKEFILES(${tclcad_ignore_files})
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/mged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/mged/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev
76200)
+++ brlcad/trunk/src/mged/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev
76201)
@@ -1,20 +1,3 @@
-set(MGED_INCLUDE_DIRS
- ${BRLCAD_BINARY_DIR}/include
- ${BRLCAD_SOURCE_DIR}/include
- ${TCLCAD_INCLUDE_DIRS}
- ${GED_INCLUDE_DIRS}
- ${WDB_INCLUDE_DIRS}
- ${DM_INCLUDE_DIRS}
- ${BU_INCLUDE_DIRS}
- ${NMG_INCLUDE_DIRS}
- ${TK_INCLUDE_PATH}
- ${TCL_INCLUDE_PATH}
- ${TERMIO_INCLUDE_DIRS}
- ${CMAKE_CURRENT_SOURCE_DIR}
- )
-
-BRLCAD_INCLUDE_DIRS(MGED_INCLUDE_DIRS)
-
set(MGED_SOURCES
adc.c
arbs.c
@@ -71,14 +54,46 @@
# Ideally we'd build as GUI for Windows to avoid the command window popping up,
# but I'm not sure if that would be a problem for scripting with mged.exe on
# Windows so leave it for now...
-BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "${mged_libs}")
+if (BRLCAD_ENABLE_TCL)
-# mged depends on the creation/installation of all the
-# tclscripts.
-foreach(item ${tclindex_target_list})
- ADD_DEPENDENCIES(mged ${item})
-endforeach(item ${tclindex_target_list})
+ set(MGED_INCLUDE_DIRS
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${TCLCAD_INCLUDE_DIRS}
+ ${GED_INCLUDE_DIRS}
+ ${WDB_INCLUDE_DIRS}
+ ${DM_INCLUDE_DIRS}
+ ${BU_INCLUDE_DIRS}
+ ${NMG_INCLUDE_DIRS}
+ ${TK_INCLUDE_PATH}
+ ${TCL_INCLUDE_PATH}
+ ${TERMIO_INCLUDE_DIRS}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ )
+ BRLCAD_INCLUDE_DIRS(MGED_INCLUDE_DIRS)
+
+ BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "${mged_libs}")
+
+ # mged depends on the creation/installation of all the
+ # tclscripts.
+ foreach(item ${tclindex_target_list})
+ add_dependencies(mged ${item})
+ endforeach(item ${tclindex_target_list})
+
+else (BRLCAD_ENABLE_TCL)
+
+ CMAKEFILES(${MGED_SOURCES})
+
+endif (BRLCAD_ENABLE_TCL)
+
+if (NOT BRLCAD_ENABLE_TCL)
+ set(MGED_INCLUDE_DIRS
+ ${BU_INCLUDE_DIRS}
+ )
+ BRLCAD_INCLUDE_DIRS(MGED_INCLUDE_DIRS)
+endif (NOT BRLCAD_ENABLE_TCL)
+
BRLCAD_ADDEXEC(cad_boundp cad_boundp.c "libbu;${M_LIBRARY}")
BRLCAD_ADDEXEC(cad_parea cad_parea.c libbu)
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev
76200)
+++ brlcad/trunk/src/other/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev
76201)
@@ -326,7 +326,7 @@
version if BRLCAD_BUNDLED_LIBS is also AUTO.
")
-THIRD_PARTY(tcl TCL tcl tcl_DESCRIPTION ALIASES ENABLE_TCL FIND_NAME TCL
REQUIRED_VARS BRLCAD_LEVEL2)
+THIRD_PARTY(tcl TCL tcl tcl_DESCRIPTION ALIASES ENABLE_TCL FIND_NAME TCL
REQUIRED_VARS "BRLCAD_ENABLE_TCL;BRLCAD_LEVEL2")
if(BRLCAD_TCL_BUILD)
@@ -357,8 +357,7 @@
SetTargetFolder(tcl "Third Party Libraries")
SetTargetFolder(tclstub "Third Party Libraries")
-else(BRLCAD_TCL_BUILD)
-
+elseif(BRLCAD_ENABLE_TCL)
# We're using the system Tcl, but need some extra information. FindTCL.cmake
# doesn't give us a stub library location, so we need to go find it
ourselves.
get_filename_component(TCL_LIB_PATH "${TCL_LIBRARY}" DIRECTORY)
@@ -385,7 +384,6 @@
find_path(tcl_inittcl NAMES init.tcl PATHS ${tcl_inittcl_paths})
mark_as_advanced(tcl_inittcl)
CONFIG_H_APPEND(BRLCAD "#define TCL_SYSTEM_INITTCL_PATH
\"${tcl_inittcl}\"\n")
-
endif(BRLCAD_TCL_BUILD)
mark_as_advanced(TCL_COMPILATION_TRACING)
mark_as_advanced(TCL_COMPILE_STATS)
@@ -415,7 +413,7 @@
also depends on BRLCAD_ENABLE_TK being ON.
")
-THIRD_PARTY_TCL_PACKAGE(Tk tk "${TCL_TCLSH}" "tcl"
"BRLCAD_ENABLE_TK;BRLCAD_LEVEL2" "tk" tk_ALIASES tk_DESCRIPTION)
+THIRD_PARTY_TCL_PACKAGE(Tk tk "${TCL_TCLSH}" "tcl"
"BRLCAD_ENABLE_TCL;BRLCAD_ENABLE_TK;BRLCAD_LEVEL2" "tk" tk_ALIASES
tk_DESCRIPTION)
if(BRLCAD_TK_BUILD)
@@ -515,7 +513,7 @@
SYSTEM. If BRLCAD_ITCL is set to BUNDLED, local copy is built even if
a system version is present.
")
-THIRD_PARTY_TCL_PACKAGE(Itcl ${ITCL_DIR} "${TCL_TCLSH}" "tcl" "BRLCAD_LEVEL2"
"" itcl_ALIASES itcl_DESCRIPTION)
+THIRD_PARTY_TCL_PACKAGE(Itcl ${ITCL_DIR} "${TCL_TCLSH}" "tcl"
"BRLCAD_ENABLE_TCL;BRLCAD_LEVEL2" "" itcl_ALIASES itcl_DESCRIPTION)
if(BRLCAD_ITCL_BUILD)
set(ITCL_LIBRARY itcl CACHE STRING "ITCL_LIBRARY" FORCE)
set(ITCL_STUB_LIBRARY itclstub CACHE STRING "ITCL_STUB_LIBRARY" FORCE)
@@ -545,7 +543,7 @@
even if a system version is present. This package will be disabled if
BRLCAD_ENABLE_TK is OFF.
")
-THIRD_PARTY_TCL_PACKAGE(Itk ${ITK_DIR} "${TK_WISH}" "tcl;itcl;tk"
"BRLCAD_ENABLE_TK;BRLCAD_LEVEL3" "" itk_ALIASES itk_DESCRIPTION)
+THIRD_PARTY_TCL_PACKAGE(Itk ${ITK_DIR} "${TK_WISH}" "tcl;itcl;tk"
"BRLCAD_ENABLE_TCL;BRLCAD_ENABLE_TK;BRLCAD_LEVEL3" "" itk_ALIASES
itk_DESCRIPTION)
if(BRLCAD_ITK_BUILD)
SetTargetFolder(itk "Third Party Libraries")
SetTargetFolder(itkstub "Third Party Libraries")
@@ -576,7 +574,7 @@
BRLCAD_ENABLE_TK is OFF.
")
set(IWIDGETS_VER "4.1.1")
-THIRD_PARTY_TCL_PACKAGE(Iwidgets iwidgets "${TK_WISH}" "tcl;tk;itcl;itk"
"BRLCAD_ENABLE_TK;BRLCAD_LEVEL3" "" iwidgets_ALIASES iwidgets_DESCRIPTION)
+THIRD_PARTY_TCL_PACKAGE(Iwidgets iwidgets "${TK_WISH}" "tcl;tk;itcl;itk"
"BRLCAD_ENABLE_TCL;BRLCAD_ENABLE_TK;BRLCAD_LEVEL3" "" iwidgets_ALIASES
iwidgets_DESCRIPTION)
if(BRLCAD_IWIDGETS_BUILD)
set(IWIDGETS_VERSION "${IWIDGETS_VER}" CACHE STRING "IWIDGETS_VERSION" FORCE)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/iwidgets/pkgIndex.tcl")
@@ -598,7 +596,7 @@
a system version is present. This package will be disabled if
BRLCAD_ENABLE_TK is OFF.
")
-THIRD_PARTY_TCL_PACKAGE(Tkhtml tkhtml "${TK_WISH}" "tcl;tk"
"BRLCAD_ENABLE_TK;BRLCAD_LEVEL3" "" tkhtml_ALIASES tkhtml_DESCRIPTION)
+THIRD_PARTY_TCL_PACKAGE(Tkhtml tkhtml "${TK_WISH}" "tcl;tk"
"BRLCAD_ENABLE_TCL;BRLCAD_ENABLE_TK;BRLCAD_LEVEL3" "" tkhtml_ALIASES
tkhtml_DESCRIPTION)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/tkhtml/pkgIndex.tcl")
DISTCLEAN("${CMAKE_BINARY_DIR}/lib/Tkhtml3.0")
SetTargetFolder(Tkhtml "Third Party Libraries")
@@ -614,7 +612,7 @@
even if a system version is present. This package will be disabled if
BRLCAD_ENABLE_TK is OFF.
")
-THIRD_PARTY_TCL_PACKAGE(Tktable tktable "${TK_WISH}" "tcl;tk"
"BRLCAD_ENABLE_TK;BRLCAD_LEVEL3" "" tktable_ALIASES tktable_DESCRIPTION)
+THIRD_PARTY_TCL_PACKAGE(Tktable tktable "${TK_WISH}" "tcl;tk"
"BRLCAD_ENABLE_TCL;BRLCAD_ENABLE_TK;BRLCAD_LEVEL3" "" tktable_ALIASES
tktable_DESCRIPTION)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/tktable/pkgIndex.tcl")
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/tktable/tktable_cfg.h")
DISTCLEAN("${CMAKE_BINARY_DIR}/lib/Tktable2.10")
@@ -632,7 +630,7 @@
#BRLCAD_ENABLE_TK is OFF.
#")
#THIRD_PARTY_TCL_PACKAGE(tktreectrl tktreectrl "${TK_WISH}" "tcl;tk"
-# "BRLCAD_ENABLE_TK;BRLCAD_LEVEL3" "" tktreectrl_ALIASES
tktreectrl_DESCRIPTION)
+# "BRLCAD_ENABLE_TCL;BRLCAD_ENABLE_TK;BRLCAD_LEVEL3" "" tktreectrl_ALIASES
tktreectrl_DESCRIPTION)
#DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/tktreectrl/pkgIndex.tcl")
#DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/tktreectrl/tktreectrl_cfg.h")
#DISTCLEAN("${CMAKE_BINARY_DIR}/lib/TkTreeCtrl2.4")
Modified: brlcad/trunk/src/rtwizard/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/rtwizard/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev
76200)
+++ brlcad/trunk/src/rtwizard/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev
76201)
@@ -1,24 +1,29 @@
-set(RTWIZARD_INCLUDE_DIRS
- ${OPTICAL_INCLUDE_DIRS}
- ${FB_INCLUDE_DIRS}
- ${RT_INCLUDE_DIRS}
- ${CMAKE_CURRENT_SOURCE_DIR}
- )
-LIST(REMOVE_DUPLICATES RTWIZARD_INCLUDE_DIRS)
-include_directories(${RTWIZARD_INCLUDE_DIRS})
+if (TARGET libtclcad)
+ set(RTWIZARD_INCLUDE_DIRS
+ ${OPTICAL_INCLUDE_DIRS}
+ ${FB_INCLUDE_DIRS}
+ ${RT_INCLUDE_DIRS}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ )
+ LIST(REMOVE_DUPLICATES RTWIZARD_INCLUDE_DIRS)
+ include_directories(${RTWIZARD_INCLUDE_DIRS})
-set(RTWIZARD_SRCS
+ set(RTWIZARD_SRCS
+ main.c
+ )
+
+ 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)
+ foreach(item ${tclindex_target_list})
+ add_dependencies(rtwizard ${item})
+ endforeach(item ${tclindex_target_list})
+endif (TARGET libtclcad)
+
+CMAKEFILES(
+ CMakeLists.txt
main.c
)
-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)
-foreach(item ${tclindex_target_list})
- add_dependencies(rtwizard ${item})
-endforeach(item ${tclindex_target_list})
-
-CMAKEFILES(CMakeLists.txt)
-
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/trunk/src/tclscripts/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/CMakeLists.txt 2020-06-25 15:23:08 UTC (rev
76200)
+++ brlcad/trunk/src/tclscripts/CMakeLists.txt 2020-06-25 17:00:43 UTC (rev
76201)
@@ -23,46 +23,47 @@
# tclIndex and pkgIndex.tcl files
macro(general_tcl_index_BUILD cmd outfile targetdir)
- # normalize so we can use it as a name
- string(REGEX REPLACE "/" "_" name ${targetdir})
+ if (BRLCAD_ENABLE_TCL)
+ # normalize so we can use it as a name
+ string(REGEX REPLACE "/" "_" name ${targetdir})
- # divert output to diff paths depending on whether debug or release
- if(CMAKE_CONFIGURATION_TYPES)
- set(tclindex_outdir
"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${DATA_DIR}/${targetdir}")
- else(CMAKE_CONFIGURATION_TYPES)
- set(tclindex_outdir "${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}")
- endif(CMAKE_CONFIGURATION_TYPES)
+ # divert output to diff paths depending on whether debug or release
+ if(CMAKE_CONFIGURATION_TYPES)
+ set(tclindex_outdir
"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${DATA_DIR}/${targetdir}")
+ else(CMAKE_CONFIGURATION_TYPES)
+ set(tclindex_outdir "${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}")
+ endif(CMAKE_CONFIGURATION_TYPES)
- # get file copy target(s) so we can make tclindex.tcl depend on them
- BRLCAD_GET_DIR_LIST_CONTENTS(DATA_TARGETS "${CMAKE_CURRENT_BINARY_DIR}"
data_target_list)
+ # get file copy target(s) so we can make tclindex.tcl depend on them
+ BRLCAD_GET_DIR_LIST_CONTENTS(DATA_TARGETS "${CMAKE_CURRENT_BINARY_DIR}"
data_target_list)
- # We want to be out of date if any of the tcl files in the current directory
- # change, since both pkgIndex and tclIndex are going to scan the directory
- file(GLOB tcl_files "*.tcl")
+ # We want to be out of date if any of the tcl files in the current
directory
+ # change, since both pkgIndex and tclIndex are going to scan the directory
+ file(GLOB tcl_files "*.tcl")
- # command that builds the index when the dependency is resolved
- add_custom_command(
- OUTPUT ${tclindex_outdir}/${outfile}
- COMMAND btclsh ${CMAKE_BINARY_DIR}/CMakeTmp/${cmd}.tcl ${tclindex_outdir}
>> ${CMAKE_CURRENT_BINARY_DIR}/${cmd}_index_gen.log 2>&1
- DEPENDS btclsh ${data_target_list} ${tcl_files}
- )
+ # command that builds the index when the dependency is resolved
+ add_custom_command(
+ OUTPUT ${tclindex_outdir}/${outfile}
+ COMMAND btclsh ${CMAKE_BINARY_DIR}/CMakeTmp/${cmd}.tcl
${tclindex_outdir} >> ${CMAKE_CURRENT_BINARY_DIR}/${cmd}_index_gen.log 2>&1
+ DEPENDS btclsh ${data_target_list} ${tcl_files}
+ )
- # put tclindex.tcl where it goes
- install(FILES ${tclindex_outdir}/${outfile} DESTINATION
${DATA_DIR}/${targetdir})
+ # put tclindex.tcl where it goes
+ install(FILES ${tclindex_outdir}/${outfile} DESTINATION
${DATA_DIR}/${targetdir})
- # convenience target
- add_custom_target(${name}_${cmd}.tcl ALL DEPENDS
${tclindex_outdir}/${outfile})
- set_target_properties(${name}_${cmd}.tcl PROPERTIES FOLDER "BRL-CAD Tcl
Scripts")
+ # convenience target
+ add_custom_target(${name}_${cmd}.tcl ALL DEPENDS
${tclindex_outdir}/${outfile})
+ set_target_properties(${name}_${cmd}.tcl PROPERTIES FOLDER "BRL-CAD Tcl
Scripts")
- # Maintain a list of all tclindex targets for dependency purposes
- set(tclindex_target_list ${tclindex_target_list} ${name}_${cmd}.tcl)
- list(REMOVE_DUPLICATES tclindex_target_list)
- set(tclindex_target_list "${tclindex_target_list}" CACHE STRING "tclindex
target list" FORCE)
+ # Maintain a list of all tclindex targets for dependency purposes
+ set(tclindex_target_list ${tclindex_target_list} ${name}_${cmd}.tcl)
+ list(REMOVE_DUPLICATES tclindex_target_list)
+ set(tclindex_target_list "${tclindex_target_list}" CACHE STRING "tclindex
target list" FORCE)
- set(LOG_FILES
"${LOG_FILES};${CMAKE_CURRENT_BINARY_DIR}/${cmd}_index_gen.log")
+ set(LOG_FILES
"${LOG_FILES};${CMAKE_CURRENT_BINARY_DIR}/${cmd}_index_gen.log")
- DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/${cmd}_index_gen.log)
-
+ DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/${cmd}_index_gen.log)
+ endif (BRLCAD_ENABLE_TCL)
endmacro(general_tcl_index_BUILD name targetdir)
mark_as_advanced(tclindex_target_list)
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
