From 21cff30b27b2e39a5bb05129a3cfc4d2e61f9348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 7 Jun 2023 16:51:16 +0200 Subject: [PATCH] modules: update Find modules from Corrade repository. --- modules/FindCorrade.cmake | 4 ++-- modules/FindNodeJs.cmake | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake index fa18d1363..44f6271c0 100644 --- a/modules/FindCorrade.cmake +++ b/modules/FindCorrade.cmake @@ -70,7 +70,7 @@ # mode for MSVC 2017 # CORRADE_MSVC2015_COMPATIBILITY - Defined if compiled with compatibility # mode for MSVC 2015 -# CORRADE_BUILD_DEPRECATED - Defined if compiled with deprecated APIs +# CORRADE_BUILD_DEPRECATED - Defined if compiled with deprecated features # included # CORRADE_BUILD_STATIC - Defined if compiled as static libraries. # Default are shared libraries. @@ -271,7 +271,7 @@ # This file is part of Corrade. # # Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, -# 2017, 2018, 2019, 2020, 2021, 2022 +# 2017, 2018, 2019, 2020, 2021, 2022, 2023 # Vladimír Vondruš # # Permission is hereby granted, free of charge, to any person obtaining a diff --git a/modules/FindNodeJs.cmake b/modules/FindNodeJs.cmake index 8823e6167..2a131c6a7 100644 --- a/modules/FindNodeJs.cmake +++ b/modules/FindNodeJs.cmake @@ -6,13 +6,14 @@ # # NodeJs_FOUND - True if Node.js executable is found # NodeJs::NodeJs - Node.js executable imported target +# NodeJs_VERSION - Version string reported by ``node --version`` # # # This file is part of Corrade. # # Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, -# 2017, 2018, 2019, 2020, 2021, 2022 +# 2017, 2018, 2019, 2020, 2021, 2022, 2023 # Vladimír Vondruš # # Permission is hereby granted, free of charge, to any person obtaining a @@ -37,8 +38,21 @@ find_program(NODEJS_EXECUTABLE node) mark_as_advanced(NODEJS_EXECUTABLE) +if(NODEJS_EXECUTABLE) + execute_process(COMMAND ${NODEJS_EXECUTABLE} --version + OUTPUT_VARIABLE NodeJs_VERSION + ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + if(NodeJs_VERSION MATCHES "^v[0-9]") + string(SUBSTRING ${NodeJs_VERSION} 1 -1 NodeJs_VERSION) + else() + unset(NodeJs_VERSION) + endif() +endif() + include(FindPackageHandleStandardArgs) -find_package_handle_standard_args("NodeJs" DEFAULT_MSG NODEJS_EXECUTABLE) +find_package_handle_standard_args(NodeJs + REQUIRED_VARS NODEJS_EXECUTABLE + VERSION_VAR NodeJs_VERSION) if(NOT TARGET NodeJs::NodeJs) add_executable(NodeJs::NodeJs IMPORTED)