yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3468
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Tue 2014-10-14 14:08:13 +0200
message:
  Set python versions explicitly.
modified:
  CMakeLists.txt


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-09 16:20:31 +0000
+++ CMakeLists.txt	2014-10-14 12:08:13 +0000
@@ -27,7 +27,6 @@
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cMake")
 
-INCLUDE(FindPythonLibs)
 INCLUDE(FindPythonInterp)
 INCLUDE(FindOpenMP)
 INCLUDE(FindQt4)
@@ -105,13 +104,18 @@
 
 #===========================================================
 FIND_PACKAGE(NumPy REQUIRED)
-  INCLUDE_DIRECTORIES(${NUMPY_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${NUMPY_INCLUDE_DIRS})
 
 FIND_PACKAGE(Loki REQUIRED)
-  INCLUDE_DIRECTORIES(${LOKI_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LOKI_INCLUDE_DIR})
+
 FIND_PACKAGE(Eigen3 REQUIRED)
 FIND_PACKAGE(BZip2 REQUIRED)
 FIND_PACKAGE(ZLIB REQUIRED)
+
+SET(Python_ADDITIONAL_VERSIONS 2.6 2.7)
+FIND_PACKAGE(PythonLibs REQUIRED)
+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
 #===========================================================
 
 SET(DEFAULT ON CACHE INTERNAL "Default value for enabled by default options")