htrdr

commit fb10692ca78bcc9124f51254a19655336662b996
parent ff02c92bba0f262a8fe546a926b500cbbfa6e681
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Thu, 22 Apr 2021 17:14:06 +0200

Man page generation

Fix the expansion of default values.

Diffstat:
M
cmake/atmosphere/CMakeLists.txt
 | 
4
++--
M
cmake/core/CMakeLists.txt
 | 
22
+++++++++++-----------
M
doc/htrdr-atmosphere.1.txt.in
 | 
5
+++--

3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/cmake/atmosphere/CMakeLists.txt b/cmake/atmosphere/CMakeLists.txt
@@ -46,8 +46,8 @@ include_directories(
 ################################################################################
 # Generate files
 ################################################################################
-set(HTRDR_ATMOSPHERE_ARGS_DEFAULT_OPTICAL_THICKNESS_THRESHOLD "1")
-set(HTRDR_ATMOSPHERE_ARGS_DEFAULT_SKY_MTL_NAME "\"air\"")
+set(HTRDR_ATMOSPHERE_ARGS_DEFAULT_OPTICAL_THICKNESS_THRESHOLD "1" CACHE INTERNAL "")
+set(HTRDR_ATMOSPHERE_ARGS_DEFAULT_SKY_MTL_NAME "\"air\"" CACHE INTERNAL "")
 
 configure_file(${HTRDR_SOURCE_DIR}/atmosphere/htrdr_atmosphere_args.h.in
   ${HTRDR_BUILD_DIR}/atmosphere/htrdr_atmosphere_args.h @ONLY)
diff --git a/cmake/core/CMakeLists.txt b/cmake/core/CMakeLists.txt
@@ -53,17 +53,17 @@ include_directories(
 ################################################################################
 # Generate files
 ################################################################################
-set(HTRDR_ARGS_DEFAULT_CAMERA_POS "0,0,0")
-set(HTRDR_ARGS_DEFAULT_CAMERA_TGT "0,1,0")
-set(HTRDR_ARGS_DEFAULT_CAMERA_UP  "0,0,1")
-set(HTRDR_ARGS_DEFAULT_CAMERA_FOV "70")
-set(HTRDR_ARGS_DEFAULT_RECTANGLE_POS "0,0,0")
-set(HTRDR_ARGS_DEFAULT_RECTANGLE_TGT "0,0,1")
-set(HTRDR_ARGS_DEFAULT_RECTANGLE_UP "0,1,0")
-set(HTRDR_ARGS_DEFAULT_RECTANGLE_SZ "1,1")
-set(HTRDR_ARGS_DEFAULT_IMG_WIDTH "320")
-set(HTRDR_ARGS_DEFAULT_IMG_HEIGHT "240")
-set(HTRDR_ARGS_DEFAULT_IMG_SPP "1")
+set(HTRDR_ARGS_DEFAULT_CAMERA_POS "0,0,0" CACHE INTERNAL "")
+set(HTRDR_ARGS_DEFAULT_CAMERA_TGT "0,1,0" CACHE INTERNAL "")
+set(HTRDR_ARGS_DEFAULT_CAMERA_UP  "0,0,1" CACHE INTERNAL "")
+set(HTRDR_ARGS_DEFAULT_CAMERA_FOV "70" CACHE INTERNAL "")
+set(HTRDR_ARGS_DEFAULT_RECTANGLE_POS "0,0,0" CACHE INTERNAL "")
+set(HTRDR_ARGS_DEFAULT_RECTANGLE_TGT "0,0,1" CACHE INTERNAL "")
+set(HTRDR_ARGS_DEFAULT_RECTANGLE_UP "0,1,0" CACHE INTERNAL "")
+set(HTRDR_ARGS_DEFAULT_RECTANGLE_SZ "1,1" CACHE INTERNAL "")
+set(HTRDR_ARGS_DEFAULT_IMG_WIDTH "320" CACHE INTERNAL "")
+set(HTRDR_ARGS_DEFAULT_IMG_HEIGHT "240" CACHE INTERNAL "")
+set(HTRDR_ARGS_DEFAULT_IMG_SPP "1" CACHE INTERNAL "")
 
 configure_file(${HTRDR_SOURCE_DIR}/core/htrdr_args.h.in
   ${HTRDR_BUILD_DIR}/core/htrdr_args.h @ONLY)
diff --git a/doc/htrdr-atmosphere.1.txt.in b/doc/htrdr-atmosphere.1.txt.in
@@ -176,7 +176,7 @@ OPTIONS
  
 *-n* _sky-mtl_::
   Name of the material representing the sky in the *htrdr-materials*(5) file.
-  By default, _sky-mtl_ is @HTRDR_ARGS_DEFAULT_SKY_MTL_NAME@.
+  By default, _sky-mtl_ is @HTRDR_ATMOSPHERE_ARGS_DEFAULT_SKY_MTL_NAME@.
 
 *-O* _cache_::
   File used to cache the sky data. If the _cache_ file does not exists, it is
@@ -256,7 +256,8 @@ OPTIONS
 
 *-T* _threshold_::
   Optical thickness used as threshold criteria to partition the properties of
-  the clouds. By default its value is @HTRDR_ARGS_DEFAULT_OPTICAL_THICKNESS_THRESHOLD@.
+  the clouds. By default its value is
+  @HTRDR_ATMOSPHERE_ARGS_DEFAULT_OPTICAL_THICKNESS_THRESHOLD@.
   This option is ignored if a cache file is used (option *-O*).
 
 *-t* _threads-count_::