Permalink
Browse files

Fix FindOctave for ubuntu 12.04

add python3 modular test to travis
  • Loading branch information...
vigsterkr committed Aug 5, 2013
1 parent 39b7c83 commit e6c27f77bc9bccc4f8e0d13b0ac7ba0a880ece2a
Showing with 16 additions and 9 deletions.
  1. +3 −0 .travis.yml
  2. +10 −2 CMakeLists.txt
  3. +0 −6 cmake/FindApacheAnt.cmake
  4. +3 −1 cmake/FindOctave.cmake
View
@@ -14,6 +14,7 @@ notifications:
env:
- CMAKE_OPTIONS="-DGOOGLE_MOCK_SOURCE_DIR=`pwd`/shogun-toolbox/shogun/gmock-1.6.0" EXTRA_PACKAGES="valgrind"
- CMAKE_OPTIONS="-DPythonModular=ON" EXTRA_PACKAGES="python-numpy-dev python-dev python-scipy swig2.0"
- CMAKE_OPTIONS="-DPythonModular=ON" EXTRA_PACKAGES="python3-numpy python3-dev python3-scipy swig2.0"
- CMAKE_OPTIONS="-DRModular=ON" EXTRA_PACKAGES="r-base-core swig2.0"
- CMAKE_OPTIONS="-DJavaModular=ON" EXTRA_PACKAGES="openjdk-6-jdk jblas ant swig2.0"
- CMAKE_OPTIONS="-DRubyModular=ON" EXTRA_PACKAGES="ruby ruby-dev ruby-narray swig2.0"
@@ -26,6 +27,8 @@ matrix:
env: CMAKE_OPTIONS=python_static EXTRA_PACKAGES="python-numpy-dev python-dev"
- compiler: gcc
env: CMAKE_OPTIONS="-DPythonModular=ON" EXTRA_PACKAGES="python-numpy-dev python-dev python-scipy swig2.0"
- compiler: gcc
env: CMAKE_OPTIONS="-DPythonModular=ON" EXTRA_PACKAGES="python3-numpy python3-dev python3-scipy swig2.0"
- compiler: gcc
env: CMAKE_OPTIONS="-DRModular=ON" EXTRA_PACKAGES="r-base-core swig2.0"
- compiler: gcc
View
@@ -6,6 +6,16 @@
project(shogun)
cmake_minimum_required(VERSION 2.8)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
# CCACHE
#OPTION(ENABLE_CCACHE "Enable ccache for compilation" OFF)
#if(ENABLE_CCACHE)
# FIND_PACKAGE(CCache REQUIRED)
# SET(CCACHE "ccache" CACHE STRING "ccache")
# SET(CMAKE_C_COMPILER ${CCACHE} ${CMAKE_C_COMPILER})
# SET(CMAKE_CXX_COMPILER ${CCACHE} ${CMAKE_CXX_COMPILER})
#endif()
################# VARIABLES #####################
SET(DEFINES "SWIG_TYPE_TABLE=shogun;SHOGUN")
@@ -24,8 +34,6 @@ SET(EXT_CPP_PY "${EXT_SRC_CPP}.py")
SET(LIBSHOGUN_SRC_DIR ${CMAKE_SOURCE_DIR}/src/shogun)
SET(COMMON_MODULAR_SRC_DIR ${CMAKE_SOURCE_DIR}/src/interfaces/modular/)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
################ COMPILER #######################
# g++ version needs to be => 4.3
IF(CMAKE_COMPILER_IS_GNUCXX)

This file was deleted.

Oops, something went wrong.
View
@@ -16,6 +16,8 @@
# OCTAVE_OCT_FILE_DIR - object files that will be dynamically loaded
# OCTAVE_OCT_LIB_DIR - oct libraries
# OCTAVE_ROOT_DIR - octave prefix
# OCTAVE_OCT_LOCAL_API_FILE_DIR -
# OCTAVE_API_VERSION - octave api version
#
# The macro octave_add_oct allows to create compiled modules.
# octave_add_oct ( target_name
@@ -127,7 +129,7 @@ list ( APPEND OCTAVE_LIBRARIES ${OCTAVE_CRUFT_LIBRARY} )
find_path ( OCTAVE_INCLUDE_DIR
NAMES mex.h
HINTS ${OCTAVE_INCLUDE_PATHS}
HINTS ${OCTAVE_INCLUDE_PATHS} ${OCTAVE_INCLUDE_PATHS}/octave
)
set ( OCTAVE_INCLUDE_DIRS ${OCTAVE_INCLUDE_DIR} )

0 comments on commit e6c27f7

Please sign in to comment.