GitHub-Proxy/draco
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/google/draco synced 2025-08-12 10:39:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #390 from google/fix_cmake_var_handling

Browse Source 
Require Android NDK path in environment.
This commit is contained in:
FrankGalligan 2018-05-14 12:46:52 -07:00 committed by GitHub
commit d83342256e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -321,11 +321,8 @@ It's sometimes useful to build Draco command line tools and run them directly on
Android devices via adb. Android devices via adb.
~~~~~ bash ~~~~~ bash
# all targets require CMAKE_ANDROID_NDK. It can be set in the environment or # All targets require CMAKE_ANDROID_NDK. It must be set in the environment.
# within CMake. For example, this would set it in your environment.
$ export CMAKE_ANDROID_NDK=path/to/ndk $ export CMAKE_ANDROID_NDK=path/to/ndk
# To set it within CMake, add -DCMAKE_ANDROID_NDK=path/to/ndk to your CMake
# command.
# arm # arm
$ cmake path/to/draco -DCMAKE_TOOLCHAIN_FILE=path/to/draco/cmake/toolchains/armv7-android-ndk-libcpp.cmake $ cmake path/to/draco -DCMAKE_TOOLCHAIN_FILE=path/to/draco/cmake/toolchains/armv7-android-ndk-libcpp.cmake

16
cmake/util.cmake
View File

@ -51,21 +51,19 @@ function (set_compiler_launcher launcher_flag launcher_name)
endif () endif ()
endfunction () endfunction ()
# Terminates CMake execution when $var_name is unset in CMake and environment, # Terminates CMake execution when $var_name is unset in the environment. Sets
# and then calls set_variable_if_unset() to ensure variable is set for caller. # CMake variable to the value of the environment variable when the variable is
# present in the environment.
macro(require_variable var_name) macro(require_variable var_name)
if ((NOT DEFINED ${var_name}) AND ("$ENV{${var_name}}" STREQUAL "")) if ("$ENV{${var_name}}" STREQUAL "")
message(FATAL_ERROR "${var_name} must be set in cmake or environment.") message(FATAL_ERROR "${var_name} must be set in environment.")
endif () endif ()
set_variable_if_unset(${var_name} "") set_variable_if_unset(${var_name} "")
endmacro () endmacro ()
# Sets $var_name to $default_value if not already set in CMake or the # Sets $var_name to $default_value if not already set in the environment.
# environment.
macro (set_variable_if_unset var_name default_value) macro (set_variable_if_unset var_name default_value)
if (DEFINED ${var_name}) if (NOT "$ENV{${var_name}}" STREQUAL "")
return ()
elseif (NOT "$ENV{${var_name}}" STREQUAL "")
set(${var_name} $ENV{${var_name}}) set(${var_name} $ENV{${var_name}})
else () else ()
set(${var_name} ${default_value}) set(${var_name} ${default_value})