Skip to content

Commit 87b4014

Browse files
jrelinquemjrelinquem
committed
Merge branch 'Version_1.9.4_Development'
2 parents d46bf38 + d92ee82 commit 87b4014

File tree

184 files changed

+11166
-4279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+11166
-4279
lines changed

‎.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
*build*/
33
*product*/
44
*todo*/
5+
*install*/
56

67
# Temporal
78
*.TMP
@@ -44,4 +45,7 @@ CMakeLists.txt.user
4445
# Executables
4546
*.exe
4647
*.out
47-
*.app
48+
*.app
49+
50+
# Orig
51+
*.orig

‎LibDegorasSLR/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎LibDegorasSLR/CMakeModules/ConfigLibDegorasSLR.cmake renamed to ‎LibDegorasSLR/CMakeLibsConfig/ConfigLibDegorasSLR.cmake

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# **********************************************************************************************************************
2-
# Updated 13/02/2024
2+
# Updated 11/03/2024
33
# **********************************************************************************************************************
44

55
# **********************************************************************************************************************
@@ -10,6 +10,9 @@ MACRO(macro_configure_libdegorasslr_default version version_mode extra_search_pa
1010
# Log.
1111
message(STATUS "Configuring LibDegorasSLR...")
1212

13+
# Setup the find package config.
14+
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
15+
1316
# Configure extra things if neccesary.
1417
# ...
1518

@@ -43,9 +46,17 @@ MACRO(macro_link_libdegorasslr_default target visibility)
4346
target_link_libraries(${target} ${visibility} LibDegorasSLR::LibDegorasSLR)
4447

4548
if(MODULES_GLOBAL_SHOW_EXTERNALS)
49+
50+
# LibDegorasSLR
4651
get_target_property(LibDegorasSLR_INCLUDES LibDegorasSLR::LibDegorasSLR INTERFACE_INCLUDE_DIRECTORIES)
4752
file(GLOB_RECURSE EXTERNAL_HEADERS ${LibDegorasSLR_INCLUDES}/*)
4853
target_sources(${target} ${visibility} ${EXTERNAL_HEADERS})
54+
55+
# LibNovasCpp
56+
get_target_property(LibNovasCpp_INCLUDES LibNovasCpp::LibNovasCpp INTERFACE_INCLUDE_DIRECTORIES)
57+
file(GLOB_RECURSE EXTERNAL_HEADERS ${LibNovasCpp_INCLUDES}/*)
58+
target_sources(${target} ${visibility} ${EXTERNAL_HEADERS})
59+
4960
endif()
5061

5162
ENDMACRO()

‎LibDegorasSLR/CMakeModules/ConfigLibNovasCpp.cmake renamed to ‎LibDegorasSLR/CMakeLibsConfig/ConfigLibNovasCpp.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# **********************************************************************************************************************
2-
# Updated 13/02/2024
2+
# Updated 11/03/2024
33
# **********************************************************************************************************************
44

55
# **********************************************************************************************************************

‎LibDegorasSLR/CMakeLists.txt

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# **********************************************************************************************************************
2828

2929
# **********************************************************************************************************************
30-
# Updated 29/02/2024
30+
# Updated 11/03/2024
3131
# **********************************************************************************************************************
3232

3333
# **********************************************************************************************************************
@@ -42,18 +42,21 @@ cmake_minimum_required(VERSION 3.21)
4242
project(_)
4343

4444
# Set path to additional CMake modules.
45-
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules ${CMAKE_MODULE_PATH})
46-
include(CMakeMacrosGlobals)
45+
set(CMAKE_MODULE_PATH
46+
${CMAKE_MODULE_PATH}
47+
${CMAKE_SOURCE_DIR}/CMakeModules
48+
${CMAKE_SOURCE_DIR}/CMakeLibsConfig)
4749

4850
# Init CMake modules.
51+
include(CMakeMacrosGlobals)
4952
macro_cmakemodules_init()
5053

5154
# ----------------------------------------------------------------------------------------------------------------------
5255
# BASIC PROJECT CONFIGURATION
5356

5457
# Base project configuration.
5558
set(LIB_NAME LibDegorasSLR)
56-
set(LIB_VER 1.9.3)
59+
set(LIB_VER 1.9.4)
5760
set(LIB_BUILD_MODE Debug)
5861
set(LIB_INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../${LIB_NAME}_product_v${LIB_VER})
5962
set(LIB_LANGUAGES CXX C)
@@ -86,7 +89,7 @@ set(LIB_SOURCES_DIR ${CMAKE_SOURCE_DIR}/sources)
8689

8790
# Configure the LibNovasCPP package.
8891
include(ConfigLibNovasCpp)
89-
macro_configure_libnovascpp_default("3.1" EXACT "" "")
92+
macro_configure_libnovascpp_default("3.1.1" EXACT "" "")
9093

9194
# ----------------------------------------------------------------------------------------------------------------------
9295
# SETUP THE SHARED LIBRARY
@@ -112,6 +115,9 @@ macro_setup_shared_lib("${LIB_NAME}" "${LIB_INCLUDES_DIR}" "${LIB_VER}"
112115
# Link with LibNovasCPP.
113116
macro_link_libnovascpp_default(${LIB_NAME})
114117

118+
# Include the shared library CMake configuration file.
119+
include(ConfigLibDegorasSLR)
120+
115121
# ----------------------------------------------------------------------------------------------------------------------
116122
# CONFIGURE THE COMPILERS
117123

‎LibDegorasSLR/CMakeModules/CMakeMacrosGlobals.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# **********************************************************************************************************************
2-
# Updated 13/02/2024
2+
# Updated 11/03/2024
33
# **********************************************************************************************************************
44

55
# **********************************************************************************************************************

‎LibDegorasSLR/CMakeModules/CMakeMacrosInstall.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# **********************************************************************************************************************
2-
# Updated 13/02/2024
2+
# Updated 11/03/2024
33
# **********************************************************************************************************************
44

55
# **********************************************************************************************************************

‎LibDegorasSLR/CMakeModules/CMakeMacrosLauncher.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# **********************************************************************************************************************
2-
# Updated 13/02/2024
2+
# Updated 11/03/2024
33
# **********************************************************************************************************************
44

55
# **********************************************************************************************************************

‎LibDegorasSLR/CMakeModules/CMakeMacrosLibraries.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# **********************************************************************************************************************
2-
# Updated 13/02/2024
2+
# Updated 11/03/2024
33
# **********************************************************************************************************************
44

55
# **********************************************************************************************************************
@@ -102,7 +102,7 @@ MACRO(macro_setup_lib_basic_unit_tests tests_sources_path install_path ignore_pa
102102
# List of basic tests.
103103
file(GLOB_RECURSE TESTS_SOURCES RELATIVE "${tests_sources_path}" "${tests_sources_path}/*.cpp")
104104

105-
# For simple test we will avoit the include the external resources.
105+
# For simple test we will avoid the include the external resources.
106106
set(EXTERN)
107107

108108
# Filter out ignored paths.
@@ -151,7 +151,7 @@ MACRO(macro_setup_lib_basic_unit_tests tests_sources_path install_path ignore_pa
151151
${install_path})
152152

153153
# Install the runtime dependencies.
154-
macro_install_runtime_deps("${EXAMPLE_NAME}"
154+
macro_install_runtime_deps("${TEST_NAME}"
155155
"${MODULES_GLOBAL_MAIN_DEP_SET_NAME}"
156156
"${ext_libs_loc}"
157157
"${install_path}"

‎LibDegorasSLR/CMakeModules/CMakeMacrosProjects.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# **********************************************************************************************************************
2-
# Updated 13/02/2024
2+
# Updated 11/03/2024
33
# **********************************************************************************************************************
44

55
# **********************************************************************************************************************

‎LibDegorasSLR/CMakeModules/CMakeMacrosUtils.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# **********************************************************************************************************************
2-
# Updated 13/02/2024
2+
# Updated 11/03/2024
33
# **********************************************************************************************************************
44

55
# **********************************************************************************************************************

0 commit comments

Comments
 (0)