Changeset 9048:4e5425c6eedb in orange


Ignore:
Timestamp:
10/03/11 13:13:06 (3 years ago)
Author:
Noughmad <Noughmad@…>
Branch:
default
Convert:
4cc54ed0b78bf615037c979e0c157449c91710f3
Message:

Enable compilation with Python3 as default (on Arch)

Location:
source
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • source/Makefile

    r8944 r9048  
    66endif 
    77 
    8 PYTHON ?= $(shell which python) 
     8PYTHON ?= $(shell which python2) 
    99 
    1010MODULES=include orange orangeom orangene corn statc 
  • source/orangeqt/CMakeLists.txt

    r8848 r9048  
    1010find_package(PythonLibrary REQUIRED) 
    1111find_package(OpenGL) 
     12find_package(Numpy) 
    1213include(SIPMacros) 
    1314 
    14 include_directories(${QT_INCLUDES} ${SIP_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_INCLUDE_PATH}) 
     15include_directories(${QT_INCLUDES} ${SIP_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_INCLUDE_PATH} ${NUMPY_INCLUDE_DIR}) 
    1516 
    1617#### orangeqt sources #### 
  • source/orangeqt/Makefile

    r8946 r9048  
    44endif 
    55ifndef PYTHON 
    6   PYTHON=python 
     6  PYTHON=$(shell which python2) 
    77endif 
    88 
Note: See TracChangeset for help on using the changeset viewer.