Merge pull request #12 from NikolausDemmel/patch-1

Update sip_helper to use python header dirs
ros-visualization · Jul 2, 2014 · dfce230 · dfce230
2 parents 29304e0 + fe5efd0
commit dfce230
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/cmake/sip_helper.cmake b/cmake/sip_helper.cmake
@@ -5,8 +5,10 @@ set(__PYTHON_QT_BINDING_SIP_HELPER_INCLUDED TRUE)
 
 set(__PYTHON_QT_BINDING_SIP_HELPER_DIR ${CMAKE_CURRENT_LIST_DIR})
 
-find_package(PythonInterp REQUIRED)
+set(Python_ADDITIONAL_VERSIONS "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
+find_package(PythonInterp "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" REQUIRED)
 assert(PYTHON_EXECUTABLE)
+find_package(PythonLibs "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" REQUIRED)
 
 find_program(SIP_EXECUTABLE sip)
 if(NOT SIP_EXECUTABLE_NOTFOUND)
@@ -197,7 +199,7 @@ function(build_sip_binding PROJECT_NAME SIP_FILE)
 
     set(SIP_BUILD_DIR ${sip_BINARY_DIR}/sip/${PROJECT_NAME})
 
-    set(INCLUDE_DIRS ${${PROJECT_NAME}_INCLUDE_DIRS})
+    set(INCLUDE_DIRS ${${PROJECT_NAME}_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
     set(LIBRARIES ${${PROJECT_NAME}_LIBRARIES})
     set(LIBRARY_DIRS ${${PROJECT_NAME}_LIBRARY_DIRS})
     set(LDFLAGS_OTHER ${${PROJECT_NAME}_LDFLAGS_OTHER})