Revision: 77853
http://sourceforge.net/p/brlcad/code/77853
Author: starseeker
Date: 2020-12-01 19:09:07 +0000 (Tue, 01 Dec 2020)
Log Message:
-----------
Use a more clearly BRL-CAD specific name for this file
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/misc/CMake/BRLCAD_Options.cmake
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-12-01 17:09:30 UTC (rev 77852)
+++ brlcad/trunk/CMakeLists.txt 2020-12-01 19:09:07 UTC (rev 77853)
@@ -1029,7 +1029,7 @@
# detected. Because documentation is autogenerated for BRL-CAD
# options, be sure to initialize the file.
set(CONFIG_OPT_STRING "CONFIGURATION OPTIONS\n---------------------\n")
-file(WRITE "${CMAKE_BINARY_DIR}/OPTIONS" "${CONFIG_OPT_STRING}")
+file(WRITE "${CMAKE_BINARY_DIR}/BRLCAD_OPTIONS" "${CONFIG_OPT_STRING}")
# The BRL-CAD CMake build will also generate a configure script
# that emulates the command option style of GNU Autotool's
@@ -3527,7 +3527,7 @@
DISTCLEAN("${CMAKE_BINARY_DIR}/brlcadexec.cmake")
DISTCLEAN("${CMAKE_BINARY_DIR}/cmake_install.cmake")
DISTCLEAN("${CMAKE_BINARY_DIR}/install_manifest.txt")
- DISTCLEAN("${CMAKE_BINARY_DIR}/OPTIONS")
+ DISTCLEAN("${CMAKE_BINARY_DIR}/BRLCAD_OPTIONS")
DISTCLEAN("${CMAKE_BINARY_DIR}/CMakeFiles")
DISTCLEAN("${CMAKE_BINARY_DIR}/CMakeTmp")
DISTCLEAN("${CMAKE_BINARY_DIR}/configure.new")
@@ -3607,7 +3607,7 @@
file(READ "${BRLCAD_SOURCE_DIR}/INSTALL" SRC_INSTALL_STR)
string(REGEX REPLACE "${CONFIG_OPT_STRING}.*" "" INSTALL_PREFIX
"${SRC_INSTALL_STR}")
file(WRITE "${BRLCAD_BINARY_DIR}/INSTALL.new" "${INSTALL_PREFIX}")
-file(READ "${BRLCAD_BINARY_DIR}/OPTIONS" INSTALL_OPTS)
+file(READ "${BRLCAD_BINARY_DIR}/BRLCAD_OPTIONS" INSTALL_OPTS)
file(APPEND "${BRLCAD_BINARY_DIR}/INSTALL.new" "${INSTALL_OPTS}")
file(APPEND "${BRLCAD_BINARY_DIR}/INSTALL.new" "\n\n*** Note - Do not add or
edit configuration option descriptions and alias
lists in this file - those entries are auto-generated from information in
Modified: brlcad/trunk/misc/CMake/BRLCAD_Options.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Options.cmake 2020-12-01 17:09:30 UTC
(rev 77852)
+++ brlcad/trunk/misc/CMake/BRLCAD_Options.cmake 2020-12-01 19:09:07 UTC
(rev 77853)
@@ -133,7 +133,7 @@
# Write documentation description for BRL-CAD options
function(WRITE_OPTION_DESCRIPTION opt opt_ALIASES opt_DESCRIPTION)
- set(ofile "${CMAKE_BINARY_DIR}/OPTIONS")
+ set(ofile "${CMAKE_BINARY_DIR}/BRLCAD_OPTIONS")
file(APPEND "${ofile}" "\n--- ${opt} ---\n")
file(APPEND "${ofile}" "${${opt_DESCRIPTION}}")
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
