Commit 17ccaec4 authored by Tom Finegan's avatar Tom Finegan
Browse files

Add include guards to CMake files used as includes.

BUG=aomedia:76

Change-Id: Ie34025f31a89f4991d03d5ecf03c6f6f5ab7b0a1
parent 0d066ce8
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
## Media Patent License 1.0 was not distributed with this source code in the ## 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. ## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
## ##
if (NOT AOM_AOM_DSP_AOM_DSP_CMAKE_)
set(AOM_AOM_DSP_AOM_DSP_CMAKE_ 1)
set(AOM_DSP_COMMON_SOURCES set(AOM_DSP_COMMON_SOURCES
"${AOM_ROOT}/aom_dsp/aom_convolve.c" "${AOM_ROOT}/aom_dsp/aom_convolve.c"
"${AOM_ROOT}/aom_dsp/aom_convolve.h" "${AOM_ROOT}/aom_dsp/aom_convolve.h"
...@@ -518,3 +521,5 @@ function (setup_aom_dsp_targets) ...@@ -518,3 +521,5 @@ function (setup_aom_dsp_targets)
# $AOM_LIB_TARGETS. # $AOM_LIB_TARGETS.
set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} PARENT_SCOPE) set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} PARENT_SCOPE)
endfunction () endfunction ()
endif () # AOM_AOM_DSP_AOM_DSP_CMAKE_
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
## Media Patent License 1.0 was not distributed with this source code in the ## 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. ## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
## ##
if (NOT AOM_AOM_MEM_AOM_MEM_CMAKE_)
set(AOM_AOM_MEM_AOM_MEM_CMAKE_ 1)
set(AOM_MEM_SOURCES set(AOM_MEM_SOURCES
"${AOM_ROOT}/aom_mem/aom_mem.c" "${AOM_ROOT}/aom_mem/aom_mem.c"
"${AOM_ROOT}/aom_mem/aom_mem.h" "${AOM_ROOT}/aom_mem/aom_mem.h"
...@@ -20,3 +23,5 @@ function (setup_aom_mem_targets) ...@@ -20,3 +23,5 @@ function (setup_aom_mem_targets)
set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_mem PARENT_SCOPE) set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_mem PARENT_SCOPE)
target_sources(aom PUBLIC $<TARGET_OBJECTS:aom_mem>) target_sources(aom PUBLIC $<TARGET_OBJECTS:aom_mem>)
endfunction () endfunction ()
endif () # AOM_AOM_MEM_AOM_MEM_CMAKE_
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
## Media Patent License 1.0 was not distributed with this source code in the ## 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. ## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
## ##
if (NOT AOM_AOM_PORTS_AOM_PORTS_CMAKE_)
set(AOM_AOM_PORTS_AOM_PORTS_CMAKE_ 1)
set(AOM_PORTS_INCLUDES set(AOM_PORTS_INCLUDES
"${AOM_ROOT}/aom_ports/aom_once.h" "${AOM_ROOT}/aom_ports/aom_once.h"
"${AOM_ROOT}/aom_ports/aom_timer.h" "${AOM_ROOT}/aom_ports/aom_timer.h"
...@@ -64,3 +67,5 @@ function (setup_aom_ports_targets) ...@@ -64,3 +67,5 @@ function (setup_aom_ports_targets)
endif () endif ()
endif () endif ()
endfunction () endfunction ()
endif () # AOM_AOM_PORTS_AOM_PORTS_CMAKE_
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
## Media Patent License 1.0 was not distributed with this source code in the ## 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. ## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
## ##
if (NOT AOM_AOM_SCALE_AOM_SCALE_CMAKE_)
set(AOM_AOM_SCALE_AOM_SCALE_CMAKE_ 1)
set(AOM_SCALE_SOURCES set(AOM_SCALE_SOURCES
"${AOM_ROOT}/aom_scale/aom_scale.h" "${AOM_ROOT}/aom_scale/aom_scale.h"
"${AOM_ROOT}/aom_scale/generic/aom_scale.c" "${AOM_ROOT}/aom_scale/generic/aom_scale.c"
...@@ -32,3 +35,5 @@ function (setup_aom_scale_targets) ...@@ -32,3 +35,5 @@ function (setup_aom_scale_targets)
set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_scale PARENT_SCOPE) set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_scale PARENT_SCOPE)
endfunction () endfunction ()
endif () # AOM_AOM_SCALE_AOM_SCALE_CMAKE_
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
## Media Patent License 1.0 was not distributed with this source code in the ## 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. ## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
## ##
if (NOT AOM_AOM_UTIL_AOM_UTIL_CMAKE_)
set(AOM_AOM_UTIL_AOM_UTIL_CMAKE_ 1)
set(AOM_UTIL_SOURCES set(AOM_UTIL_SOURCES
"${AOM_ROOT}/aom_util/aom_thread.c" "${AOM_ROOT}/aom_util/aom_thread.c"
"${AOM_ROOT}/aom_util/aom_thread.h" "${AOM_ROOT}/aom_util/aom_thread.h"
...@@ -27,3 +30,5 @@ function (setup_aom_util_targets) ...@@ -27,3 +30,5 @@ function (setup_aom_util_targets)
set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_util PARENT_SCOPE) set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_util PARENT_SCOPE)
target_sources(aom PUBLIC $<TARGET_OBJECTS:aom_util>) target_sources(aom PUBLIC $<TARGET_OBJECTS:aom_util>)
endfunction () endfunction ()
endif () # AOM_AOM_UTIL_AOM_UTIL_CMAKE_
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
## Media Patent License 1.0 was not distributed with this source code in the ## 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. ## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
## ##
if (NOT AOM_AV1_AV1_CMAKE_)
set(AOM_AV1_AV1_CMAKE_ 1)
set(AOM_AV1_COMMON_SOURCES set(AOM_AV1_COMMON_SOURCES
"${AOM_ROOT}/av1/av1_iface_common.h" "${AOM_ROOT}/av1/av1_iface_common.h"
"${AOM_ROOT}/av1/common/alloccommon.c" "${AOM_ROOT}/av1/common/alloccommon.c"
...@@ -558,3 +561,5 @@ endfunction () ...@@ -558,3 +561,5 @@ endfunction ()
function (setup_av1_test_targets) function (setup_av1_test_targets)
endfunction () endfunction ()
endif () # AOM_AV1_AV1_CMAKE_
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
## Media Patent License 1.0 was not distributed with this source code in the ## 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. ## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
## ##
if (NOT AOM_BUILD_CMAKE_AOM_CONFIGURE_CMAKE_)
set(AOM_BUILD_CMAKE_AOM_CONFIGURE_CMAKE_ 1)
include(FindGit) include(FindGit)
include(FindPerl) include(FindPerl)
include(FindThreads) include(FindThreads)
...@@ -367,3 +370,5 @@ if (NOT MSVC) ...@@ -367,3 +370,5 @@ if (NOT MSVC)
endif () endif ()
file(APPEND "${pkgconfig_file}" "Cflags: -I${prefix}/include\n") file(APPEND "${pkgconfig_file}" "Cflags: -I${prefix}/include\n")
endif () endif ()
endif () # AOM_BUILD_CMAKE_AOM_CONFIGURE_CMAKE_
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
## Media Patent License 1.0 was not distributed with this source code in the ## 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. ## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
## ##
if (NOT AOM_BUILD_CMAKE_COMPILER_FLAGS_CMAKE_)
set(AOM_BUILD_CMAKE_COMPILER_FLAGS_CMAKE_ 1)
include(CheckCCompilerFlag) include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
...@@ -216,3 +219,5 @@ function (append_exe_linker_flag flag) ...@@ -216,3 +219,5 @@ function (append_exe_linker_flag flag)
"" FORCE) "" FORCE)
endif () endif ()
endfunction () endfunction ()
endif () # AOM_BUILD_CMAKE_COMPILER_FLAGS_CMAKE_
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
## Media Patent License 1.0 was not distributed with this source code in the ## 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. ## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
## ##
if (NOT AOM_BUILD_CMAKE_COMPILER_TESTS_CMAKE_)
set(AOM_BUILD_CMAKE_COMPILER_TESTS_CMAKE_ 1)
include(CheckCSourceCompiles) include(CheckCSourceCompiles)
include(CheckCXXSourceCompiles) include(CheckCXXSourceCompiles)
...@@ -131,3 +134,5 @@ function (aom_get_inline result) ...@@ -131,3 +134,5 @@ function (aom_get_inline result)
set(${result} "__inline" PARENT_SCOPE) set(${result} "__inline" PARENT_SCOPE)
endif () endif ()
endfunction () endfunction ()
endif () # AOM_BUILD_CMAKE_COMPILER_TESTS_CMAKE_
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
## Media Patent License 1.0 was not distributed with this source code in the ## 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. ## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
## ##
if (NOT AOM_BUILD_CMAKE_MSVC_RUNTIME_CMAKE_)
set(AOM_BUILD_CMAKE_MSVC_RUNTIME_CMAKE_ 1)
if (MSVC) if (MSVC)
# CMake defaults to producing code linked to the DLL MSVC runtime. That will # CMake defaults to producing code linked to the DLL MSVC runtime. That will
...@@ -24,3 +26,5 @@ if (MSVC) ...@@ -24,3 +26,5 @@ if (MSVC)
endforeach (flag_var) endforeach (flag_var)
endif () endif ()
endif () endif ()
endif () # AOM_BUILD_CMAKE_MSVC_RUNTIME_CMAKE_
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
## Media Patent License 1.0 was not distributed with this source code in the ## 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. ## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
## ##
if (NOT AOM_TEST_TEST_CMAKE_)
set(AOM_TEST_TEST_CMAKE_ 1)
include(ProcessorCount) include(ProcessorCount)
include("${AOM_ROOT}/test/test_data_util.cmake") include("${AOM_ROOT}/test/test_data_util.cmake")
...@@ -389,3 +392,5 @@ function (setup_aom_test_targets) ...@@ -389,3 +392,5 @@ function (setup_aom_test_targets)
EXCLUDE_FROM_DEFAULT_BUILD TRUE) EXCLUDE_FROM_DEFAULT_BUILD TRUE)
endif () endif ()
endfunction () endfunction ()
endif () # AOM_TEST_TEST_CMAKE_
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment