fix compilation errors in case of building without ut

Author: dcherednik

CMakeLists.txt

@@ -1,30 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
-macro(use_cxx11)
-  if (CMAKE_VERSION VERSION_LESS "3.1")
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
-    endif ()
-  else ()
-    set (CMAKE_CXX_STANDARD 11)
-  endif ()
-endmacro(use_cxx11)
-
-use_cxx11()
-
-macro(use_c11)
-  if (CMAKE_VERSION VERSION_LESS "3.1")
-    if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
-      set (CMAKE_C_FLAGS "--std=gnu11 ${CMAKE_C_FLAGS}")
-    endif ()
-  else ()
-    set (CMAKE_C_STANDARD 11)
-  endif ()
-endmacro(use_c11)
-
-use_c11()
-
 add_subdirectory(3rd/gtest-1.7.0)
 add_subdirectory(src)
 add_subdirectory(test)
-

src/CMakeLists.txt

@@ -1,5 +1,19 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
+macro(use_11)
+  if (CMAKE_VERSION VERSION_LESS "3.1")
+    message ("cmake version: " ${CMAKE_VERSION} " --std arguments will be forced")
+
+    set (CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}" CACHE STRING "" FORCE)
+    set (CMAKE_C_FLAGS "-std=c11 ${CMAKE_C_FLAGS}" CACHE STRING "" FORCE)
+  else ()
+    set (CMAKE_CXX_STANDARD 11)
+    set (CMAKE_C_STANDARD 11)
+  endif ()
+endmacro(use_11)
+
+use_11()
+
 #add_definitions( "-Wall -O2 -g -Rpass-analysis=loop-vectorize" )
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=address -fno-omit-frame-pointer")
 

src/config.h

@@ -7,3 +7,8 @@ typedef double TFloat;
 #else
 typedef float TFloat;
 #endif
+
+
+#ifndef M_PI
+#define M_PI (3.14159265358979323846)
+#endif

src/mdct/vorbis_impl/mdct.c

@@ -37,6 +37,7 @@
  */
 
 #include "mdct.h"
+#include <alloca.h>
 
 /**
  * Allocates and initializes lookup tables in the MDCT context.

test/CMakeLists.txt

@@ -1,3 +1,19 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+macro(use_11)
+  if (CMAKE_VERSION VERSION_LESS "3.1")
+    message ("cmake version: " ${CMAKE_VERSION} " --std arguments will be forced")
+
+    set (CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}" CACHE STRING "" FORCE)
+    set (CMAKE_C_FLAGS "-std=c11 ${CMAKE_C_FLAGS}" CACHE STRING "" FORCE)
+  else ()
+    set (CMAKE_CXX_STANDARD 11)
+    set (CMAKE_C_STANDARD 11)
+  endif ()
+endmacro(use_11)
+
+use_11()
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=address -fno-omit-frame-pointer")
 
 include_directories(${gtest_SOURCE_DIR}/include)