Merge remote branch 'origin/topic/proto-command' into proto-command

src/CMakeLists.txt

@@ -23,6 +23,25 @@ IF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\"))
   ADD_DEFINITIONS(-DVP_DEBUG_MODE=${CMAKE_VERBOSITY_LEVEL} -DVP_DEBUG)
 ENDIF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\"))
 
+#
+# Python
+#
+INCLUDE(FindPythonLibs)
+IF (NOT ${PYTHONLIBS_FOUND} STREQUAL TRUE)
+   MESSAGE(FATAL_ERROR "Python has not been found.")
+ENDIF (NOT ${PYTHONLIBS_FOUND} STREQUAL TRUE)
+
+INCLUDE(FindPythonInterp)
+IF (NOT ${PYTHONINTERP_FOUND} STREQUAL TRUE)
+   MESSAGE(FATAL_ERROR "Python executable has not been found.")
+ENDIF (NOT ${PYTHONINTERP_FOUND} STREQUAL TRUE)
+
+# provide path to library libdynamic-graph.so
+LINK_DIRECTORIES(${DYNAMIC_GRAPH_LIBRARY_DIRS})
+ADD_DEFINITIONS(${DYNAMIC_GRAPH_CFLAGS})
+
+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
+
 # Declare boost include directories
 include_directories(${Boost_INCLUDE_DIRS})
 
@@ -61,6 +80,7 @@ IF (UNIX)
 ENDIF (UNIX)
 
 TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES})
+TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${PYTHON_LIBRARY})
 
 INSTALL(TARGETS ${LIBRARY_NAME}
   DESTINATION lib)
@@ -93,22 +113,3 @@ FOREACH(plugin_file ${plugins_list})
 
   INSTALL(TARGETS ${plugin} DESTINATION ${PLUGINDIR})
 ENDFOREACH(plugin_file)
-
-#
-# Python
-#
-INCLUDE(FindPythonLibs)
-IF (NOT ${PYTHONLIBS_FOUND} STREQUAL TRUE)
-   MESSAGE(FATAL_ERROR "Python has not been found.")
-ENDIF (NOT ${PYTHONLIBS_FOUND} STREQUAL TRUE)
-
-INCLUDE(FindPythonInterp)
-IF (NOT ${PYTHONINTERP_FOUND} STREQUAL TRUE)
-   MESSAGE(FATAL_ERROR "Python executable has not been found.")
-ENDIF (NOT ${PYTHONINTERP_FOUND} STREQUAL TRUE)
-
-# provide path to library libdynamic-graph.so
-LINK_DIRECTORIES(${DYNAMIC_GRAPH_LIBRARY_DIRS})
-ADD_DEFINITIONS(${DYNAMIC_GRAPH_CFLAGS})
-
-INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})

tools/CMakeLists.txt

@@ -48,14 +48,12 @@ FOREACH(tool_name ${tools})
 
 	INCLUDE_DIRECTORIES(
 		${CMAKE_CURRENT_SOURCE_DIR}/../include
-		${PYTHON_INCLUDE_PATH}
 	)
 
 	LINK_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/lib)
 
 	TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
 	  ${PROJECT_NAME})
-	TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${PYTHON_LIBRARY})
 
 	IF(UNIX)
 		TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} dl)