Switch octave build to gcc

upgrade gmock to HEAD of trunk to support c++11

.travis.yml

@@ -33,7 +33,7 @@ matrix:
       env: CMAKE_OPTIONS="-DCSharpModular=ON" EXTRA_PACKAGES="mono-devel mono-gmcs cli-common-dev swig2.0"
     - compiler: clang
       env: CMAKE_OPTIONS="-DLuaModular=ON" EXTRA_PACKAGES="lua5.1 liblua5.1-0-dev swig2.0"
-    - compiler: clang
+    - compiler: gcc
       env: CMAKE_OPTIONS="-DOctaveModular=ON" EXTRA_PACKAGES="octave octave3.2-headers swig2.0"
     - compiler: clang
       env: CMAKE_OPTIONS="-DRModular=ON" EXTRA_PACKAGES="r-base-core swig2.0"

CMakeLists.txt

@@ -56,15 +56,15 @@ ENDIF()
 # check for supported c++11 features
 INCLUDE(CheckCXX11Features)
 
-#IF(CXX11_COMPILER_FLAGS)
-#	LIST(APPEND DEFINES HAVE_CXX11)
-#	SET(HAVE_CXX11 1)
-#	SET(CMAKE_CXX_FLAGS "${CXX11_COMPILER_FLAGS} ${CMAKE_CXX_FLAGS}")
-#ENDIF()
-
-#IF (HAVE_CXX11_ATOMIC)
-#	LIST(APPEND DEFINES HAVE_CXX11_ATOMIC)
-#ENDIF()
+IF(CXX11_COMPILER_FLAGS)
+	LIST(APPEND DEFINES HAVE_CXX11)
+	SET(HAVE_CXX11 1)
+	SET(CMAKE_CXX_FLAGS "${CXX11_COMPILER_FLAGS} ${CMAKE_CXX_FLAGS}")
+ENDIF()
+
+IF (HAVE_CXX11_ATOMIC)
+	LIST(APPEND DEFINES HAVE_CXX11_ATOMIC)
+ENDIF()
 
 # cpu tuning params
 OPTION(DISABLE_OPTIMIZATIONS "Disable optimization flags" OFF)

cmake/external/GoogleTestNMock.cmake

@@ -0,0 +1,14 @@
+include(ExternalProject)
+ExternalProject_Add(
+	GoogleMock
+	SVN_REPOSITORY http://googlemock.googlecode.com/svn/trunk
+	SVN_REVISION -r 441
+    TIMEOUT 10
+	PREFIX ${CMAKE_BINARY_DIR}/GoogleMock
+	DOWNLOAD_DIR ${THIRD_PARTY_DIR}/GoogleMock
+	INSTALL_COMMAND ""
+	CMAKE_ARGS 	-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${THIRD_PARTY_DIR}/libs/gmock
+		-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${THIRD_PARTY_DIR}/libs/gmock
+		-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}${CMAKE_DEFINITIONS}
+		-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}${CMAKE_DEFINITIONS}
+)

tests/unit/CMakeLists.txt

@@ -4,39 +4,15 @@ foreach(D IN LISTS DEFINES)
 endforeach()
 
 # Find GTEST and GMOCK frameworks
-include(ExternalProject)
-SET(GOOGLE_MOCK_SOURCE_DIR "" CACHE PATH "Path to the GMock source")
-IF ("${GOOGLE_MOCK_SOURCE_DIR}" STREQUAL "" OR NOT EXISTS "${GOOGLE_MOCK_SOURCE_DIR}/CMakeLists.txt")
-	ExternalProject_Add(
-		GoogleMock
-		PREFIX ${CMAKE_BINARY_DIR}/GoogleMock
-		DOWNLOAD_DIR ${THIRD_PARTY_DIR}/GoogleMock
-		URL http://googlemock.googlecode.com/files/gmock-1.6.0.zip
-		URL_MD5 f547f47321ca88d3965ca2efdcc2a3c1
-		INSTALL_COMMAND ""
-		CMAKE_ARGS 	-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${THIRD_PARTY_DIR}/libs/gmock
-			-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${THIRD_PARTY_DIR}/libs/gmock
-			-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}${CMAKE_DEFINITIONS}
-			-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}${CMAKE_DEFINITIONS}
-	)
-ELSE()
-	ExternalProject_Add(
-		GoogleMock
-		PREFIX ${CMAKE_BINARY_DIR}/GoogleMock
-		SOURCE_DIR ${GOOGLE_MOCK_SOURCE_DIR}
-		INSTALL_COMMAND ""
-		CMAKE_ARGS 	-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${THIRD_PARTY_DIR}/libs/gmock
-			-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${THIRD_PARTY_DIR}/libs/gmock
-			-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}${CMAKE_DEFINITIONS}
-			-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}${CMAKE_DEFINITIONS}
-	)		
-ENDIF()
+include(external/GoogleTestNMock)
 ExternalProject_Get_Property(GoogleMock source_dir)
-
 include_directories(${INCLUDES} ${CMAKE_SOURCE_DIR}/src 
 		${source_dir}/include ${source_dir}/gtest/include)
 LINK_DIRECTORIES(${THIRD_PARTY_DIR}/libs/gmock)
 
+# 
+
+
 FILE(GLOB_RECURSE UNITTEST_SRC *_unittest.cc)
 
 ADD_EXECUTABLE(shogun-unit-test ${UNITTEST_SRC})