cmake: Drop vestigial CONFIG_STATIC.
Also tidies up an unnecessary newline in CMakeLists.txt.
Change-Id: Ie95f669e6656a1b7ee91bde0c495f6c4a37ac739
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96a6dec..249f089 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -404,7 +404,6 @@
if(BUILD_SHARED_LIBS)
target_link_libraries(aom_static PRIVATE ${VMAF} -static)
endif()
-
endif()
endif()
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 0798f01..f9e70eb 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -81,7 +81,6 @@
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.
diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
index 6705c9f..253bad5 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
@@ -112,7 +112,6 @@
if(BUILD_SHARED_LIBS)
set(CONFIG_PIC 1)
set(CONFIG_SHARED 1)
- set(CONFIG_STATIC 0)
endif()
if(NOT MSVC)
