Merge pull request #533 from google/draco_misc

draco: Mostly CMake updates.

.clang-format

@@ -0,0 +1,9 @@
+---
+Language:        Cpp
+BasedOnStyle: Google
+DerivePointerAlignment: false
+PointerAlignment: Right
+AllowShortIfStatementsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: true
+AllowShortLoopsOnASingleLine: false
+...

.cmake-format.py

@@ -0,0 +1,102 @@
+# Generated with cmake-format 0.5.1
+# How wide to allow formatted cmake files
+line_width = 80
+
+# How many spaces to tab for indent
+tab_size = 2
+
+# If arglists are longer than this, break them always
+max_subargs_per_line = 10
+
+# If true, separate flow control names from their parentheses with a space
+separate_ctrl_name_with_space = False
+
+# If true, separate function names from parentheses with a space
+separate_fn_name_with_space = False
+
+# If a statement is wrapped to more than one line, than dangle the closing
+# parenthesis on its own line
+dangle_parens = False
+
+# What character to use for bulleted lists
+bullet_char = '*'
+
+# What character to use as punctuation after numerals in an enumerated list
+enum_char = '.'
+
+# What style line endings to use in the output.
+line_ending = u'unix'
+
+# Format command names consistently as 'lower' or 'upper' case
+command_case = u'lower'
+
+# Format keywords consistently as 'lower' or 'upper' case
+keyword_case = u'unchanged'
+
+# Specify structure for custom cmake functions
+additional_commands = {
+  "foo": {
+    "flags": [
+      "BAR",
+      "BAZ"
+    ],
+    "kwargs": {
+      "HEADERS": "*",
+      "DEPENDS": "*",
+      "SOURCES": "*"
+    }
+  }
+}
+
+# A list of command names which should always be wrapped
+always_wrap = []
+
+# Specify the order of wrapping algorithms during successive reflow attempts
+algorithm_order = [0, 1, 2, 3, 4]
+
+# If true, the argument lists which are known to be sortable will be sorted
+# lexicographicall
+autosort = False
+
+# enable comment markup parsing and reflow
+enable_markup = True
+
+# If comment markup is enabled, don't reflow the first comment block in
+# eachlistfile. Use this to preserve formatting of your
+# copyright/licensestatements.
+first_comment_is_literal = False
+
+# If comment markup is enabled, don't reflow any comment block which matchesthis
+# (regex) pattern. Default is `None` (disabled).
+literal_comment_pattern = None
+
+# Regular expression to match preformat fences in comments
+# default=r'^\s*([`~]{3}[`~]*)(.*)$'
+fence_pattern = u'^\\s*([`~]{3}[`~]*)(.*)$'
+
+# Regular expression to match rulers in comments
+# default=r'^\s*[^\w\s]{3}.*[^\w\s]{3}$'
+ruler_pattern = u'^\\s*[^\\w\\s]{3}.*[^\\w\\s]{3}$'
+
+# If true, emit the unicode byte-order mark (BOM) at the start of the file
+emit_byteorder_mark = False
+
+# If a comment line starts with at least this many consecutive hash characters,
+# then don't lstrip() them off. This allows for lazy hash rulers where the first
+# hash char is not separated by space
+hashruler_min_length = 10
+
+# If true, then insert a space between the first hash char and remaining hash
+# chars in a hash ruler, and normalize its length to fill the column
+canonicalize_hashrulers = True
+
+# Specify the encoding of the input file. Defaults to utf-8.
+input_encoding = u'utf-8'
+
+# Specify the encoding of the output file. Defaults to utf-8. Note that cmake
+# only claims to support utf-8 so be careful when using anything else
+output_encoding = u'utf-8'
+
+# A dictionary containing any per-command configuration overrides. Currently
+# only `command_case` is supported.
+per_command = {}

cmake/FindDraco.cmake

@@ -2,10 +2,7 @@
 #
 # Locates draco and sets the following variables:
 #
-# draco_FOUND
+# draco_FOUND draco_INCLUDE_DIRS draco_LIBARY_DIRS draco_LIBRARIES
-# draco_INCLUDE_DIRS
-# draco_LIBARY_DIRS
-# draco_LIBRARIES
 # draco_VERSION_STRING
 #
 # draco_FOUND is set to YES only when all other variables are successfully
@@ -28,31 +25,32 @@ set(draco_version_file_no_prefix "draco/src/draco/core/draco_version.h")
 # Set draco_INCLUDE_DIRS
 find_path(draco_INCLUDE_DIRS NAMES "${draco_version_file_no_prefix}")
 
-#  Extract the version string from draco_version.h.
+# Extract the version string from draco_version.h.
-if (draco_INCLUDE_DIRS)
+if(draco_INCLUDE_DIRS)
   set(draco_version_file
       "${draco_INCLUDE_DIRS}/draco/src/draco/core/draco_version.h")
-  file(STRINGS "${draco_version_file}" draco_version
+  file(STRINGS "${draco_version_file}" draco_version REGEX "kdracoVersion")
-       REGEX "kdracoVersion")
   list(GET draco_version 0 draco_version)
   string(REPLACE "static const char kdracoVersion[] = " "" draco_version
-         "${draco_version}")
+                 "${draco_version}")
   string(REPLACE ";" "" draco_version "${draco_version}")
   string(REPLACE "\"" "" draco_version "${draco_version}")
   set(draco_VERSION_STRING ${draco_version})
-endif ()
+endif()
 
 # Find the library.
-if (BUILD_SHARED_LIBS)
+if(BUILD_SHARED_LIBS)
   find_library(draco_LIBRARIES NAMES draco.dll libdraco.dylib libdraco.so)
-else ()
+else()
   find_library(draco_LIBRARIES NAMES draco.lib libdraco.a)
-endif ()
+endif()
 
 # Store path to library.
 get_filename_component(draco_LIBRARY_DIRS ${draco_LIBRARIES} DIRECTORY)
 
-if (draco_INCLUDE_DIRS AND draco_LIBRARY_DIRS AND draco_LIBRARIES AND
+if(draco_INCLUDE_DIRS
-    draco_VERSION_STRING)
+   AND draco_LIBRARY_DIRS
+   AND draco_LIBRARIES
+   AND draco_VERSION_STRING)
   set(draco_FOUND YES)
-endif ()
+endif()

cmake/compiler_flags.cmake

@@ -1,4 +1,6 @@
-if (NOT DRACO_CMAKE_COMPILER_FLAGS_CMAKE_)
+if(DRACO_CMAKE_COMPILER_FLAGS_CMAKE_)
+  return()
+endif()
 set(DRACO_CMAKE_COMPILER_FLAGS_CMAKE_ 1)
 
 include(CheckCCompilerFlag)
@@ -12,195 +14,199 @@ set(DRACO_FAILED_CXX_FLAGS)
 # Checks C compiler for support of $c_flag. Adds $c_flag to $CMAKE_C_FLAGS when
 # the compile test passes. Caches $c_flag in $DRACO_FAILED_C_FLAGS when the test
 # fails.
-macro (add_c_flag_if_supported c_flag)
+macro(add_c_flag_if_supported c_flag)
   unset(C_FLAG_FOUND CACHE)
   string(FIND "${CMAKE_C_FLAGS}" "${c_flag}" C_FLAG_FOUND)
   unset(C_FLAG_FAILED CACHE)
   string(FIND "${DRACO_FAILED_C_FLAGS}" "${c_flag}" C_FLAG_FAILED)
 
-  if (${C_FLAG_FOUND} EQUAL -1 AND ${C_FLAG_FAILED} EQUAL -1)
+  if(${C_FLAG_FOUND} EQUAL -1 AND ${C_FLAG_FAILED} EQUAL -1)
     unset(C_FLAG_SUPPORTED CACHE)
     message("Checking C compiler flag support for: " ${c_flag})
     check_c_compiler_flag("${c_flag}" C_FLAG_SUPPORTED)
-    if (${C_FLAG_SUPPORTED})
+    if(${C_FLAG_SUPPORTED})
       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${c_flag}" CACHE STRING "")
-    else ()
+    else()
-      set(DRACO_FAILED_C_FLAGS "${DRACO_FAILED_C_FLAGS} ${c_flag}" CACHE STRING
+      set(DRACO_FAILED_C_FLAGS
-          "" FORCE)
+          "${DRACO_FAILED_C_FLAGS} ${c_flag}"
-    endif ()
+          CACHE STRING "" FORCE)
-  endif ()
+    endif()
-endmacro ()
+  endif()
+endmacro()
 
 # Checks C++ compiler for support of $cxx_flag. Adds $cxx_flag to
 # $CMAKE_CXX_FLAGS when the compile test passes. Caches $c_flag in
 # $DRACO_FAILED_CXX_FLAGS when the test fails.
-macro (add_cxx_flag_if_supported cxx_flag)
+macro(add_cxx_flag_if_supported cxx_flag)
   unset(CXX_FLAG_FOUND CACHE)
   string(FIND "${CMAKE_CXX_FLAGS}" "${cxx_flag}" CXX_FLAG_FOUND)
   unset(CXX_FLAG_FAILED CACHE)
   string(FIND "${DRACO_FAILED_CXX_FLAGS}" "${cxx_flag}" CXX_FLAG_FAILED)
 
-  if (${CXX_FLAG_FOUND} EQUAL -1 AND ${CXX_FLAG_FAILED} EQUAL -1)
+  if(${CXX_FLAG_FOUND} EQUAL -1 AND ${CXX_FLAG_FAILED} EQUAL -1)
     unset(CXX_FLAG_SUPPORTED CACHE)
     message("Checking CXX compiler flag support for: " ${cxx_flag})
     check_cxx_compiler_flag("${cxx_flag}" CXX_FLAG_SUPPORTED)
-    if (${CXX_FLAG_SUPPORTED})
+    if(${CXX_FLAG_SUPPORTED})
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${cxx_flag}" CACHE STRING "")
     else()
-      set(DRACO_FAILED_CXX_FLAGS "${DRACO_FAILED_CXX_FLAGS} ${cxx_flag}" CACHE
+      set(DRACO_FAILED_CXX_FLAGS
-          STRING "" FORCE)
+          "${DRACO_FAILED_CXX_FLAGS} ${cxx_flag}"
-    endif ()
+          CACHE STRING "" FORCE)
-  endif ()
+    endif()
-endmacro ()
+  endif()
+endmacro()
 
 # Convenience method for adding a flag to both the C and C++ compiler command
 # lines.
-macro (add_compiler_flag_if_supported flag)
+macro(add_compiler_flag_if_supported flag)
   add_c_flag_if_supported(${flag})
   add_cxx_flag_if_supported(${flag})
-endmacro ()
+endmacro()
 
 # Checks C compiler for support of $c_flag and terminates generation when
 # support is not present.
-macro (require_c_flag c_flag update_c_flags)
+macro(require_c_flag c_flag update_c_flags)
   unset(C_FLAG_FOUND CACHE)
   string(FIND "${CMAKE_C_FLAGS}" "${c_flag}" C_FLAG_FOUND)
 
-  if (${C_FLAG_FOUND} EQUAL -1)
+  if(${C_FLAG_FOUND} EQUAL -1)
     unset(HAVE_C_FLAG CACHE)
     message("Checking C compiler flag support for: " ${c_flag})
     check_c_compiler_flag("${c_flag}" HAVE_C_FLAG)
-    if (NOT ${HAVE_C_FLAG})
+    if(NOT ${HAVE_C_FLAG})
-      message(FATAL_ERROR
+      message(
-              "${PROJECT_NAME} requires support for C flag: ${c_flag}.")
+        FATAL_ERROR "${PROJECT_NAME} requires support for C flag: ${c_flag}.")
-    endif ()
+    endif()
-    if (${update_c_flags})
+    if(${update_c_flags})
       set(CMAKE_C_FLAGS "${c_flag} ${CMAKE_C_FLAGS}" CACHE STRING "" FORCE)
-    endif ()
+    endif()
-  endif ()
+  endif()
-endmacro ()
+endmacro()
 
 # Checks CXX compiler for support of $cxx_flag and terminates generation when
 # support is not present.
-macro (require_cxx_flag cxx_flag update_cxx_flags)
+macro(require_cxx_flag cxx_flag update_cxx_flags)
   unset(CXX_FLAG_FOUND CACHE)
   string(FIND "${CMAKE_CXX_FLAGS}" "${cxx_flag}" CXX_FLAG_FOUND)
 
-  if (${CXX_FLAG_FOUND} EQUAL -1)
+  if(${CXX_FLAG_FOUND} EQUAL -1)
     unset(HAVE_CXX_FLAG CACHE)
     message("Checking CXX compiler flag support for: " ${cxx_flag})
     check_cxx_compiler_flag("${cxx_flag}" HAVE_CXX_FLAG)
-    if (NOT ${HAVE_CXX_FLAG})
+    if(NOT ${HAVE_CXX_FLAG})
-      message(FATAL_ERROR
+      message(
-              "${PROJECT_NAME} requires support for CXX flag: ${cxx_flag}.")
+        FATAL_ERROR
-    endif ()
+          "${PROJECT_NAME} requires support for CXX flag: ${cxx_flag}.")
-    if (${update_cxx_flags})
+    endif()
-      set(CMAKE_CXX_FLAGS "${cxx_flag} ${CMAKE_CXX_FLAGS}" CACHE STRING ""
+    if(${update_cxx_flags})
-          FORCE)
+      set(CMAKE_CXX_FLAGS
-    endif ()
+          "${cxx_flag} ${CMAKE_CXX_FLAGS}"
-  endif ()
+          CACHE STRING "" FORCE)
-endmacro ()
+    endif()
+  endif()
+endmacro()
 
 # Checks for support of $flag by both the C and CXX compilers. Terminates
 # generation when support is not present in both compilers.
-macro (require_compiler_flag flag update_cmake_flags)
+macro(require_compiler_flag flag update_cmake_flags)
   require_c_flag(${flag} ${update_cmake_flags})
   require_cxx_flag(${flag} ${update_cmake_flags})
-endmacro ()
+endmacro()
 
 # Checks only non-MSVC targets for support of $c_flag and terminates generation
 # when support is not present.
-macro (require_c_flag_nomsvc c_flag update_c_flags)
+macro(require_c_flag_nomsvc c_flag update_c_flags)
-  if (NOT MSVC)
+  if(NOT MSVC)
     require_c_flag(${c_flag} ${update_c_flags})
-  endif ()
+  endif()
-endmacro ()
+endmacro()
 
 # Checks only non-MSVC targets for support of $cxx_flag and terminates
 # generation when support is not present.
-macro (require_cxx_flag_nomsvc cxx_flag update_cxx_flags)
+macro(require_cxx_flag_nomsvc cxx_flag update_cxx_flags)
-  if (NOT MSVC)
+  if(NOT MSVC)
     require_cxx_flag(${cxx_flag} ${update_cxx_flags})
-  endif ()
+  endif()
-endmacro ()
+endmacro()
 
 # Checks only non-MSVC targets for support of $flag by both the C and CXX
 # compilers. Terminates generation when support is not present in both
 # compilers.
-macro (require_compiler_flag_nomsvc flag update_cmake_flags)
+macro(require_compiler_flag_nomsvc flag update_cmake_flags)
   require_c_flag_nomsvc(${flag} ${update_cmake_flags})
   require_cxx_flag_nomsvc(${flag} ${update_cmake_flags})
-endmacro ()
+endmacro()
 
 # Adds $flag to assembler command line.
-macro (append_as_flag flag)
+macro(append_as_flag flag)
   unset(AS_FLAG_FOUND CACHE)
   string(FIND "${DRACO_AS_FLAGS}" "${flag}" AS_FLAG_FOUND)
 
-  if (${AS_FLAG_FOUND} EQUAL -1)
+  if(${AS_FLAG_FOUND} EQUAL -1)
     set(DRACO_AS_FLAGS "${DRACO_AS_FLAGS} ${flag}")
-  endif ()
+  endif()
-endmacro ()
+endmacro()
 
 # Adds $flag to the C compiler command line.
-macro (append_c_flag flag)
+macro(append_c_flag flag)
   unset(C_FLAG_FOUND CACHE)
   string(FIND "${CMAKE_C_FLAGS}" "${flag}" C_FLAG_FOUND)
 
-  if (${C_FLAG_FOUND} EQUAL -1)
+  if(${C_FLAG_FOUND} EQUAL -1)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}")
-  endif ()
+  endif()
-endmacro ()
+endmacro()
 
 # Adds $flag to the CXX compiler command line.
-macro (append_cxx_flag flag)
+macro(append_cxx_flag flag)
   unset(CXX_FLAG_FOUND CACHE)
   string(FIND "${CMAKE_CXX_FLAGS}" "${flag}" CXX_FLAG_FOUND)
 
-  if (${CXX_FLAG_FOUND} EQUAL -1)
+  if(${CXX_FLAG_FOUND} EQUAL -1)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-  endif ()
+  endif()
-endmacro ()
+endmacro()
 
 # Adds $flag to the C and CXX compiler command lines.
-macro (append_compiler_flag flag)
+macro(append_compiler_flag flag)
   append_c_flag(${flag})
   append_cxx_flag(${flag})
-endmacro ()
+endmacro()
 
 # Adds $flag to the executable linker command line.
-macro (append_exe_linker_flag flag)
+macro(append_exe_linker_flag flag)
   unset(LINKER_FLAG_FOUND CACHE)
   string(FIND "${CMAKE_EXE_LINKER_FLAGS}" "${flag}" LINKER_FLAG_FOUND)
 
-  if (${LINKER_FLAG_FOUND} EQUAL -1)
+  if(${LINKER_FLAG_FOUND} EQUAL -1)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${flag}")
-  endif ()
+  endif()
-endmacro ()
+endmacro()
 
 # Adds $flag to the link flags for $target.
-function (append_link_flag_to_target target flags)
+function(append_link_flag_to_target target flags)
   unset(target_link_flags)
   get_target_property(target_link_flags ${target} LINK_FLAGS)
 
-  if (target_link_flags)
+  if(target_link_flags)
     unset(link_flag_found)
     string(FIND "${target_link_flags}" "${flags}" link_flag_found)
 
-    if (NOT ${link_flag_found} EQUAL -1)
+    if(NOT ${link_flag_found} EQUAL -1)
       return()
-    endif ()
+    endif()
 
     set(target_link_flags "${target_link_flags} ${flags}")
-  else ()
+  else()
     set(target_link_flags "${flags}")
-  endif ()
+  endif()
 
   set_target_properties(${target} PROPERTIES LINK_FLAGS ${target_link_flags})
-endfunction ()
+endfunction()
 
 # Adds $flag to executable linker flags, and makes sure C/CXX builds still work.
-macro (require_linker_flag flag)
+macro(require_linker_flag flag)
   append_exe_linker_flag(${flag})
 
   unset(c_passed)
@@ -208,9 +214,7 @@ macro (require_linker_flag flag)
   unset(cxx_passed)
   draco_check_cxx_compiles("LINKER_FLAG_CXX_TEST(${flag})" "" cxx_passed)
 
-  if (NOT c_passed OR NOT cxx_passed)
+  if(NOT c_passed OR NOT cxx_passed)
     message(FATAL_ERROR "Linker flag test for ${flag} failed.")
-  endif ()
+  endif()
-endmacro ()
+endmacro()
-
-endif ()  # DRACO_CMAKE_COMPILER_FLAGS_CMAKE_

cmake/compiler_tests.cmake

@@ -1,4 +1,6 @@
-if (NOT DRACO_CMAKE_COMPILER_TESTS_CMAKE_)
+if(DRACO_CMAKE_COMPILER_TESTS_CMAKE_)
+  return()
+endif()
 set(DRACO_CMAKE_COMPILER_TESTS_CMAKE_ 1)
 
 include(CheckCSourceCompiles)
@@ -17,41 +19,41 @@ set(DRACO_CXX_FAILED_TESTS)
 macro(draco_push_var var new_value)
   set(SAVED_${var} ${var})
   set(${var} ${new_value})
-endmacro ()
+endmacro()
 
 macro(draco_pop_var var)
   set(var ${SAVED_${var}})
   unset(SAVED_${var})
-endmacro ()
+endmacro()
 
 # Confirms $test_source compiles and stores $test_name in one of
 # $DRACO_C_PASSED_TESTS or $DRACO_C_FAILED_TESTS depending on out come. When the
-# test passes $result_var is set to 1. When it fails $result_var is unset.
+# test passes $result_var is set to 1. When it fails $result_var is unset. The
-# The test is not run if the test name is found in either of the passed or
+# test is not run if the test name is found in either of the passed or failed
-# failed test variables.
+# test variables.
 macro(draco_check_c_compiles test_name test_source result_var)
   unset(C_TEST_PASSED CACHE)
   unset(C_TEST_FAILED CACHE)
   string(FIND "${DRACO_C_PASSED_TESTS}" "${test_name}" C_TEST_PASSED)
   string(FIND "${DRACO_C_FAILED_TESTS}" "${test_name}" C_TEST_FAILED)
-  if (${C_TEST_PASSED} EQUAL -1 AND ${C_TEST_FAILED} EQUAL -1)
+  if(${C_TEST_PASSED} EQUAL -1 AND ${C_TEST_FAILED} EQUAL -1)
     unset(C_TEST_COMPILED CACHE)
     message("Running C compiler test: ${test_name}")
     check_c_source_compiles("${test_source} ${DRACO_C_MAIN}" C_TEST_COMPILED)
     set(${result_var} ${C_TEST_COMPILED})
 
-    if (${C_TEST_COMPILED})
+    if(${C_TEST_COMPILED})
       set(DRACO_C_PASSED_TESTS "${DRACO_C_PASSED_TESTS} ${test_name}")
-    else ()
+    else()
       set(DRACO_C_FAILED_TESTS "${DRACO_C_FAILED_TESTS} ${test_name}")
       message("C Compiler test ${test_name} failed.")
-    endif ()
+    endif()
-  elseif (NOT ${C_TEST_PASSED} EQUAL -1)
+  elseif(NOT ${C_TEST_PASSED} EQUAL -1)
     set(${result_var} 1)
-  else ()  # ${C_TEST_FAILED} NOT EQUAL -1
+  else() # ${C_TEST_FAILED} NOT EQUAL -1
     unset(${result_var})
-  endif ()
+  endif()
-endmacro ()
+endmacro()
 
 # Confirms $test_source compiles and stores $test_name in one of
 # $DRACO_CXX_PASSED_TESTS or $DRACO_CXX_FAILED_TESTS depending on out come. When
@@ -63,42 +65,39 @@ macro(draco_check_cxx_compiles test_name test_source result_var)
   unset(CXX_TEST_FAILED CACHE)
   string(FIND "${DRACO_CXX_PASSED_TESTS}" "${test_name}" CXX_TEST_PASSED)
   string(FIND "${DRACO_CXX_FAILED_TESTS}" "${test_name}" CXX_TEST_FAILED)
-  if (${CXX_TEST_PASSED} EQUAL -1 AND ${CXX_TEST_FAILED} EQUAL -1)
+  if(${CXX_TEST_PASSED} EQUAL -1 AND ${CXX_TEST_FAILED} EQUAL -1)
     unset(CXX_TEST_COMPILED CACHE)
     message("Running CXX compiler test: ${test_name}")
     check_cxx_source_compiles("${test_source} ${DRACO_CXX_MAIN}"
                               CXX_TEST_COMPILED)
     set(${result_var} ${CXX_TEST_COMPILED})
 
-    if (${CXX_TEST_COMPILED})
+    if(${CXX_TEST_COMPILED})
       set(DRACO_CXX_PASSED_TESTS "${DRACO_CXX_PASSED_TESTS} ${test_name}")
-    else ()
+    else()
       set(DRACO_CXX_FAILED_TESTS "${DRACO_CXX_FAILED_TESTS} ${test_name}")
       message("CXX Compiler test ${test_name} failed.")
-    endif ()
+    endif()
-  elseif (NOT ${CXX_TEST_PASSED} EQUAL -1)
+  elseif(NOT ${CXX_TEST_PASSED} EQUAL -1)
     set(${result_var} 1)
-  else ()  # ${CXX_TEST_FAILED} NOT EQUAL -1
+  else() # ${CXX_TEST_FAILED} NOT EQUAL -1
     unset(${result_var})
-  endif ()
+  endif()
-endmacro ()
+endmacro()
 
 # Convenience macro that confirms $test_source compiles as C and C++.
 # $result_var is set to 1 when both tests are successful, and 0 when one or both
-# tests fail.
+# tests fail. Note: This macro is intended to be used to write to result
-# Note: This macro is intended to be used to write to result variables that
+# variables that are expanded via configure_file(). $result_var is set to 1 or 0
-# are expanded via configure_file(). $result_var is set to 1 or 0 to allow
+# to allow direct usage of the value in generated source files.
-# direct usage of the value in generated source files.
 macro(draco_check_source_compiles test_name test_source result_var)
   unset(C_PASSED)
   unset(CXX_PASSED)
   draco_check_c_compiles(${test_name} ${test_source} C_PASSED)
   draco_check_cxx_compiles(${test_name} ${test_source} CXX_PASSED)
-  if (${C_PASSED} AND ${CXX_PASSED})
+  if(${C_PASSED} AND ${CXX_PASSED})
     set(${result_var} 1)
-  else ()
+  else()
     set(${result_var} 0)
-  endif ()
+  endif()
-endmacro ()
+endmacro()
-
-endif ()  # DRACO_CMAKE_COMPILER_TESTS_CMAKE_

cmake/draco_features.cmake

@@ -1,4 +1,6 @@
-if (NOT DRACO_CMAKE_DRACO_FEATURES_CMAKE_)
+if(DRACO_CMAKE_DRACO_FEATURES_CMAKE_)
+  return()
+endif()
 set(DRACO_CMAKE_DRACO_FEATURES_CMAKE_ 1)
 
 set(draco_features_file_name "${draco_build_dir}/draco/draco_features.h")
@@ -7,51 +9,48 @@ set(draco_features_list)
 # Macro that handles tracking of Draco preprocessor symbols for the purpose of
 # producing draco_features.h.
 #
-# draco_enable_feature(FEATURE <feature_name> [TARGETS <target_name>])
+# draco_enable_feature(FEATURE <feature_name> [TARGETS <target_name>]) FEATURE
-#   FEATURE is required. It should be a Draco preprocessor symbol.
+# is required. It should be a Draco preprocessor symbol. TARGETS is optional. It
-#   TARGETS is optional. It can be one or more draco targets.
+# can be one or more draco targets.
 #
 # When the TARGETS argument is not present the preproc symbol is added to
 # draco_features.h. When it is draco_features.h is unchanged, and
 # target_compile_options() is called for each target specified.
-macro (draco_enable_feature)
+macro(draco_enable_feature)
   set(def_flags)
   set(def_single_arg_opts FEATURE)
   set(def_multi_arg_opts TARGETS)
   cmake_parse_arguments(DEF "${def_flags}" "${def_single_arg_opts}"
                         "${def_multi_arg_opts}" ${ARGN})
-  if ("${DEF_FEATURE}" STREQUAL "")
+  if("${DEF_FEATURE}" STREQUAL "")
     message(FATAL_ERROR "Empty FEATURE passed to draco_enable_feature().")
-  endif ()
+  endif()
 
   # Do nothing/return early if $DEF_FEATURE is already in the list.
   list(FIND draco_features_list ${DEF_FEATURE} df_index)
-  if (NOT df_index EQUAL -1)
+  if(NOT df_index EQUAL -1)
-    return ()
+    return()
-  endif ()
+  endif()
 
   list(LENGTH DEF_TARGETS df_targets_list_length)
-  if (${df_targets_list_length} EQUAL 0)
+  if(${df_targets_list_length} EQUAL 0)
     list(APPEND draco_features_list ${DEF_FEATURE})
-  else ()
+  else()
-    foreach (target ${DEF_TARGETS})
+    foreach(target ${DEF_TARGETS})
       target_compile_definitions(${target} PRIVATE ${DEF_FEATURE})
-    endforeach ()
+    endforeach()
-  endif ()
+  endif()
-endmacro ()
+endmacro()
 
 # Function for generating draco_features.h.
-function (draco_generate_features_h)
+function(draco_generate_features_h)
   file(WRITE "${draco_features_file_name}"
-       "// GENERATED FILE -- DO NOT EDIT\n\n"
+       "// GENERATED FILE -- DO NOT EDIT\n\n" "#ifndef DRACO_FEATURES_H_\n"
-       "#ifndef DRACO_FEATURES_H_\n"
        "#define DRACO_FEATURES_H_\n\n")
 
-  foreach (feature ${draco_features_list})
+  foreach(feature ${draco_features_list})
     file(APPEND "${draco_features_file_name}" "#define ${feature}\n")
-  endforeach ()
+  endforeach()
 
   file(APPEND "${draco_features_file_name}" "\n#endif  // DRACO_FEATURES_H_")
-endfunction ()
+endfunction()
-
-endif ()  # DRACO_CMAKE_DRACO_FEATURES_CMAKE_

cmake/msvc_runtime.cmake

@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 3.2)
 
-if (MSVC)
+if(MSVC)
   # Use statically linked versions of the MS standard libraries.
-  if (NOT "${MSVC_RUNTIME}" STREQUAL "dll")
+  if(NOT "${MSVC_RUNTIME}" STREQUAL "dll")
-    foreach (flag_var
+    foreach(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG
-             CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+            CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL
-             CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+            CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-      if (${flag_var} MATCHES "/MD")
+      if(${flag_var} MATCHES "/MD")
         string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-      endif ()
+      endif()
-    endforeach ()
+    endforeach()
-  endif ()
+  endif()
-endif ()
+endif()

cmake/sanitizers.cmake

@@ -1,9 +1,11 @@
-if (NOT DRACO_CMAKE_SANITIZERS_CMAKE_)
+if(DRACO_CMAKE_SANITIZERS_CMAKE_)
+  return()
+endif()
 set(DRACO_CMAKE_SANITIZERS_CMAKE_ 1)
 
-if (MSVC OR NOT SANITIZE)
+if(MSVC OR NOT SANITIZE)
-  return ()
+  return()
-endif ()
+endif()
 
 include("${draco_root}/cmake/compiler_flags.cmake")
 
@@ -15,5 +17,3 @@ require_compiler_flag("-fsanitize=${SANITIZE}" YES)
 
 # Make callstacks accurate.
 require_compiler_flag("-fno-omit-frame-pointer -fno-optimize-sibling-calls" YES)
-
-endif()  # DRACO_CMAKE_SANITIZERS_CMAKE_

cmake/toolchains/android-ndk-common.cmake

@@ -0,0 +1,11 @@
+if(DRACO_CMAKE_TOOLCHAINS_ANDROID_NDK_COMMON_CMAKE_)
+  return()
+endif()
+set(DRACO_CMAKE_TOOLCHAINS_ANDROID_NDK_COMMON_CMAKE_ 1)
+
+include("${CMAKE_CURRENT_LIST_DIR}/../util.cmake")
+
+require_variable(CMAKE_ANDROID_NDK)
+set(CMAKE_SYSTEM_NAME Android)
+set_variable_if_unset(CMAKE_ANDROID_STL_TYPE c++_static)
+set_variable_if_unset(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang)

cmake/toolchains/arm-ios-common.cmake

@@ -1,4 +1,6 @@
-if (NOT DRACO_CMAKE_TOOLCHAINS_ARM_IOS_COMMON_CMAKE_)
+if(DRACO_CMAKE_TOOLCHAINS_ARM_IOS_COMMON_CMAKE_)
+  return()
+endif()
 set(DRACO_CMAKE_ARM_IOS_COMMON_CMAKE_ 1)
 
 set(CMAKE_SYSTEM_NAME "Darwin")
@@ -9,5 +11,3 @@ set(CMAKE_CXX_COMPILER clang++)
 set(CMAKE_CXX_COMPILER_ARG1 "-arch ${CMAKE_SYSTEM_PROCESSOR}")
 
 # TODO(tomfinegan): Handle bit code embedding.
-
-endif ()  # DRACO_CMAKE_TOOLCHAINS_ARM_IOS_COMMON_CMAKE_

cmake/toolchains/arm64-android-ndk-libcpp.cmake

@@ -1,12 +1,10 @@
-if (NOT DRACO_CMAKE_TOOLCHAINS_ARM64_ANDROID_NDK_LIBCPP_CMAKE_)
+if(DRACO_CMAKE_TOOLCHAINS_ARM64_ANDROID_NDK_LIBCPP_CMAKE_)
+  return()
+endif()
 set(DRACO_CMAKE_TOOLCHAINS_ARM64_ANDROID_NDK_LIBCPP_CMAKE_ 1)
 
 include("${CMAKE_CURRENT_LIST_DIR}/../util.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/android-ndk-common.cmake")
 
-set(CMAKE_SYSTEM_NAME Android)
 set(CMAKE_ANDROID_ARCH_ABI arm64-v8a)
-require_variable(CMAKE_ANDROID_NDK)
 set_variable_if_unset(CMAKE_SYSTEM_VERSION 21)
-set_variable_if_unset(CMAKE_ANDROID_STL_TYPE c++_static)
-
-endif ()  # DRACO_CMAKE_TOOLCHAINS_ARM64_ANDROID_NDK_LIBCPP_CMAKE_

cmake/toolchains/arm64-ios.cmake

@@ -1,14 +1,14 @@
-if (NOT DRACO_CMAKE_TOOLCHAINS_ARM64_IOS_CMAKE_)
+if(DRACO_CMAKE_TOOLCHAINS_ARM64_IOS_CMAKE_)
+  return()
+endif()
 set(DRACO_CMAKE_TOOLCHAINS_ARM64_IOS_CMAKE_ 1)
 
-if (XCODE)
+if(XCODE)
   # TODO(tomfinegan): Handle arm builds in Xcode.
   message(FATAL_ERROR "This toolchain does not support Xcode.")
-endif ()
+endif()
 
 set(CMAKE_SYSTEM_PROCESSOR "arm64")
 set(CMAKE_OSX_ARCHITECTURES "arm64")
 
 include("${CMAKE_CURRENT_LIST_DIR}/arm-ios-common.cmake")
-
-endif ()  # DRACO_CMAKE_TOOLCHAINS_ARM64_IOS_CMAKE_

cmake/toolchains/arm64-linux-gcc.cmake

@@ -1,12 +1,14 @@
-if (NOT DRACO_CMAKE_TOOLCHAINS_ARM64_LINUX_GCC_CMAKE_)
+if(DRACO_CMAKE_TOOLCHAINS_ARM64_LINUX_GCC_CMAKE_)
+  return()
+endif()
 set(DRACO_CMAKE_TOOLCHAINS_ARM64_LINUX_GCC_CMAKE_ 1)
 
 set(CMAKE_SYSTEM_NAME "Linux")
 
-if ("${CROSS}" STREQUAL "")
+if("${CROSS}" STREQUAL "")
   # Default the cross compiler prefix to something known to work.
   set(CROSS aarch64-linux-gnu-)
-endif ()
+endif()
 
 set(CMAKE_C_COMPILER ${CROSS}gcc)
 set(CMAKE_CXX_COMPILER ${CROSS}g++)
@@ -14,5 +16,3 @@ set(AS_EXECUTABLE ${CROSS}as)
 set(CMAKE_C_COMPILER_ARG1 "-march=armv8-a")
 set(CMAKE_CXX_COMPILER_ARG1 "-march=armv8-a")
 set(CMAKE_SYSTEM_PROCESSOR "arm64")
-
-endif ()  # DRACO_CMAKE_TOOLCHAINS_ARM64_LINUX_GCC_CMAKE_

cmake/toolchains/armv7-android-ndk-libcpp.cmake

@@ -1,12 +1,10 @@
-if (NOT DRACO_CMAKE_TOOLCHAINS_ARMV7_ANDROID_NDK_LIBCPP_CMAKE_)
+if(DRACO_CMAKE_TOOLCHAINS_ARMV7_ANDROID_NDK_LIBCPP_CMAKE_)
+  return()
+endif()
 set(DRACO_CMAKE_TOOLCHAINS_ARMV7_ANDROID_NDK_LIBCPP_CMAKE_ 1)
 
 include("${CMAKE_CURRENT_LIST_DIR}/../util.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/android-ndk-common.cmake")
 
-set(CMAKE_SYSTEM_NAME Android)
 set(CMAKE_ANDROID_ARCH_ABI armeabi-v7a)
-require_variable(CMAKE_ANDROID_NDK)
 set_variable_if_unset(CMAKE_SYSTEM_VERSION 18)
-set_variable_if_unset(CMAKE_ANDROID_STL_TYPE c++_static)
-
-endif ()  # DRACO_CMAKE_TOOLCHAINS_ARMV7_ANDROID_NDK_LIBCPP_CMAKE_

cmake/toolchains/armv7-ios.cmake

@@ -1,14 +1,14 @@
-if (NOT DRACO_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_)
+if(DRACO_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_)
+  return()
+endif()
 set(DRACO_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_ 1)
 
-if (XCODE)
+if(XCODE)
   # TODO(tomfinegan): Handle arm builds in Xcode.
   message(FATAL_ERROR "This toolchain does not support Xcode.")
-endif ()
+endif()
 
 set(CMAKE_SYSTEM_PROCESSOR "armv7")
 set(CMAKE_OSX_ARCHITECTURES "armv7")
 
 include("${CMAKE_CURRENT_LIST_DIR}/arm-ios-common.cmake")
-
-endif ()  # DRACO_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_

cmake/toolchains/armv7-linux-gcc.cmake

@@ -1,16 +1,18 @@
-if (NOT DRACO_CMAKE_TOOLCHAINS_ARMV7_LINUX_GCC_CMAKE_)
+if(DRACO_CMAKE_TOOLCHAINS_ARMV7_LINUX_GCC_CMAKE_)
+  return()
+endif()
 set(DRACO_CMAKE_TOOLCHAINS_ARMV7_LINUX_GCC_CMAKE_ 1)
 
 set(CMAKE_SYSTEM_NAME "Linux")
 
-if ("${CROSS}" STREQUAL "")
+if("${CROSS}" STREQUAL "")
   # Default the cross compiler prefix to something known to work.
   set(CROSS arm-linux-gnueabihf-)
-endif ()
+endif()
 
-if (NOT ${CROSS} MATCHES hf-$)
+if(NOT ${CROSS} MATCHES hf-$)
   set(DRACO_EXTRA_TOOLCHAIN_FLAGS "-mfloat-abi=softfp")
-endif ()
+endif()
 
 set(CMAKE_C_COMPILER ${CROSS}gcc)
 set(CMAKE_CXX_COMPILER ${CROSS}g++)
@@ -20,5 +22,3 @@ set(CMAKE_C_COMPILER_ARG1
 set(CMAKE_CXX_COMPILER_ARG1
     "-march=armv7-a -mfpu=neon ${DRACO_EXTRA_TOOLCHAIN_FLAGS}")
 set(CMAKE_SYSTEM_PROCESSOR "armv7")
-
-endif ()  # DRACO_CMAKE_TOOLCHAINS_ARMV7_LINUX_GCC_CMAKE_

cmake/toolchains/armv7s-ios.cmake

@@ -1,14 +1,14 @@
-if (NOT DRACO_CMAKE_TOOLCHAINS_ARMV7S_IOS_CMAKE_)
+if(DRACO_CMAKE_TOOLCHAINS_ARMV7S_IOS_CMAKE_)
+  return()
+endif()
 set(DRACO_CMAKE_TOOLCHAINS_ARMV7S_IOS_CMAKE_ 1)
 
-if (XCODE)
+if(XCODE)
   # TODO(tomfinegan): Handle arm builds in Xcode.
   message(FATAL_ERROR "This toolchain does not support Xcode.")
-endif ()
+endif()
 
 set(CMAKE_SYSTEM_PROCESSOR "armv7s")
 set(CMAKE_OSX_ARCHITECTURES "armv7s")
 
 include("${CMAKE_CURRENT_LIST_DIR}/arm-ios-common.cmake")
-
-endif ()  # DRACO_CMAKE_TOOLCHAINS_ARMV7S_IOS_CMAKE_

cmake/toolchains/default-android-ndk-libcpp.cmake

@@ -0,0 +1,7 @@
+if(DRACO_CMAKE_TOOLCHAINS_DEFAULT_ANDROID_NDK_LIBCPP_CMAKE_)
+  return()
+endif()
+set(DRACO_CMAKE_TOOLCHAINS_DEFAULT_ANDROID_NDK_LIBCPP_CMAKE_ 1)
+
+include("${CMAKE_CURRENT_LIST_DIR}/../util.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/android-ndk-common.cmake")

cmake/toolchains/x86-android-ndk-libcpp.cmake

@@ -1,12 +1,10 @@
-if (NOT DRACO_CMAKE_TOOLCHAINS_X86_ANDROID_NDK_LIBCPP_CMAKE_)
+if(DRACO_CMAKE_TOOLCHAINS_X86_ANDROID_NDK_LIBCPP_CMAKE_)
+  return()
+endif()
 set(DRACO_CMAKE_TOOLCHAINS_X86_ANDROID_NDK_LIBCPP_CMAKE_ 1)
 
 include("${CMAKE_CURRENT_LIST_DIR}/../util.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/android-ndk-common.cmake")
 
-set(CMAKE_SYSTEM_NAME Android)
 set(CMAKE_ANDROID_ARCH_ABI x86)
-require_variable(CMAKE_ANDROID_NDK)
 set_variable_if_unset(CMAKE_SYSTEM_VERSION 18)
-set_variable_if_unset(CMAKE_ANDROID_STL_TYPE c++_static)
-
-endif ()  # DRACO_CMAKE_TOOLCHAINS_X86_ANDROID_NDK_LIBCPP_CMAKE_

cmake/toolchains/x86_64-android-ndk-libcpp.cmake

@@ -1,12 +1,10 @@
-if (NOT DRACO_CMAKE_TOOLCHAINS_X86_64_ANDROID_NDK_LIBCPP_CMAKE_)
+if(DRACO_CMAKE_TOOLCHAINS_X86_64_ANDROID_NDK_LIBCPP_CMAKE_)
+  return()
+endif()
 set(DRACO_CMAKE_TOOLCHAINS_X86_64_ANDROID_NDK_LIBCPP_CMAKE_ 1)
 
 include("${CMAKE_CURRENT_LIST_DIR}/../util.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/android-ndk-common.cmake")
 
-set(CMAKE_SYSTEM_NAME Android)
 set(CMAKE_ANDROID_ARCH_ABI x86_64)
-require_variable(CMAKE_ANDROID_NDK)
 set_variable_if_unset(CMAKE_SYSTEM_VERSION 21)
-set_variable_if_unset(CMAKE_ANDROID_STL_TYPE c++_static)
-
-endif ()  # DRACO_CMAKE_TOOLCHAINS_X86_64_ANDROID_NDK_LIBCPP_CMAKE_

cmake/util.cmake

@@ -1,10 +1,12 @@
-if (NOT DRACO_CMAKE_UTIL_CMAKE_)
+if(DRACO_CMAKE_UTIL_CMAKE_)
+  return()
+endif()
 set(DRACO_CMAKE_UTIL_CMAKE_ 1)
 
 # Creates dummy source file in $draco_build_dir named $basename.$extension and
 # returns the full path to the dummy source file via the $out_file_path
 # parameter.
-function (create_dummy_source_file basename extension out_file_path)
+function(create_dummy_source_file basename extension out_file_path)
   set(dummy_source_file "${draco_build_dir}/${basename}.${extension}")
   file(WRITE "${dummy_source_file}"
        "// Generated file. DO NOT EDIT!\n"
@@ -12,63 +14,60 @@ function (create_dummy_source_file basename extension out_file_path)
        "// or to silence a harmless CMake warning: Ignore me.\n"
        "void ${target_name}_dummy_function(void) {}\n")
   set(${out_file_path} ${dummy_source_file} PARENT_SCOPE)
-endfunction ()
+endfunction()
 
 # Convenience function for adding a dummy source file to $target_name using
 # $extension as the file extension. Wraps create_dummy_source_file().
-function (add_dummy_source_file_to_target target_name extension)
+function(add_dummy_source_file_to_target target_name extension)
   create_dummy_source_file("${target_name}" "${extension}" "dummy_source_file")
   target_sources(${target_name} PRIVATE ${dummy_source_file})
-endfunction ()
+endfunction()
 
 # Extracts the version number from $version_file and returns it to the user via
-# $version_string_out_var. This is achieved by finding the first instance of
+# $version_string_out_var. This is achieved by finding the first instance of the
-# the kDracoVersion variable and then removing everything but the string literal
+# kDracoVersion variable and then removing everything but the string literal
 # assigned to the variable. Quotes and semicolon are stripped from the returned
 # string.
-function (extract_version_string version_file version_string_out_var)
+function(extract_version_string version_file version_string_out_var)
   file(STRINGS "${version_file}" draco_version REGEX "kDracoVersion")
   list(GET draco_version 0 draco_version)
   string(REPLACE "static const char kDracoVersion[] = " "" draco_version
-         "${draco_version}")
+                 "${draco_version}")
   string(REPLACE ";" "" draco_version "${draco_version}")
   string(REPLACE "\"" "" draco_version "${draco_version}")
   set("${version_string_out_var}" "${draco_version}" PARENT_SCOPE)
-endfunction ()
+endfunction()
 
 # Sets CMake compiler launcher to $launcher_name when $launcher_name is found in
 # $PATH. Warns user about ignoring build flag $launcher_flag when $launcher_name
 # is not found in $PATH.
-function (set_compiler_launcher launcher_flag launcher_name)
+function(set_compiler_launcher launcher_flag launcher_name)
   find_program(launcher_path "${launcher_name}")
-  if (launcher_path)
+  if(launcher_path)
     set(CMAKE_C_COMPILER_LAUNCHER "${launcher_path}" PARENT_SCOPE)
     set(CMAKE_CXX_COMPILER_LAUNCHER "${launcher_path}" PARENT_SCOPE)
     message("--- Using ${launcher_name} as compiler launcher.")
-  else ()
+  else()
-    message(WARNING
+    message(
-            "--- Cannot find ${launcher_name}, ${launcher_flag} ignored.")
+      WARNING "--- Cannot find ${launcher_name}, ${launcher_flag} ignored.")
-  endif ()
+  endif()
-endfunction ()
+endfunction()
 
 # Terminates CMake execution when $var_name is unset in the environment. Sets
 # CMake variable to the value of the environment variable when the variable is
 # present in the environment.
 macro(require_variable var_name)
-  if ("$ENV{${var_name}}" STREQUAL "")
+  if("$ENV{${var_name}}" STREQUAL "")
     message(FATAL_ERROR "${var_name} must be set in environment.")
-  endif ()
+  endif()
   set_variable_if_unset(${var_name} "")
-endmacro ()
+endmacro()
 
-# Sets $var_name to $default_value if not already set in the environment.
+# Sets $var_name to $default_value if not already set.
-macro (set_variable_if_unset var_name default_value)
+macro(set_variable_if_unset var_name default_value)
-  if (NOT "$ENV{${var_name}}" STREQUAL "")
+  if(NOT "$ENV{${var_name}}" STREQUAL "")
     set(${var_name} $ENV{${var_name}})
-  else ()
+  elseif(NOT ${var_name})
     set(${var_name} ${default_value})
-  endif ()
+  endif()
-endmacro ()
+endmacro()
-
-endif()  # DRACO_CMAKE_UTIL_CMAKE_
-