[sword-svn] r2866 - in trunk/bindings/swig: . python

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2013-07-08 07:07:03 -0700 (Mon, 08 Jul 2013)
New Revision: 2866

Modified:
   trunk/bindings/swig/CMakeLists.txt
   trunk/bindings/swig/python/CMakeLists.txt
Log:
Install Python to the same prefix as the library by default.

Modified: trunk/bindings/swig/CMakeLists.txt
===================================================================
--- trunk/bindings/swig/CMakeLists.txt	2013-07-08 13:44:37 UTC (rev 2865)
+++ trunk/bindings/swig/CMakeLists.txt	2013-07-08 14:07:03 UTC (rev 2866)
@@ -16,13 +16,6 @@
 ELSE(NOT SWIG_FOUND)
 	MESSAGE(STATUS "Swig: yes")
 	
-	#INCLUDE(${SWIG_USE_FILE})
-	
-	#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-	#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}../../include)
-	#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..)
-	#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-	
 	SET(CMAKE_SWIG_FLAGS "-w-451,-402;-shadow;-c++")
 	
 	MACRO(SWORD_SWIG_GENERATE LANG)

Modified: trunk/bindings/swig/python/CMakeLists.txt
===================================================================
--- trunk/bindings/swig/python/CMakeLists.txt	2013-07-08 13:44:37 UTC (rev 2865)
+++ trunk/bindings/swig/python/CMakeLists.txt	2013-07-08 14:07:03 UTC (rev 2866)
@@ -47,7 +47,7 @@
 IF(SWORD_PYTHON_INSTALL_DIR)
 	SET(SETUP_ARGS "--home=${SWORD_PYTHON_INSTALL_DIR}")
 ELSE(SWORD_PYTHON_INSTALL_DIR)
-	SET(SETUP_ARGS "")
+	SET(SETUP_ARGS "--home=${CMAKE_INSTALL_PREFIX}")
 ENDIF(SWORD_PYTHON_INSTALL_DIR)
 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/install.cmake.in"
 	       "${CMAKE_CURRENT_BINARY_DIR}/install.cmake")