Blob Blame History Raw
diff -up ./CMakeLists.txt.fedora ./CMakeLists.txt
--- ./CMakeLists.txt.fedora	2014-03-24 10:20:57.000000000 -0400
+++ ./CMakeLists.txt	2017-03-05 12:03:30.615971843 -0500
@@ -27,7 +29,7 @@ endif(HOKUYOAIST_STATIC_LIBS)
 
 # Set up installation directories
 set(BIN_INSTALL_DIR "bin")
-set(LIB_INSTALL_DIR "lib")
+set(LIB_INSTALL_DIR "lib" CACHE STRING "Library installation directory")
 set(INC_INSTALL_DIR
     "include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
 set(SHARE_INSTALL_DIR
diff -up ./python/CMakeLists.txt.fedora ./python/CMakeLists.txt
--- ./python/CMakeLists.txt.fedora	2014-03-24 10:20:57.000000000 -0400
+++ ./python/CMakeLists.txt	2017-03-05 12:09:15.932208834 -0500
@@ -1,5 +1,7 @@
 # Find the Python libraries and headers
+set(Python_ADDITIONAL_VERSIONS 2.7)
 FIND_PACKAGE (PythonLibs)
+FIND_PACKAGE (PythonInterp)
 if(NOT PYTHON_LIBRARIES)
 	MESSAGE (STATUS "Python libaries not found. Cannot build Python bindings for HokuyoAIST.")
 endif(NOT PYTHON_LIBRARIES)
@@ -57,7 +59,7 @@ if(PYTHON_LIBRARIES AND Boost_FOUND AND
 	add_library(${pyModuleTarget} MODULE ${srcs})
 	TARGET_LINK_LIBRARIES (${pyModuleTarget} hokuyoaist ${boostPythonLib} ${PYTHON_LIBRARIES})
 	SET_TARGET_PROPERTIES (${pyModuleTarget} PROPERTIES PREFIX "" OUTPUT_NAME "hokuyoaist")
-	install(TARGETS ${pyModuleTarget} LIBRARY DESTINATION lib/python/site-packages)
+	install(TARGETS ${pyModuleTarget} LIBRARY DESTINATION ${LIB_INSTALL_DIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
 
 	ADD_SUBDIRECTORY (test)
 ELSEIF(NOT LIB_TYPE STREQUAL SHARED)