commit 2fb9a96f848b2a6c267f06235788acbe6960cd6a
parent 49254b8558b025b1696c6539199ab27d6adb35b0
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Fri, 19 Feb 2021 10:41:39 +0100
Update the include directives of the htrdr core files
Diffstat:
27 files changed, 66 insertions(+), 68 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -19,6 +19,7 @@ cmake_minimum_required(VERSION 3.1)
project(htrdr C)
set(HTRDR_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src)
+set(HTRDR_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(VERSION_MAJOR 0)
set(VERSION_MINOR 7)
diff --git a/cmake/core/CMakeLists.txt b/cmake/core/CMakeLists.txt
@@ -15,11 +15,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.1)
project(htrdr-core C)
-message(STATUS "${HTRDR_SOURCE_DIR}")
-
################################################################################
# Check dependencies
################################################################################
@@ -48,9 +46,9 @@ include_directories(
${StarSP_INCLUDE_DIR}
${StarVX_INCLUDE_DIR}
${HTSky}
- ${HTRDR_SOURCE_DIR}/core
- ${MPI_INCLUDE_PATH}
- ${CMAKE_CURRENT_BINARY_DIR})
+ ${HTRDR_BUILD_DIR}
+ ${HTRDR_SOURCE_DIR}
+ ${MPI_INCLUDE_PATH})
################################################################################
# Generate files
@@ -68,9 +66,9 @@ set(HTRDR_ARGS_DEFAULT_IMG_HEIGHT "240")
set(HTRDR_ARGS_DEFAULT_IMG_SPP "1")
configure_file(${HTRDR_SOURCE_DIR}/core/htrdr_args.h.in
- ${CMAKE_CURRENT_BINARY_DIR}/htrdr_args.h @ONLY)
+ ${HTRDR_BUILD_DIR}/core/htrdr_args.h @ONLY)
configure_file(${HTRDR_SOURCE_DIR}/core/htrdr_version.h.in
- ${CMAKE_CURRENT_BINARY_DIR}/htrdr_version.h @ONLY)
+ ${HTRDR_BUILD_DIR}/core/htrdr_version.h @ONLY)
################################################################################
# Configure and define targets
@@ -111,7 +109,7 @@ set(HTRDR_CORE_FILES_INC2 # Generated files
# Prepend each file in the `HTRDR_FILES_<SRC|INC>' list by `HTRDR_SOURCE_DIR'
rcmake_prepend_path(HTRDR_CORE_FILES_SRC ${HTRDR_SOURCE_DIR}/core)
rcmake_prepend_path(HTRDR_CORE_FILES_INC ${HTRDR_SOURCE_DIR}/core)
-rcmake_prepend_path(HTRDR_CORE_FILES_INC2 ${CMAKE_CURRENT_BINARY_DIR})
+rcmake_prepend_path(HTRDR_CORE_FILES_INC2 ${HTRDR_BUILD_DIR}/core)
# Core library
add_library(htrdr-core SHARED
diff --git a/src/core/htrdr.c b/src/core/htrdr.c
@@ -17,11 +17,11 @@
#define _POSIX_C_SOURCE 200809L /* stat.st_time support */
-#include "htrdr.h"
-#include "htrdr_c.h"
-#include "htrdr_args.h"
-#include "htrdr_log.h"
-#include "htrdr_version.h"
+#include "core/htrdr.h"
+#include "core/htrdr_c.h"
+#include "core/htrdr_args.h"
+#include "core/htrdr_log.h"
+#include "core/htrdr_version.h"
#include <rsys/cstr.h>
#include <rsys/mem_allocator.h>
diff --git a/src/core/htrdr_args.c b/src/core/htrdr_args.c
@@ -17,10 +17,9 @@
#define _POSIX_C_SOURCE 2 /* strtok_r support */
-#include "htrdr.h"
-
-#include "htrdr_args.h"
-#include "htrdr_version.h"
+#include "core/htrdr.h"
+#include "core/htrdr_args.h"
+#include "core/htrdr_version.h"
#include <rsys/cstr.h>
#include <rsys/double3.h>
diff --git a/src/core/htrdr_args.h.in b/src/core/htrdr_args.h.in
@@ -18,8 +18,8 @@
#ifndef HTRDR_ARGS_H
#define HTRDR_ARGS_H
-#include "htrdr_cie_xyz.h"
-#include "htrdr_spectral.h"
+#include "core/htrdr_cie_xyz.h"
+#include "core/htrdr_spectral.h"
#include <rsys/rsys.h>
diff --git a/src/core/htrdr_buffer.c b/src/core/htrdr_buffer.c
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "htrdr.h"
-#include "htrdr_buffer.h"
-#include "htrdr_log.h"
+#include "core/htrdr.h"
+#include "core/htrdr_buffer.h"
+#include "core/htrdr_log.h"
#include <rsys/math.h>
#include <rsys/mem_allocator.h>
diff --git a/src/core/htrdr_buffer.h b/src/core/htrdr_buffer.h
@@ -18,7 +18,7 @@
#ifndef HTRDR_BUFFER_H
#define HTRDR_BUFFER_H
-#include "htrdr.h"
+#include "core/htrdr.h"
#include <rsys/rsys.h>
/*
diff --git a/src/core/htrdr_camera.c b/src/core/htrdr_camera.c
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "htrdr.h"
-#include "htrdr_camera.h"
-#include "htrdr_log.h"
+#include "core/htrdr.h"
+#include "core/htrdr_camera.h"
+#include "core/htrdr_log.h"
#include <rsys/double3.h>
#include <rsys/mem_allocator.h>
diff --git a/src/core/htrdr_camera.h b/src/core/htrdr_camera.h
@@ -18,7 +18,7 @@
#ifndef HTRDR_CAMERA_H
#define HTRDR_CAMERA_H
-#include "htrdr.h"
+#include "core/htrdr.h"
#include <rsys/rsys.h>
/* Forward declarations */
diff --git a/src/core/htrdr_cie_xyz.c b/src/core/htrdr_cie_xyz.c
@@ -15,10 +15,10 @@
#define _POSIX_C_SOURCE 200112L /* nextafter */
-#include "htrdr.h"
-#include "htrdr_c.h"
-#include "htrdr_cie_xyz.h"
-#include "htrdr_log.h"
+#include "core/htrdr.h"
+#include "core/htrdr_c.h"
+#include "core/htrdr_cie_xyz.h"
+#include "core/htrdr_log.h"
#include <high_tune/htsky.h>
diff --git a/src/core/htrdr_cie_xyz.h b/src/core/htrdr_cie_xyz.h
@@ -16,7 +16,7 @@
#ifndef HTRDR_CIE_XYZ_H
#define HTRDR_CIE_XYZ_H
-#include "htrdr.h"
+#include "core/htrdr.h"
#include <rsys/rsys.h>
/* Wavelength boundaries of the CIE XYZ color space in nanometers */
diff --git a/src/core/htrdr_draw_map.c b/src/core/htrdr_draw_map.c
@@ -17,11 +17,11 @@
#define _POSIX_C_SOURCE 200112L /* nanosleep */
-#include "htrdr.h"
-#include "htrdr_c.h"
-#include "htrdr_buffer.h"
-#include "htrdr_draw_map.h"
-#include "htrdr_log.h"
+#include "core/htrdr.h"
+#include "core/htrdr_c.h"
+#include "core/htrdr_buffer.h"
+#include "core/htrdr_draw_map.h"
+#include "core/htrdr_log.h"
#include <rsys/clock_time.h>
#include <rsys/cstr.h>
diff --git a/src/core/htrdr_draw_map.h b/src/core/htrdr_draw_map.h
@@ -18,7 +18,7 @@
#ifndef HTRDR_DRAW_MAP_H
#define HTRDR_DRAW_MAP_H
-#include "htrdr.h"
+#include "core/htrdr.h"
#include <rsys/rsys.h>
struct htrdr_draw_pixel_args {
diff --git a/src/core/htrdr_interface.h b/src/core/htrdr_interface.h
@@ -18,7 +18,7 @@
#ifndef HTRDR_INTERFACE_H
#define HTRDR_INTERFACE_H
-#include "htrdr_materials.h"
+#include "core/htrdr_materials.h"
#include <star/s3d.h>
#include <rsys/double3.h>
diff --git a/src/core/htrdr_log.c b/src/core/htrdr_log.c
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "htrdr.h"
-#include "htrdr_c.h"
-#include "htrdr_log.h"
+#include "core/htrdr.h"
+#include "core/htrdr_c.h"
+#include "core/htrdr_log.h"
#include <rsys/logger.h>
diff --git a/src/core/htrdr_log.h b/src/core/htrdr_log.h
@@ -18,7 +18,7 @@
#ifndef HTRDR_LOG_H
#define HTRDR_LOG_H
-#include "htrdr.h"
+#include "core/htrdr.h"
#include <rsys/rsys.h>
#define HTRDR_LOG_INFO_PREFIX "\x1b[1m\x1b[32m>\x1b[0m "
diff --git a/src/core/htrdr_main.c b/src/core/htrdr_main.c
@@ -15,8 +15,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "htrdr.h"
-#include "htrdr_version.h"
+#include "core/htrdr.h"
+#include "core/htrdr_version.h"
#include <string.h>
diff --git a/src/core/htrdr_materials.c b/src/core/htrdr_materials.c
@@ -17,9 +17,9 @@
#define _POSIX_C_SOURCE 200112L /* strtok_r and wordexp support */
-#include "htrdr.h"
-#include "htrdr_log.h"
-#include "htrdr_materials.h"
+#include "core/htrdr.h"
+#include "core/htrdr_log.h"
+#include "core/htrdr_materials.h"
#include <modradurb/mrumtl.h>
#include <star/ssf.h>
diff --git a/src/core/htrdr_materials.h b/src/core/htrdr_materials.h
@@ -18,7 +18,7 @@
#ifndef HTRDR_MATERIALS_H
#define HTRDR_MATERIALS_H
-#include "htrdr.h"
+#include "core/htrdr.h"
#include <rsys/rsys.h>
/* Forward declarations */
diff --git a/src/core/htrdr_ran_wlen.c b/src/core/htrdr_ran_wlen.c
@@ -17,11 +17,11 @@
#define _POSIX_C_SOURCE 200112L /* nextafter */
-#include "htrdr.h"
-#include "htrdr_c.h"
-#include "htrdr_log.h"
-#include "htrdr_ran_wlen.h"
-#include "htrdr_spectral.h"
+#include "core/htrdr.h"
+#include "core/htrdr_c.h"
+#include "core/htrdr_log.h"
+#include "core/htrdr_ran_wlen.h"
+#include "core/htrdr_spectral.h"
#include <high_tune/htsky.h>
diff --git a/src/core/htrdr_ran_wlen.h b/src/core/htrdr_ran_wlen.h
@@ -18,7 +18,7 @@
#ifndef HTRDR_RAN_WLEN_H
#define HTRDR_RAN_WLEN_H
-#include "htrdr.h"
+#include "core/htrdr.h"
#include <rsys/rsys.h>
#define HTRDR_WLEN_RAN_CONTINUE 0
diff --git a/src/core/htrdr_rectangle.c b/src/core/htrdr_rectangle.c
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "htrdr.h"
-#include "htrdr_log.h"
-#include "htrdr_rectangle.h"
+#include "core/htrdr.h"
+#include "core/htrdr_log.h"
+#include "core/htrdr_rectangle.h"
#include <rsys/double3.h>
#include <rsys/mem_allocator.h>
diff --git a/src/core/htrdr_rectangle.h b/src/core/htrdr_rectangle.h
@@ -18,7 +18,7 @@
#ifndef HTRDR_RECTANGLE_H
#define HTRDR_RECTANGLE_H
-#include "htrdr.h"
+#include "core/htrdr.h"
#include <rsys/rsys.h>
/* Forwar declarations */
diff --git a/src/core/htrdr_slab.c b/src/core/htrdr_slab.c
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "htrdr.h"
-#include "htrdr_log.h"
-#include "htrdr_slab.h"
+#include "core/htrdr.h"
+#include "core/htrdr_log.h"
+#include "core/htrdr_slab.h"
#include <rsys/cstr.h>
#include <math.h>
diff --git a/src/core/htrdr_slab.h b/src/core/htrdr_slab.h
@@ -18,7 +18,7 @@
#ifndef HTRDR_SLAB_H
#define HTRDR_SLAB_H
-#include "htrdr.h"
+#include "core/htrdr.h"
#include <rsys/rsys.h>
/* Forward declaration */
diff --git a/src/core/htrdr_spectral.c b/src/core/htrdr_spectral.c
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "htrdr.h"
-#include "htrdr_log.h"
-#include "htrdr_spectral.h"
+#include "core/htrdr.h"
+#include "core/htrdr_log.h"
+#include "core/htrdr_spectral.h"
/*******************************************************************************
* Exported symbols
diff --git a/src/core/htrdr_spectral.h b/src/core/htrdr_spectral.h
@@ -18,7 +18,7 @@
#ifndef HTRDR_SPECTRAL_H
#define HTRDR_SPECTRAL_H
-#include "htrdr.h"
+#include "core/htrdr.h"
#include <rsys/rsys.h>
#include <rsys/math.h> /* PI support */
