cmake: Fix variable type usage. Silences a noisy warning with a couple of variations. It looks like this: CMake Warning (dev) at /Users/tomfinegan/_werk/aom/build/cmake/util.cmake:146 (set): implicitly converting 'NUMBER' to 'STRING' type. Call Stack (most recent call first): /Users/tomfinegan/_werk/aom/build/cmake/aom_config_defaults.cmake:<line num> (set_aom_config_var) This warning is for project developers. Use -Wno-dev to suppress it. Change-Id: I73d11ae9dd2bf252252ef6e10b20661b6f61f856
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake index c0e21ff..623621f 100644 --- a/build/cmake/aom_config_defaults.cmake +++ b/build/cmake/aom_config_defaults.cmake
@@ -20,46 +20,45 @@ # in this file. # -set_aom_detect_var(INLINE "" STRING "Sets INLINE value for current target.") +set_aom_detect_var(INLINE "" "Sets INLINE value for current target.") # CPUs. -set_aom_detect_var(ARCH_ARM 0 NUMBER "Enables ARM architecture.") -set_aom_detect_var(ARCH_MIPS 0 NUMBER "Enables MIPS architecture.") -set_aom_detect_var(ARCH_PPC 0 NUMBER "Enables PPC architecture.") -set_aom_detect_var(ARCH_X86 0 NUMBER "Enables X86 architecture.") -set_aom_detect_var(ARCH_X86_64 0 NUMBER "Enables X86_64 architecture.") +set_aom_detect_var(ARCH_ARM 0 "Enables ARM architecture.") +set_aom_detect_var(ARCH_MIPS 0 "Enables MIPS architecture.") +set_aom_detect_var(ARCH_PPC 0 "Enables PPC architecture.") +set_aom_detect_var(ARCH_X86 0 "Enables X86 architecture.") +set_aom_detect_var(ARCH_X86_64 0 "Enables X86_64 architecture.") # ARM feature flags. -set_aom_detect_var(HAVE_NEON 0 NUMBER "Enables NEON intrinsics optimizations.") +set_aom_detect_var(HAVE_NEON 0 "Enables NEON intrinsics optimizations.") # MIPS feature flags. -set_aom_detect_var(HAVE_DSPR2 0 NUMBER "Enables DSPR2 optimizations.") -set_aom_detect_var(HAVE_MIPS32 0 NUMBER "Enables MIPS32 optimizations.") -set_aom_detect_var(HAVE_MIPS64 0 NUMBER "Enables MIPS64 optimizations. ") -set_aom_detect_var(HAVE_MSA 0 NUMBER "Enables MSA optimizations.") +set_aom_detect_var(HAVE_DSPR2 0 "Enables DSPR2 optimizations.") +set_aom_detect_var(HAVE_MIPS32 0 "Enables MIPS32 optimizations.") +set_aom_detect_var(HAVE_MIPS64 0 "Enables MIPS64 optimizations. ") +set_aom_detect_var(HAVE_MSA 0 "Enables MSA optimizations.") # PPC feature flags. -set_aom_detect_var(HAVE_VSX 0 NUMBER "Enables VSX optimizations.") +set_aom_detect_var(HAVE_VSX 0 "Enables VSX optimizations.") # x86/x86_64 feature flags. -set_aom_detect_var(HAVE_AVX 0 NUMBER "Enables AVX optimizations.") -set_aom_detect_var(HAVE_AVX2 0 NUMBER "Enables AVX2 optimizations.") -set_aom_detect_var(HAVE_MMX 0 NUMBER "Enables MMX optimizations. ") -set_aom_detect_var(HAVE_SSE 0 NUMBER "Enables SSE optimizations.") -set_aom_detect_var(HAVE_SSE2 0 NUMBER "Enables SSE2 optimizations.") -set_aom_detect_var(HAVE_SSE3 0 NUMBER "Enables SSE3 optimizations.") -set_aom_detect_var(HAVE_SSE4_1 0 NUMBER "Enables SSE 4.1 optimizations.") -set_aom_detect_var(HAVE_SSE4_2 0 NUMBER "Enables SSE 4.2 optimizations.") -set_aom_detect_var(HAVE_SSSE3 0 NUMBER "Enables SSSE3 optimizations.") +set_aom_detect_var(HAVE_AVX 0 "Enables AVX optimizations.") +set_aom_detect_var(HAVE_AVX2 0 "Enables AVX2 optimizations.") +set_aom_detect_var(HAVE_MMX 0 "Enables MMX optimizations. ") +set_aom_detect_var(HAVE_SSE 0 "Enables SSE optimizations.") +set_aom_detect_var(HAVE_SSE2 0 "Enables SSE2 optimizations.") +set_aom_detect_var(HAVE_SSE3 0 "Enables SSE3 optimizations.") +set_aom_detect_var(HAVE_SSE4_1 0 "Enables SSE 4.1 optimizations.") +set_aom_detect_var(HAVE_SSE4_2 0 "Enables SSE 4.2 optimizations.") +set_aom_detect_var(HAVE_SSSE3 0 "Enables SSSE3 optimizations.") # Flags describing the build environment. -set_aom_detect_var(HAVE_FEXCEPT 0 NUMBER +set_aom_detect_var(HAVE_FEXCEPT 0 "Internal flag, GNU fenv.h present for target.") -set_aom_detect_var(HAVE_PTHREAD_H 0 NUMBER - "Internal flag, target pthread support.") -set_aom_detect_var(HAVE_UNISTD_H 0 NUMBER +set_aom_detect_var(HAVE_PTHREAD_H 0 "Internal flag, target pthread support.") +set_aom_detect_var(HAVE_UNISTD_H 0 "Internal flag, unistd.h present for target.") -set_aom_detect_var(HAVE_WXWIDGETS 0 NUMBER "WxWidgets present.") +set_aom_detect_var(HAVE_WXWIDGETS 0 "WxWidgets present.") # # Variables in this section can be set from the CMake command line or from @@ -67,79 +66,74 @@ # # Build configuration flags. -set_aom_config_var(AOM_RTCD_FLAGS "" STRING +set_aom_config_var(AOM_RTCD_FLAGS "" "Arguments to pass to rtcd.pl. Separate with ';'") -set_aom_config_var(CONFIG_AV1_DECODER 1 NUMBER "Enable AV1 decoder.") -set_aom_config_var(CONFIG_AV1_ENCODER 1 NUMBER "Enable AV1 encoder.") -set_aom_config_var(CONFIG_BIG_ENDIAN 0 NUMBER "Internal flag.") -set_aom_config_var(CONFIG_GCC 0 NUMBER "Building with GCC (detect).") -set_aom_config_var(CONFIG_GCOV 0 NUMBER "Enable gcov support.") -set_aom_config_var(CONFIG_GPROF 0 NUMBER "Enable gprof support.") -set_aom_config_var(CONFIG_LIBYUV 1 NUMBER - "Enables libyuv scaling/conversion support.") +set_aom_config_var(CONFIG_AV1_DECODER 1 "Enable AV1 decoder.") +set_aom_config_var(CONFIG_AV1_ENCODER 1 "Enable AV1 encoder.") +set_aom_config_var(CONFIG_BIG_ENDIAN 0 "Internal flag.") +set_aom_config_var(CONFIG_GCC 0 "Building with GCC (detect).") +set_aom_config_var(CONFIG_GCOV 0 "Enable gcov support.") +set_aom_config_var(CONFIG_GPROF 0 "Enable gprof support.") +set_aom_config_var(CONFIG_LIBYUV 1 "Enables libyuv scaling/conversion support.") -set_aom_config_var(CONFIG_MULTITHREAD 1 NUMBER "Multithread support.") -set_aom_config_var(CONFIG_OS_SUPPORT 0 NUMBER "Internal flag.") -set_aom_config_var(CONFIG_PIC 0 NUMBER "Build with PIC enabled.") -set_aom_config_var(CONFIG_RUNTIME_CPU_DETECT 1 NUMBER - "Runtime CPU detection support.") -set_aom_config_var(CONFIG_SHARED 0 NUMBER "Build shared libs.") -set_aom_config_var(CONFIG_STATIC 1 NUMBER "Build static libs.") -set_aom_config_var(CONFIG_WEBM_IO 1 NUMBER "Enables WebM support.") +set_aom_config_var(CONFIG_MULTITHREAD 1 "Multithread support.") +set_aom_config_var(CONFIG_OS_SUPPORT 0 "Internal flag.") +set_aom_config_var(CONFIG_PIC 0 "Build with PIC enabled.") +set_aom_config_var(CONFIG_RUNTIME_CPU_DETECT 1 "Runtime CPU detection support.") +set_aom_config_var(CONFIG_SHARED 0 "Build shared libs.") +set_aom_config_var(CONFIG_STATIC 1 "Build static libs.") +set_aom_config_var(CONFIG_WEBM_IO 1 "Enables WebM support.") # Debugging flags. -set_aom_config_var(CONFIG_BITSTREAM_DEBUG 0 NUMBER "Bitstream debugging flag.") -set_aom_config_var(CONFIG_DEBUG 0 NUMBER "Debug build flag.") -set_aom_config_var(CONFIG_MISMATCH_DEBUG 0 NUMBER "Mismatch debugging flag.") +set_aom_config_var(CONFIG_BITSTREAM_DEBUG 0 "Bitstream debugging flag.") +set_aom_config_var(CONFIG_DEBUG 0 "Debug build flag.") +set_aom_config_var(CONFIG_MISMATCH_DEBUG 0 "Mismatch debugging flag.") # AV1 feature flags. -set_aom_config_var(CONFIG_ACCOUNTING 0 NUMBER "Enables bit accounting.") -set_aom_config_var(CONFIG_ANALYZER 0 NUMBER "Enables bit stream analyzer.") -set_aom_config_var(CONFIG_COEFFICIENT_RANGE_CHECKING 0 NUMBER +set_aom_config_var(CONFIG_ACCOUNTING 0 "Enables bit accounting.") +set_aom_config_var(CONFIG_ANALYZER 0 "Enables bit stream analyzer.") +set_aom_config_var(CONFIG_COEFFICIENT_RANGE_CHECKING 0 "Coefficient range check.") -set_aom_config_var(CONFIG_DENOISE 1 NUMBER +set_aom_config_var(CONFIG_DENOISE 1 "Denoise/noise modeling support in encoder.") -set_aom_config_var(CONFIG_FILEOPTIONS 1 NUMBER - "Enables encoder config file support.") -set_aom_config_var(CONFIG_INSPECTION 0 NUMBER "Enables bitstream inspection.") -set_aom_config_var(CONFIG_INTERNAL_STATS 0 NUMBER - "Enables internal encoder stats.") -set_aom_config_var(FORCE_HIGHBITDEPTH_DECODING 0 NUMBER +set_aom_config_var(CONFIG_FILEOPTIONS 1 "Enables encoder config file support.") +set_aom_config_var(CONFIG_INSPECTION 0 "Enables bitstream inspection.") +set_aom_config_var(CONFIG_INTERNAL_STATS 0 "Enables internal encoder stats.") +set_aom_config_var(FORCE_HIGHBITDEPTH_DECODING 0 "Force high bitdepth decoding pipeline on 8-bit input.") mark_as_advanced(FORCE_HIGHBITDEPTH_DECODING) -set_aom_config_var(CONFIG_MAX_DECODE_PROFILE 2 NUMBER +set_aom_config_var(CONFIG_MAX_DECODE_PROFILE 2 "Max profile to support decoding.") -set_aom_config_var(CONFIG_NORMAL_TILE_MODE 0 NUMBER - "Only enables normal tile mode.") -set_aom_config_var(CONFIG_SIZE_LIMIT 0 NUMBER "Limit max decode width/height.") -set_aom_config_var(CONFIG_SPATIAL_RESAMPLING 1 NUMBER "Spatial resampling.") -set_aom_config_var(DECODE_HEIGHT_LIMIT 0 NUMBER "Set limit for decode height.") -set_aom_config_var(DECODE_WIDTH_LIMIT 0 NUMBER "Set limit for decode width.") +set_aom_config_var(CONFIG_NORMAL_TILE_MODE 0 "Only enables normal tile mode.") +set_aom_config_var(CONFIG_SIZE_LIMIT 0 "Limit max decode width/height.") +set_aom_config_var(CONFIG_SPATIAL_RESAMPLING 1 "Spatial resampling.") +set_aom_config_var(DECODE_HEIGHT_LIMIT 0 "Set limit for decode height.") +set_aom_config_var(DECODE_WIDTH_LIMIT 0 "Set limit for decode width.") # AV1 experiment flags. -set_aom_config_var(CONFIG_SPEED_STATS 0 NUMBER "AV1 experiment flag.") -set_aom_config_var(CONFIG_COLLECT_RD_STATS 0 NUMBER "AV1 experiment flag.") -set_aom_config_var(CONFIG_DIST_8X8 0 NUMBER "AV1 experiment flag.") -set_aom_config_var(CONFIG_ENTROPY_STATS 0 NUMBER "AV1 experiment flag.") -set_aom_config_var(CONFIG_INTER_STATS_ONLY 0 NUMBER "AV1 experiment flag.") -set_aom_config_var(CONFIG_RD_DEBUG 0 NUMBER "AV1 experiment flag.") -set_aom_config_var(CONFIG_SHARP_SETTINGS 0 NUMBER "AV1 experiment flag.") -set_aom_config_var(CONFIG_DISABLE_FULL_PIXEL_SPLIT_8X8 1 NUMBER +set_aom_config_var(CONFIG_SPEED_STATS 0 "AV1 experiment flag.") +set_aom_config_var(CONFIG_COLLECT_RD_STATS 0 "AV1 experiment flag.") +set_aom_config_var(CONFIG_DIST_8X8 0 "AV1 experiment flag.") +set_aom_config_var(CONFIG_ENTROPY_STATS 0 "AV1 experiment flag.") +set_aom_config_var(CONFIG_INTER_STATS_ONLY 0 "AV1 experiment flag.") +set_aom_config_var(CONFIG_RD_DEBUG 0 "AV1 experiment flag.") +set_aom_config_var(CONFIG_SHARP_SETTINGS 0 "AV1 experiment flag.") +set_aom_config_var(CONFIG_DISABLE_FULL_PIXEL_SPLIT_8X8 1 "Disable full_pixel_motion_search_based_split on BLOCK_8X8.") -set_aom_config_var(CONFIG_COLLECT_PARTITION_STATS 0 NUMBER +set_aom_config_var(CONFIG_COLLECT_PARTITION_STATS 0 "Collect stats on partition decisions.") -set_aom_config_var(CONFIG_COLLECT_COMPONENT_TIMING 0 NUMBER +set_aom_config_var(CONFIG_COLLECT_COMPONENT_TIMING 0 "Collect encoding component timing information.") -set_aom_config_var(CONFIG_LPF_MASK 0 NUMBER +set_aom_config_var(CONFIG_LPF_MASK 0 "Enable the use loop filter bitmasks for optimizations.") -set_aom_config_var(CONFIG_HTB_TRELLIS 0 NUMBER +set_aom_config_var(CONFIG_HTB_TRELLIS 0 "Enable the use of hash table for trellis optimizations.") -set_aom_config_var(CONFIG_REALTIME_ONLY 0 NUMBER +set_aom_config_var(CONFIG_REALTIME_ONLY 0 "Build for RTC-only to reduce binary size.") -set_aom_config_var(CONFIG_AV1_HIGHBITDEPTH 1 NUMBER +set_aom_config_var(CONFIG_AV1_HIGHBITDEPTH 1 "Build with high bitdepth support.") -set_aom_config_var(CONFIG_NN_V2 0 NUMBER "Fully-connected neural nets ver.2.") -set_aom_config_var(CONFIG_SUPERRES_IN_RECODE 1 NUMBER +set_aom_config_var(CONFIG_NN_V2 0 "Fully-connected neural nets ver.2.") +set_aom_config_var(CONFIG_SUPERRES_IN_RECODE 1 "Enable encoding both full-res and superres in recode loop" "when SUPERRES_AUTO mode is used.") #
diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake index a3c03ea..10dedb0 100644 --- a/build/cmake/aom_configure.cmake +++ b/build/cmake/aom_configure.cmake
@@ -31,7 +31,7 @@ if(NOT CONFIG_LOWBITDEPTH) set(FORCE_HIGHBITDEPTH_DECODING 1 - CACHE NUMBER "${cmake_cmdline_helpstring}" FORCE) + CACHE STRING "${cmake_cmdline_helpstring}" FORCE) endif() endif()
diff --git a/build/cmake/toolchains/arm-ios-common.cmake b/build/cmake/toolchains/arm-ios-common.cmake index 8f40951..053e33a 100644 --- a/build/cmake/toolchains/arm-ios-common.cmake +++ b/build/cmake/toolchains/arm-ios-common.cmake
@@ -21,6 +21,6 @@ set(CMAKE_CXX_COMPILER_ARG1 "-arch ${CMAKE_SYSTEM_PROCESSOR}") # No runtime cpu detect for arm*-ios targets. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE STRING "") # TODO(tomfinegan): Handle bit code embedding.
diff --git a/build/cmake/toolchains/arm64-android-clang.cmake b/build/cmake/toolchains/arm64-android-clang.cmake index 9b23c84..c13b1d9 100644 --- a/build/cmake/toolchains/arm64-android-clang.cmake +++ b/build/cmake/toolchains/arm64-android-clang.cmake
@@ -43,6 +43,6 @@ set(AOM_NEON_INTRIN_FLAG "") # No runtime cpu detect for arm64-android-clang. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE STRING "") set(CMAKE_SYSTEM_NAME "Android")
diff --git a/build/cmake/toolchains/arm64-linux-gcc.cmake b/build/cmake/toolchains/arm64-linux-gcc.cmake index 590a97a..a6c9543 100644 --- a/build/cmake/toolchains/arm64-linux-gcc.cmake +++ b/build/cmake/toolchains/arm64-linux-gcc.cmake
@@ -33,4 +33,4 @@ set(AOM_NEON_INTRIN_FLAG "") # No runtime cpu detect for arm64-linux-gcc. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE STRING "")
diff --git a/build/cmake/toolchains/arm64-mingw-gcc.cmake b/build/cmake/toolchains/arm64-mingw-gcc.cmake index bfeac92..a8e15cb 100644 --- a/build/cmake/toolchains/arm64-mingw-gcc.cmake +++ b/build/cmake/toolchains/arm64-mingw-gcc.cmake
@@ -26,4 +26,4 @@ set(CMAKE_RANLIB ${CROSS}ranlib CACHE FILEPATH Indexer) # No runtime cpu detect for arm64-mingw-gcc. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE STRING "")
diff --git a/build/cmake/toolchains/armv7-ios.cmake b/build/cmake/toolchains/armv7-ios.cmake index 32a1b53..11f7e16 100644 --- a/build/cmake/toolchains/armv7-ios.cmake +++ b/build/cmake/toolchains/armv7-ios.cmake
@@ -28,4 +28,4 @@ set(AOM_NEON_INTRIN_FLAG "") # No runtime cpu detect for armv7s-ios. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE STRING "")
diff --git a/build/cmake/toolchains/armv7-linux-gcc.cmake b/build/cmake/toolchains/armv7-linux-gcc.cmake index e3588e8..b898b4b 100644 --- a/build/cmake/toolchains/armv7-linux-gcc.cmake +++ b/build/cmake/toolchains/armv7-linux-gcc.cmake
@@ -37,4 +37,4 @@ set(AOM_NEON_INTRIN_FLAG "-mfpu=neon") # No runtime cpu detect for armv7-linux-gcc. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE STRING "")
diff --git a/build/cmake/toolchains/armv7-mingw-gcc.cmake b/build/cmake/toolchains/armv7-mingw-gcc.cmake index eb488ec..2dc4b18 100644 --- a/build/cmake/toolchains/armv7-mingw-gcc.cmake +++ b/build/cmake/toolchains/armv7-mingw-gcc.cmake
@@ -26,4 +26,4 @@ set(CMAKE_RANLIB ${CROSS}ranlib CACHE FILEPATH Indexer) # No runtime cpu detect for armv7-mingw-gcc. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE STRING "")
diff --git a/build/cmake/toolchains/armv7s-ios.cmake b/build/cmake/toolchains/armv7s-ios.cmake index 0940a6e..faa2933 100644 --- a/build/cmake/toolchains/armv7s-ios.cmake +++ b/build/cmake/toolchains/armv7s-ios.cmake
@@ -28,4 +28,4 @@ set(AOM_NEON_INTRIN_FLAG "") # No runtime cpu detect for armv7s-ios. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE STRING "")
diff --git a/build/cmake/toolchains/mips32-linux-gcc.cmake b/build/cmake/toolchains/mips32-linux-gcc.cmake index 0f93490..c644eec 100644 --- a/build/cmake/toolchains/mips32-linux-gcc.cmake +++ b/build/cmake/toolchains/mips32-linux-gcc.cmake
@@ -74,4 +74,4 @@ message("--- CONFIG_RUNTIME_CPU_DETECT not supported for mips32 targets.") endif() -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "" FORCE) +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE STRING "" FORCE)
diff --git a/build/cmake/toolchains/mips64-linux-gcc.cmake b/build/cmake/toolchains/mips64-linux-gcc.cmake index ad9aab0..442d910 100644 --- a/build/cmake/toolchains/mips64-linux-gcc.cmake +++ b/build/cmake/toolchains/mips64-linux-gcc.cmake
@@ -51,4 +51,4 @@ message("--- CONFIG_RUNTIME_CPU_DETECT not supported for mips64 targets.") endif() -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "" FORCE) +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE STRING "" FORCE)
diff --git a/build/cmake/toolchains/ppc-linux-gcc.cmake b/build/cmake/toolchains/ppc-linux-gcc.cmake index c86cc27..54db99b 100644 --- a/build/cmake/toolchains/ppc-linux-gcc.cmake +++ b/build/cmake/toolchains/ppc-linux-gcc.cmake
@@ -26,4 +26,4 @@ set(AS_EXECUTABLE ${CROSS}as) set(CMAKE_SYSTEM_PROCESSOR "ppc") -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE STRING "")
diff --git a/build/cmake/toolchains/x86-ios-simulator.cmake b/build/cmake/toolchains/x86-ios-simulator.cmake index 6b6f52c..caacb8c 100644 --- a/build/cmake/toolchains/x86-ios-simulator.cmake +++ b/build/cmake/toolchains/x86-ios-simulator.cmake
@@ -23,6 +23,6 @@ set(CMAKE_OSX_ARCHITECTURES "i386") # Avoid noisy PIC/PIE warnings. -set(CONFIG_PIC 1 CACHE NUMBER "") +set(CONFIG_PIC 1 CACHE STRING "") include("${CMAKE_CURRENT_LIST_DIR}/ios-simulator-common.cmake")
diff --git a/build/cmake/toolchains/x86-macos.cmake b/build/cmake/toolchains/x86-macos.cmake index 7a46e06..095ef18 100644 --- a/build/cmake/toolchains/x86-macos.cmake +++ b/build/cmake/toolchains/x86-macos.cmake
@@ -15,4 +15,4 @@ set(CMAKE_CXX_COMPILER_ARG1 "-arch i386") # Apple tools always complain in 32 bit mode without PIC. -set(CONFIG_PIC 1 CACHE NUMBER "") +set(CONFIG_PIC 1 CACHE STRING "")
diff --git a/build/cmake/util.cmake b/build/cmake/util.cmake index 76c9cf8..9b3da84 100644 --- a/build/cmake/util.cmake +++ b/build/cmake/util.cmake
@@ -101,7 +101,7 @@ # # The names of variables defaulted through this macro are added to # $AOM_CONFIG_VARS to facilitate build logging and diagnostics. -macro(set_aom_detect_var name value type helpstring) +macro(set_aom_detect_var name value helpstring) unset(list_index) list(FIND AOM_DETECT_VARS ${name} list_index) if(${list_index} EQUAL -1) @@ -113,7 +113,7 @@ unset(cache_helpstring) get_property(cache_helpstring CACHE ${name} PROPERTY HELPSTRING) if(NOT "${cache_helpstring}" STREQUAL "${cmake_cmdline_helpstring}") - set(${name} ${value} CACHE ${type} "${helpstring}") + set(${name} ${value} CACHE STRING "${helpstring}") mark_as_advanced(${name}) else() message( @@ -131,7 +131,7 @@ # # The names of variables defaulted through this macro are added to # $AOM_CONFIG_VARS to facilitate build logging and diagnostics. -macro(set_aom_config_var name value type helpstring) +macro(set_aom_config_var name value helpstring) unset(list_index) list(FIND AOM_CONFIG_VARS ${name} list_index) if(${list_index} EQUAL -1) @@ -143,7 +143,7 @@ unset(cache_helpstring) get_property(cache_helpstring CACHE ${name} PROPERTY HELPSTRING) if(NOT "${cache_helpstring}" STREQUAL "${cmake_cmdline_helpstring}") - set(${name} ${value} CACHE ${type} "${helpstring}") + set(${name} ${value} CACHE STRING "${helpstring}") endif() endmacro()