cmake: change include guard cmake-format will indent the body of the include guard. Use a style which does not put the body inside the guard. https://cmake.org/Wiki/CMake_Performance_Tips#Use_an_include_guard Rename cbuild/cmake/aom_config.c.cmake to .template to simplify upcoming formatting. Change-Id: I70724683d5e581f1b4f69418ed185e0b92df27c3
diff --git a/aom_dsp/aom_dsp.cmake b/aom_dsp/aom_dsp.cmake index 4a19d1e..51fe930 100644 --- a/aom_dsp/aom_dsp.cmake +++ b/aom_dsp/aom_dsp.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_AOM_DSP_AOM_DSP_CMAKE_) +if (AOM_AOM_DSP_AOM_DSP_CMAKE_) + return() +endif () # AOM_AOM_DSP_AOM_DSP_CMAKE_ set(AOM_AOM_DSP_AOM_DSP_CMAKE_ 1) set(AOM_DSP_COMMON_SOURCES @@ -472,5 +474,3 @@ # $AOM_LIB_TARGETS. set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} PARENT_SCOPE) endfunction () - -endif () # AOM_AOM_DSP_AOM_DSP_CMAKE_
diff --git a/aom_mem/aom_mem.cmake b/aom_mem/aom_mem.cmake index a142824..3af78d0 100644 --- a/aom_mem/aom_mem.cmake +++ b/aom_mem/aom_mem.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_AOM_MEM_AOM_MEM_CMAKE_) +if (AOM_AOM_MEM_AOM_MEM_CMAKE_) + return() +endif () # AOM_AOM_MEM_AOM_MEM_CMAKE_ set(AOM_AOM_MEM_AOM_MEM_CMAKE_ 1) set(AOM_MEM_SOURCES @@ -23,5 +25,3 @@ set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_mem PARENT_SCOPE) target_sources(aom PRIVATE $<TARGET_OBJECTS:aom_mem>) endfunction () - -endif () # AOM_AOM_MEM_AOM_MEM_CMAKE_
diff --git a/aom_ports/aom_ports.cmake b/aom_ports/aom_ports.cmake index e1ffb56..7e28342 100644 --- a/aom_ports/aom_ports.cmake +++ b/aom_ports/aom_ports.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_AOM_PORTS_AOM_PORTS_CMAKE_) +if (AOM_AOM_PORTS_AOM_PORTS_CMAKE_) + return() +endif () # AOM_AOM_PORTS_AOM_PORTS_CMAKE_ set(AOM_AOM_PORTS_AOM_PORTS_CMAKE_ 1) set(AOM_PORTS_INCLUDES @@ -66,5 +68,3 @@ endif () endif () endfunction () - -endif () # AOM_AOM_PORTS_AOM_PORTS_CMAKE_
diff --git a/aom_scale/aom_scale.cmake b/aom_scale/aom_scale.cmake index 1c00b59..d9c7a71 100644 --- a/aom_scale/aom_scale.cmake +++ b/aom_scale/aom_scale.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_AOM_SCALE_AOM_SCALE_CMAKE_) +if (AOM_AOM_SCALE_AOM_SCALE_CMAKE_) + return() +endif () # AOM_AOM_SCALE_AOM_SCALE_CMAKE_ set(AOM_AOM_SCALE_AOM_SCALE_CMAKE_ 1) set(AOM_SCALE_SOURCES @@ -35,5 +37,3 @@ set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_scale PARENT_SCOPE) endfunction () - -endif () # AOM_AOM_SCALE_AOM_SCALE_CMAKE_
diff --git a/aom_util/aom_util.cmake b/aom_util/aom_util.cmake index 34e2261..9fa6947 100644 --- a/aom_util/aom_util.cmake +++ b/aom_util/aom_util.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_AOM_UTIL_AOM_UTIL_CMAKE_) +if (AOM_AOM_UTIL_AOM_UTIL_CMAKE_) + return() +endif () # AOM_AOM_UTIL_AOM_UTIL_CMAKE_ set(AOM_AOM_UTIL_AOM_UTIL_CMAKE_ 1) set(AOM_UTIL_SOURCES @@ -25,5 +27,3 @@ set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_util PARENT_SCOPE) target_sources(aom PRIVATE $<TARGET_OBJECTS:aom_util>) endfunction () - -endif () # AOM_AOM_UTIL_AOM_UTIL_CMAKE_
diff --git a/av1/av1.cmake b/av1/av1.cmake index 9be05d2..7b6b976 100644 --- a/av1/av1.cmake +++ b/av1/av1.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_AV1_AV1_CMAKE_) +if (AOM_AV1_AV1_CMAKE_) + return() +endif () # AOM_AV1_AV1_CMAKE_ set(AOM_AV1_AV1_CMAKE_ 1) set(AOM_AV1_COMMON_SOURCES @@ -625,5 +627,3 @@ function (setup_av1_test_targets) endfunction () - -endif () # AOM_AV1_AV1_CMAKE_
diff --git a/build/cmake/aom_config.c.cmake b/build/cmake/aom_config.c.template similarity index 100% rename from build/cmake/aom_config.c.cmake rename to build/cmake/aom_config.c.template
diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake index d9f480b..20b6daa 100644 --- a/build/cmake/aom_configure.cmake +++ b/build/cmake/aom_configure.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_AOM_CONFIGURE_CMAKE_) +if (AOM_BUILD_CMAKE_AOM_CONFIGURE_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_AOM_CONFIGURE_CMAKE_ set(AOM_BUILD_CMAKE_AOM_CONFIGURE_CMAKE_ 1) include(FindGit) @@ -313,7 +315,7 @@ message("--- Git missing, version will be read from CHANGELOG.") endif () -configure_file("${AOM_ROOT}/build/cmake/aom_config.c.cmake" +configure_file("${AOM_ROOT}/build/cmake/aom_config.c.template" "${AOM_CONFIG_DIR}/aom_config.c") # Find Perl and generate the RTCD sources. @@ -375,5 +377,3 @@ -DHAVE_PTHREAD_H=${HAVE_PTHREAD_H} -P "${AOM_ROOT}/build/cmake/pkg_config.cmake") endif () - -endif () # AOM_BUILD_CMAKE_AOM_CONFIGURE_CMAKE_
diff --git a/build/cmake/aom_experiment_deps.cmake b/build/cmake/aom_experiment_deps.cmake index c8b15c8..9e8a532 100644 --- a/build/cmake/aom_experiment_deps.cmake +++ b/build/cmake/aom_experiment_deps.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_AOM_EXPERIMENT_DEPS_CMAKE_) +if (AOM_BUILD_CMAKE_AOM_EXPERIMENT_DEPS_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_AOM_EXPERIMENT_DEPS_CMAKE_ set(AOM_BUILD_CMAKE_AOM_EXPERIMENT_DEPS_CMAKE_ 1) # Adjusts CONFIG_* CMake variables to address conflicts between active AV1 @@ -26,5 +28,3 @@ endif() endmacro () - -endif () # AOM_BUILD_CMAKE_AOM_EXPERIMENT_DEPS_CMAKE_
diff --git a/build/cmake/aom_optimization.cmake b/build/cmake/aom_optimization.cmake index f5ea3d1..15c7074 100644 --- a/build/cmake/aom_optimization.cmake +++ b/build/cmake/aom_optimization.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_AOM_OPTIMIZATION_CMAKE_) +if (AOM_BUILD_CMAKE_AOM_OPTIMIZATION_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_AOM_OPTIMIZATION_CMAKE_ set(AOM_BUILD_CMAKE_AOM_OPTIMIZATION_CMAKE_ 1) include("${AOM_ROOT}/build/cmake/util.cmake") @@ -263,5 +265,3 @@ set_property(SOURCE ${source} PROPERTY OBJECT_DEPENDS ${output}) set_property(SOURCE ${output} PROPERTY GENERATED) endfunction () - -endif () # AOM_BUILD_CMAKE_AOM_OPTIMIZATION_CMAKE_
diff --git a/build/cmake/compiler_flags.cmake b/build/cmake/compiler_flags.cmake index b252995..93b1bbf 100644 --- a/build/cmake/compiler_flags.cmake +++ b/build/cmake/compiler_flags.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_COMPILER_FLAGS_CMAKE_) +if (AOM_BUILD_CMAKE_COMPILER_FLAGS_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_COMPILER_FLAGS_CMAKE_ set(AOM_BUILD_CMAKE_COMPILER_FLAGS_CMAKE_ 1) include(CheckCCompilerFlag) @@ -368,5 +370,3 @@ endif () endif () endfunction () - -endif () # AOM_BUILD_CMAKE_COMPILER_FLAGS_CMAKE_
diff --git a/build/cmake/compiler_tests.cmake b/build/cmake/compiler_tests.cmake index 8a73ec8..d58a185 100644 --- a/build/cmake/compiler_tests.cmake +++ b/build/cmake/compiler_tests.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_COMPILER_TESTS_CMAKE_) +if (AOM_BUILD_CMAKE_COMPILER_TESTS_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_COMPILER_TESTS_CMAKE_ set(AOM_BUILD_CMAKE_COMPILER_TESTS_CMAKE_ 1) include(CheckCSourceCompiles) @@ -170,5 +172,3 @@ set(${result} "__inline" PARENT_SCOPE) endif () endfunction () - -endif () # AOM_BUILD_CMAKE_COMPILER_TESTS_CMAKE_
diff --git a/build/cmake/cpu.cmake b/build/cmake/cpu.cmake index 0e3eb73..9c643d4 100644 --- a/build/cmake/cpu.cmake +++ b/build/cmake/cpu.cmake
@@ -9,7 +9,6 @@ ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## - if ("${AOM_TARGET_CPU}" STREQUAL "arm64") set(ARCH_ARM 1) set(RTCD_ARCH_ARM "yes")
diff --git a/build/cmake/exports.cmake b/build/cmake/exports.cmake index 8153aad..b4cbf1e 100644 --- a/build/cmake/exports.cmake +++ b/build/cmake/exports.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_EXPORTS_CMAKE_) +if (AOM_BUILD_CMAKE_EXPORTS_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_EXPORTS_CMAKE_ set(AOM_BUILD_CMAKE_EXPORTS_CMAKE_ 1) include("${AOM_ROOT}/build/cmake/exports_sources.cmake") @@ -61,5 +63,3 @@ "-Wl,--version-script,${aom_sym_file}") endif () endfunction () - -endif () # AOM_BUILD_CMAKE_EXPORTS_CMAKE_
diff --git a/build/cmake/exports_sources.cmake b/build/cmake/exports_sources.cmake index 36f79ee..db34cb2 100644 --- a/build/cmake/exports_sources.cmake +++ b/build/cmake/exports_sources.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_EXPORTS_SOURCES_CMAKE_) +if (AOM_BUILD_CMAKE_EXPORTS_SOURCES_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_EXPORTS_SOURCES_CMAKE_ set(AOM_BUILD_CMAKE_EXPORTS_SOURCES_CMAKE_ 1) set(AOM_EXPORTS_SOURCES "${AOM_ROOT}/aom/exports_com") @@ -26,5 +28,3 @@ "${AOM_ROOT}/aom/exports_enc" "${AOM_ROOT}/av1/exports_enc") endif () - -endif () # AOM_BUILD_CMAKE_EXPORTS_SOURCES_CMAKE_
diff --git a/build/cmake/msvc_runtime.cmake b/build/cmake/msvc_runtime.cmake index 3da5f7d..1e5542a 100644 --- a/build/cmake/msvc_runtime.cmake +++ b/build/cmake/msvc_runtime.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_MSVC_RUNTIME_CMAKE_) +if (AOM_BUILD_CMAKE_MSVC_RUNTIME_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_MSVC_RUNTIME_CMAKE_ set(AOM_BUILD_CMAKE_MSVC_RUNTIME_CMAKE_ 1) if (MSVC) @@ -26,5 +28,3 @@ endforeach (flag_var) endif () endif () - -endif () # AOM_BUILD_CMAKE_MSVC_RUNTIME_CMAKE_
diff --git a/build/cmake/sanitizers.cmake b/build/cmake/sanitizers.cmake index 2b90678..6828c1d 100644 --- a/build/cmake/sanitizers.cmake +++ b/build/cmake/sanitizers.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_SANITIZERS_CMAKE_) +if (AOM_BUILD_CMAKE_SANITIZERS_CMAKE_) + return() +endif() # AOM_BUILD_CMAKE_SANITIZERS_CMAKE_ set(AOM_BUILD_CMAKE_SANITIZERS_CMAKE_ 1) if (MSVC OR NOT SANITIZE) @@ -25,5 +27,3 @@ # Make callstacks accurate. require_compiler_flag("-fno-omit-frame-pointer -fno-optimize-sibling-calls" YES) - -endif() # AOM_BUILD_CMAKE_SANITIZERS_CMAKE_
diff --git a/build/cmake/toolchains/arm-ios-common.cmake b/build/cmake/toolchains/arm-ios-common.cmake index 8929f3b..ba96da3 100644 --- a/build/cmake/toolchains/arm-ios-common.cmake +++ b/build/cmake/toolchains/arm-ios-common.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_ARM_IOS_COMMON_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_ARM_IOS_COMMON_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARM_IOS_COMMON_CMAKE_ set(AOM_BUILD_CMAKE_ARM_IOS_COMMON_CMAKE_ 1) set(CMAKE_SYSTEM_NAME "Darwin") @@ -27,5 +29,3 @@ set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") # TODO(tomfinegan): Handle bit code embedding. - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARM_IOS_COMMON_CMAKE_
diff --git a/build/cmake/toolchains/arm64-ios.cmake b/build/cmake/toolchains/arm64-ios.cmake index 434809d..ce9d5c4 100644 --- a/build/cmake/toolchains/arm64-ios.cmake +++ b/build/cmake/toolchains/arm64-ios.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_IOS_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_IOS_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_IOS_CMAKE_ set(AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_IOS_CMAKE_ 1) if (XCODE) @@ -20,5 +22,3 @@ set(CMAKE_OSX_ARCHITECTURES "arm64") include("${CMAKE_CURRENT_LIST_DIR}/arm-ios-common.cmake") - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_IOS_CMAKE_
diff --git a/build/cmake/toolchains/arm64-linux-gcc.cmake b/build/cmake/toolchains/arm64-linux-gcc.cmake index 303f1cf..a309e77 100644 --- a/build/cmake/toolchains/arm64-linux-gcc.cmake +++ b/build/cmake/toolchains/arm64-linux-gcc.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_LINUX_GCC_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_LINUX_GCC_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_LINUX_GCC_CMAKE_ set(AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_LINUX_GCC_CMAKE_ 1) set(CMAKE_SYSTEM_NAME "Linux") @@ -31,5 +33,3 @@ # No runtime cpu detect for arm64-linux-gcc. set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_LINUX_GCC_CMAKE_
diff --git a/build/cmake/toolchains/arm64-mingw-gcc.cmake b/build/cmake/toolchains/arm64-mingw-gcc.cmake index 56f1c17..cbf9b1b 100644 --- a/build/cmake/toolchains/arm64-mingw-gcc.cmake +++ b/build/cmake/toolchains/arm64-mingw-gcc.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_MINGW_GCC_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_MINGW_GCC_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_MINGW_GCC_CMAKE_ set(AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_MINGW_GCC_CMAKE_ 1) set(CMAKE_SYSTEM_PROCESSOR "arm64") @@ -26,5 +28,3 @@ # Disable the use of the gtest's CMake support. set(AOM_DISABLE_GTEST_CMAKE 1) - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_MINGW_GCC_CMAKE_
diff --git a/build/cmake/toolchains/armv7-ios.cmake b/build/cmake/toolchains/armv7-ios.cmake index c1e72ce..d05c14e 100644 --- a/build/cmake/toolchains/armv7-ios.cmake +++ b/build/cmake/toolchains/armv7-ios.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_ set(AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_ 1) if (XCODE) @@ -26,5 +28,3 @@ # No runtime cpu detect for armv7s-ios. set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_
diff --git a/build/cmake/toolchains/armv7-linux-gcc.cmake b/build/cmake/toolchains/armv7-linux-gcc.cmake index 13a7377..7e43b3e 100644 --- a/build/cmake/toolchains/armv7-linux-gcc.cmake +++ b/build/cmake/toolchains/armv7-linux-gcc.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_LINUX_GCC_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_LINUX_GCC_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_LINUX_GCC_CMAKE_ set(AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_LINUX_GCC_CMAKE_ 1) set(CMAKE_SYSTEM_NAME "Linux") @@ -44,5 +46,3 @@ # No runtime cpu detect for armv7-linux-gcc. set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_LINUX_GCC_CMAKE_
diff --git a/build/cmake/toolchains/armv7-mingw-gcc.cmake b/build/cmake/toolchains/armv7-mingw-gcc.cmake index f80dc0c..9fa4a56 100644 --- a/build/cmake/toolchains/armv7-mingw-gcc.cmake +++ b/build/cmake/toolchains/armv7-mingw-gcc.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_MINGW_GCC_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_MINGW_GCC_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_MINGW_GCC_CMAKE_ set(AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_MINGW_GCC_CMAKE_ 1) set(CMAKE_SYSTEM_PROCESSOR "armv7") @@ -32,5 +34,3 @@ # Disable the use of the gtest's CMake support. set(AOM_DISABLE_GTEST_CMAKE 1) - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_MINGW_GCC_CMAKE_
diff --git a/build/cmake/toolchains/armv7s-ios.cmake b/build/cmake/toolchains/armv7s-ios.cmake index bdb627c..59d98aa 100644 --- a/build/cmake/toolchains/armv7s-ios.cmake +++ b/build/cmake/toolchains/armv7s-ios.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7S_IOS_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7S_IOS_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7S_IOS_CMAKE_ set(AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7S_IOS_CMAKE_ 1) if (XCODE) @@ -26,5 +28,3 @@ # No runtime cpu detect for armv7s-ios. set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7S_IOS_CMAKE_
diff --git a/build/cmake/toolchains/ios-simulator-common.cmake b/build/cmake/toolchains/ios-simulator-common.cmake index 7a28e32..9bb465a 100644 --- a/build/cmake/toolchains/ios-simulator-common.cmake +++ b/build/cmake/toolchains/ios-simulator-common.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_IOS_SIMULATOR_COMMON_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_IOS_SIMULATOR_COMMON_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_IOS_SIMULATOR_COMMON_CMAKE_ set(AOM_BUILD_CMAKE_IOS_SIMULATOR_COMMON_CMAKE_ 1) set(CMAKE_SYSTEM_NAME "Darwin") @@ -19,5 +21,3 @@ set(CMAKE_CXX_COMPILER_ARG1 "-arch ${CMAKE_SYSTEM_PROCESSOR}") # TODO(tomfinegan): Handle bit code embedding. - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_IOS_SIMULATOR_COMMON_CMAKE_
diff --git a/build/cmake/toolchains/mips32-linux-gcc.cmake b/build/cmake/toolchains/mips32-linux-gcc.cmake index b452e36..af6f3de 100644 --- a/build/cmake/toolchains/mips32-linux-gcc.cmake +++ b/build/cmake/toolchains/mips32-linux-gcc.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_MIPS32_LINUX_GCC_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_MIPS32_LINUX_GCC_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_MIPS32_LINUX_GCC_CMAKE_ set(AOM_BUILD_CMAKE_TOOLCHAINS_MIPS32_LINUX_GCC_CMAKE_ 1) set(CMAKE_SYSTEM_NAME "Linux") @@ -71,5 +73,3 @@ endif () set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "" FORCE) - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_MIPS32_LINUX_GCC_CMAKE_
diff --git a/build/cmake/toolchains/mips64-linux-gcc.cmake b/build/cmake/toolchains/mips64-linux-gcc.cmake index 0b63d77..a5a02f2 100644 --- a/build/cmake/toolchains/mips64-linux-gcc.cmake +++ b/build/cmake/toolchains/mips64-linux-gcc.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_MIPS64_LINUX_GCC_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_MIPS64_LINUX_GCC_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_MIPS64_LINUX_GCC_CMAKE_ set(AOM_BUILD_CMAKE_TOOLCHAINS_MIPS64_LINUX_GCC_CMAKE_ 1) set(CMAKE_SYSTEM_NAME "Linux") @@ -48,5 +50,3 @@ endif () set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "" FORCE) - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_MIPS64_LINUX_GCC_CMAKE_
diff --git a/build/cmake/toolchains/ppc-linux-gcc.cmake b/build/cmake/toolchains/ppc-linux-gcc.cmake index c7a0364..e16ac7d 100644 --- a/build/cmake/toolchains/ppc-linux-gcc.cmake +++ b/build/cmake/toolchains/ppc-linux-gcc.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_PPC_LINUX_GCC_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_PPC_LINUX_GCC_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_PPC_LINUX_GCC_CMAKE_ set(AOM_BUILD_CMAKE_TOOLCHAINS_PPC_LINUX_GCC_CMAKE_ 1) set(CMAKE_SYSTEM_NAME "Linux") @@ -24,5 +26,3 @@ set(CMAKE_SYSTEM_PROCESSOR "ppc") set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_PPC_LINUX_GCC_CMAKE_
diff --git a/build/cmake/toolchains/x86-ios-simulator.cmake b/build/cmake/toolchains/x86-ios-simulator.cmake index 295156c..842fca0 100644 --- a/build/cmake/toolchains/x86-ios-simulator.cmake +++ b/build/cmake/toolchains/x86-ios-simulator.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_X86_IOS_SIMULATOR_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_X86_IOS_SIMULATOR_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_X86_IOS_SIMULATOR_CMAKE_ set(AOM_BUILD_CMAKE_TOOLCHAINS_X86_IOS_SIMULATOR_CMAKE_ 1) if (XCODE) @@ -23,5 +25,3 @@ set(CONFIG_PIC 1 CACHE NUMBER "") include("${CMAKE_CURRENT_LIST_DIR}/ios-simulator-common.cmake") - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_X86_IOS_SIMULATOR_CMAKE_
diff --git a/build/cmake/toolchains/x86-linux.cmake b/build/cmake/toolchains/x86-linux.cmake index 42cc614..9695da6 100644 --- a/build/cmake/toolchains/x86-linux.cmake +++ b/build/cmake/toolchains/x86-linux.cmake
@@ -8,12 +8,12 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_X86_LINUX_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_X86_LINUX_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_X86_LINUX_CMAKE_ set(AOM_BUILD_CMAKE_TOOLCHAINS_X86_LINUX_CMAKE_ 1) set(CMAKE_SYSTEM_PROCESSOR "x86") set(CMAKE_SYSTEM_NAME "Linux") set(CMAKE_C_COMPILER_ARG1 "-m32") set(CMAKE_CXX_COMPILER_ARG1 "-m32") - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_X86_LINUX_CMAKE_
diff --git a/build/cmake/toolchains/x86-mingw-gcc.cmake b/build/cmake/toolchains/x86-mingw-gcc.cmake index bdd3fa5..caf87db 100644 --- a/build/cmake/toolchains/x86-mingw-gcc.cmake +++ b/build/cmake/toolchains/x86-mingw-gcc.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_X86_MINGW_GCC_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_X86_MINGW_GCC_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_X86_MINGW_GCC_CMAKE_ set(AOM_BUILD_CMAKE_TOOLCHAINS_X86_MINGW_GCC_CMAKE_ 1) set(CMAKE_SYSTEM_PROCESSOR "x86") @@ -25,5 +27,3 @@ # Disable the use of the gtest's CMake support. set(AOM_DISABLE_GTEST_CMAKE 1) - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_X86_MINGW_GCC_CMAKE_
diff --git a/build/cmake/toolchains/x86_64-ios-simulator.cmake b/build/cmake/toolchains/x86_64-ios-simulator.cmake index 884540a..d76cc00 100644 --- a/build/cmake/toolchains/x86_64-ios-simulator.cmake +++ b/build/cmake/toolchains/x86_64-ios-simulator.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_X86_64_IOS_SIMULATOR_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_X86_64_IOS_SIMULATOR_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_X86_64_IOS_SIMULATOR_CMAKE_ set(AOM_BUILD_CMAKE_TOOLCHAINS_X86_64_IOS_SIMULATOR_CMAKE_ 1) if (XCODE) @@ -20,5 +22,3 @@ set(CMAKE_OSX_ARCHITECTURES "x86_64") include("${CMAKE_CURRENT_LIST_DIR}/ios-simulator-common.cmake") - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_X86_64_IOS_SIMULATOR_CMAKE_
diff --git a/build/cmake/toolchains/x86_64-mingw-gcc.cmake b/build/cmake/toolchains/x86_64-mingw-gcc.cmake index be94332..cd1618a 100644 --- a/build/cmake/toolchains/x86_64-mingw-gcc.cmake +++ b/build/cmake/toolchains/x86_64-mingw-gcc.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_TOOLCHAINS_X86_64_MINGW_GCC_CMAKE_) +if (AOM_BUILD_CMAKE_TOOLCHAINS_X86_64_MINGW_GCC_CMAKE_) + return() +endif () # AOM_BUILD_CMAKE_TOOLCHAINS_X86_64_MINGW_GCC_CMAKE_ set(AOM_BUILD_CMAKE_TOOLCHAINS_X86_64_MINGW_GCC_CMAKE_ 1) set(CMAKE_SYSTEM_PROCESSOR "x86_64") @@ -23,5 +25,3 @@ # Disable the use of the gtest's CMake support. set(AOM_DISABLE_GTEST_CMAKE 1) - -endif () # AOM_BUILD_CMAKE_TOOLCHAINS_X86_64_MINGW_GCC_CMAKE_
diff --git a/build/cmake/util.cmake b/build/cmake/util.cmake index bbb6992..1f74f5c 100644 --- a/build/cmake/util.cmake +++ b/build/cmake/util.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_BUILD_CMAKE_UTIL_CMAKE_) +if (AOM_BUILD_CMAKE_UTIL_CMAKE_) + return() +endif() # AOM_BUILD_CMAKE_UTIL_CMAKE_ set(AOM_BUILD_CMAKE_UTIL_CMAKE_ 1) # Creates dummy source file in $AOM_CONFIG_DIR named $basename.$extension and @@ -80,5 +82,3 @@ endif () endfunction () -endif() # AOM_BUILD_CMAKE_UTIL_CMAKE_ -
diff --git a/docs.cmake b/docs.cmake index 78281f2..6f14cb4 100644 --- a/docs.cmake +++ b/docs.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_DOCS_CMAKE_) +if (AOM_DOCS_CMAKE_) + return() +endif () # AOM_DOCS_CMAKE_ set(AOM_DOCS_CMAKE_ 1) cmake_minimum_required(VERSION 3.5) @@ -233,5 +235,3 @@ ${AOM_DOXYGEN_EXAMPLE_SOURCES} "${AOM_DOXYGEN_CONFIG_TEMPLATE}") endfunction () - -endif () # AOM_DOCS_CMAKE_
diff --git a/test/test.cmake b/test/test.cmake index 0a11e29..d9d0ec1 100644 --- a/test/test.cmake +++ b/test/test.cmake
@@ -8,7 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## -if (NOT AOM_TEST_TEST_CMAKE_) +if (AOM_TEST_TEST_CMAKE_) + return() +endif () # AOM_TEST_TEST_CMAKE_ set(AOM_TEST_TEST_CMAKE_ 1) include(FindPythonInterp) @@ -510,5 +512,3 @@ endforeach () endforeach () endfunction () - -endif () # AOM_TEST_TEST_CMAKE_