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

Merge pull request #549 from google/emscripten_env_check

Browse Source 
draco cmake: Require the EMSCRIPTEN environment variable.
This commit is contained in:
Tom Finegan 2019-08-29 11:46:38 -07:00 committed by GitHub
commit dd5aaf0ae4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -187,6 +187,11 @@ if(EMSCRIPTEN)
FATAL_ERROR FATAL_ERROR
"Python required for Emscripten builds, but cmake cannot find it.") "Python required for Emscripten builds, but cmake cannot find it.")
endif() endif()
if(NOT EXISTS "$ENV{EMSCRIPTEN}")
message(
FATAL_ERROR
"The EMSCRIPTEN environment variable must be set. See README.md.")
endif()
else() else()
if(ENABLE_TESTS) if(ENABLE_TESTS)
if(MSVC) if(MSVC)
@ -1011,7 +1016,8 @@ else()
if(IOS) if(IOS)
set(UNITY_TYPE STATIC) set(UNITY_TYPE STATIC)
endif() endif()
add_library(dracodec_unity ${UNITY_TYPE} add_library(dracodec_unity
${UNITY_TYPE}
${draco_version_sources} ${draco_version_sources}
$<TARGET_OBJECTS:draco_attributes> $<TARGET_OBJECTS:draco_attributes>
$<TARGET_OBJECTS:draco_compression_attributes_dec> $<TARGET_OBJECTS:draco_compression_attributes_dec>