[sword-svn] r3565 - in branches/sword-1-8-x: . cmake

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2018-01-16 14:26:08 -0700 (Tue, 16 Jan 2018)
New Revision: 3565

Modified:
   branches/sword-1-8-x/
   branches/sword-1-8-x/cmake/options.cmake
Log:
Merging from trunk



Property changes on: branches/sword-1-8-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3459-3471,3473,3475,3477-3482,3485-3514,3516,3518-3523,3525-3536,3538,3540,3545-3547,3551,3555,3557-3559
   + /trunk:3459-3471,3473,3475,3477-3482,3485-3514,3516,3518-3523,3525-3536,3538,3540,3545-3547,3551,3555,3557-3559,3564

Modified: branches/sword-1-8-x/cmake/options.cmake
===================================================================
--- branches/sword-1-8-x/cmake/options.cmake	2018-01-16 21:24:44 UTC (rev 3564)
+++ branches/sword-1-8-x/cmake/options.cmake	2018-01-16 21:26:08 UTC (rev 3565)
@@ -44,7 +44,7 @@
 
 _SET_FANCY(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share" "Directory to install global data files. Defaults to ${SWORD_INSTALL_DIR}/share.")
 
-_SET_FANCY(SWORD_PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE STRING "Directory where the Python bindings will be installed. Defaults to default Python path.")
+_SET_FANCY(SWORD_PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" STRING "Directory where the Python bindings will be installed. Defaults to default Python path.")
 
 # Post-processing of variables
 MACRO(PROCESS_VERSION LEVEL VALUE)