Skip to content

Commit

Permalink
Upgrade to build system 2.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mattrm456 authored Nov 26, 2024
1 parent 9cdfd69 commit e525e80
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
20 changes: 17 additions & 3 deletions repository.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1999,7 +1999,7 @@ endfunction()
# suite for the repository.
function (ntf_executable)
cmake_parse_arguments(
NTF_EXECUTABLE "PRIVATE;TEST;EXAMPLE" "NAME;PATH;MAIN;OUTPUT" "REQUIRES" ${ARGN})
NTF_EXECUTABLE "PRIVATE;TEST;EXAMPLE;UNITY" "NAME;PATH;MAIN;OUTPUT" "REQUIRES" ${ARGN})

if ("${NTF_EXECUTABLE_NAME}" STREQUAL "")
message(FATAL_ERROR "Invalid parameter: NAME")
Expand Down Expand Up @@ -2027,6 +2027,11 @@ function (ntf_executable)
set(target_private FALSE)
endif()

set(target_unity ${NTF_EXECUTABLE_UNITY})
if ("${target_unity}" STREQUAL "")
set(target_unity FALSE)
endif()

ntf_repository_archive_output_path_get(OUTPUT archive_output_path)
ntf_repository_library_output_path_get(OUTPUT library_output_path)
ntf_repository_runtime_output_path_get(OUTPUT runtime_output_path)
Expand Down Expand Up @@ -2095,6 +2100,9 @@ function (ntf_executable)
ntf_target_thirdparty_set(
TARGET ${target} VALUE FALSE)

ntf_target_unity_set(
TARGET ${target} VALUE ${target_unity})

ntf_target_requires_set(
TARGET ${target} VALUE ${NTF_EXECUTABLE_REQUIRES})

Expand Down Expand Up @@ -2384,6 +2392,9 @@ function (ntf_interface)
ntf_target_thirdparty_set(
TARGET ${target} VALUE ${target_thirdparty})

ntf_target_unity_set(
TARGET ${target} VALUE FALSE)

ntf_target_requires_set(
TARGET ${target} VALUE ${NTF_INTERFACE_REQUIRES})

Expand Down Expand Up @@ -2996,6 +3007,9 @@ function (ntf_adapter)
ntf_target_thirdparty_set(
TARGET ${target} VALUE ${target_thirdparty})

ntf_target_unity_set(
TARGET ${target} VALUE FALSE)

ntf_target_pseudo_set(
TARGET ${target} VALUE ${target_pseudo})

Expand Down Expand Up @@ -6075,15 +6089,15 @@ function (ntf_target_link_dependency)

find_package(OpenSSL REQUIRED COMPONENTS SSL Crypto)

if (VERBOSE)
if (VERBOSE OR TRUE)
message(STATUS "OPENSSL_FOUND: ${OPENSSL_FOUND}")
message(STATUS "OPENSSL_INCLUDE_DIR: ${OPENSSL_INCLUDE_DIR}")
message(STATUS "OPENSSL_LIBRARIES: ${OPENSSL_LIBRARIES}")
message(STATUS "OPENSSL_VERSION: ${OPENSSL_VERSION}")
endif()

if (TARGET OpenSSL::SSL AND TARGET OpenSSL::Crypto)
if (VERBOSE)
if (VERBOSE OR TRUE)
message(STATUS "OpenSSL has been found for ${target} by FindOpenSSL.cmake")
endif()
set(dependency_found_by_findopenssl TRUE)
Expand Down
2 changes: 1 addition & 1 deletion toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include_guard(GLOBAL)

set(NTF_TOOLCHAIN_VERSION_MAJOR 2)
set(NTF_TOOLCHAIN_VERSION_MINOR 4)
set(NTF_TOOLCHAIN_VERSION_PATCH 0)
set(NTF_TOOLCHAIN_VERSION_PATCH 1)

message(STATUS "NTF Build Toolchain ${NTF_TOOLCHAIN_VERSION_MAJOR}.${NTF_TOOLCHAIN_VERSION_MINOR}.${NTF_TOOLCHAIN_VERSION_PATCH}")

Expand Down

0 comments on commit e525e80

Please sign in to comment.