meh

locusrobotics · Nov 21, 2011 · e0fdeb1 · e0fdeb1
1 parent fd2d386
commit e0fdeb1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,19 +1,22 @@
 cmake_minimum_required(VERSION 2.8)
 
-find_package(PythonInterp)
-
 
 
 project(catkin)
 
 set(catkin_EXTRAS_DIR_VALUE ${catkin_SOURCE_DIR}/cmake)
 set(catkin_EXTRAS_DIR ${catkin_EXTRAS_DIR_VALUE} CACHE FILEPATH "catkin extras")
 
-execute_process(COMMAND ${PYTHON_EXECUTABLE} ${cakin_EXTRAS_DIR}/python_version.py
-  OUTPUT_VARIBLE PYTHON_VERSION_XDOTY)
-
 include(${catkin_EXTRAS_DIR}/all.cmake)
 
+find_package(PythonInterp)
+execute_process(COMMAND ${PYTHON_EXECUTABLE} ${catkin_EXTRAS_DIR}/python_version.py
+  OUTPUT_VARIABLE PYTHON_VERSION_XDOTY
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+set(PYTHON_VERSION_XDOTY ${PYTHON_VERSION_XDOTY})
+
+
 install_cmake_infrastructure(catkin
   VERSION 0.0.7
   )

diff --git a/cmake/python_version.py b/cmake/python_version.py
@@ -1,4 +1,4 @@
-from sys import version_info as v
 from __future__ import print_function
+from sys import version_info as v
 print("%u.%u" % (v.major, v.minor))
 
diff --git a/setup.sh.in b/setup.sh.in
@@ -2,7 +2,6 @@
 # PREFIX/lib/pythonX.Y/dist-packages is the way it looks under --install-layout=deb
 #
 
-__PYTHON_VERSION=
 PYTHONPATH=@CMAKE_INSTALL_PREFIX@/lib/python@PYTHON_VERSION_XDOTY@/dist-packages:$PYTHONPATH