ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

modules: update Find modules from Corrade repository.

pull/620/head
Vladimír Vondruš 3 years ago
parent
11fa89c36e
commit
21cff30b27
2 changed files with 18 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      modules/FindCorrade.cmake
  2. 18
      modules/FindNodeJs.cmake

4
modules/FindCorrade.cmake
Unescape View File

@ -70,7 +70,7 @@
# mode for MSVC 2017 # mode for MSVC 2017
# CORRADE_MSVC2015_COMPATIBILITY - Defined if compiled with compatibility # CORRADE_MSVC2015_COMPATIBILITY - Defined if compiled with compatibility
# mode for MSVC 2015 # mode for MSVC 2015
# CORRADE_BUILD_DEPRECATED - Defined if compiled with deprecated APIs # CORRADE_BUILD_DEPRECATED - Defined if compiled with deprecated features
# included # included
# CORRADE_BUILD_STATIC - Defined if compiled as static libraries. # CORRADE_BUILD_STATIC - Defined if compiled as static libraries.
# Default are shared libraries. # Default are shared libraries.
@ -271,7 +271,7 @@
# This file is part of Corrade. # This file is part of Corrade.
# #
# Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, # 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š <mosra@centrum.cz> # Vladimír Vondruš <mosra@centrum.cz>
# #
# Permission is hereby granted, free of charge, to any person obtaining a # Permission is hereby granted, free of charge, to any person obtaining a

18
modules/FindNodeJs.cmake
Unescape View File

@ -6,13 +6,14 @@
# #
# NodeJs_FOUND - True if Node.js executable is found # NodeJs_FOUND - True if Node.js executable is found
# NodeJs::NodeJs - Node.js executable imported target # NodeJs::NodeJs - Node.js executable imported target
# NodeJs_VERSION - Version string reported by ``node --version``
# #
# #
# This file is part of Corrade. # This file is part of Corrade.
# #
# Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, # 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š <mosra@centrum.cz> # Vladimír Vondruš <mosra@centrum.cz>
# #
# Permission is hereby granted, free of charge, to any person obtaining a # Permission is hereby granted, free of charge, to any person obtaining a
@ -37,8 +38,21 @@
find_program(NODEJS_EXECUTABLE node) find_program(NODEJS_EXECUTABLE node)
mark_as_advanced(NODEJS_EXECUTABLE) 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) 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) if(NOT TARGET NodeJs::NodeJs)
add_executable(NodeJs::NodeJs IMPORTED) add_executable(NodeJs::NodeJs IMPORTED)

Write Preview
Loading…
Cancel
Save