[sword-svn] r2825 - in trunk: cmake utilities

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2013-06-19 17:36:54 -0700 (Wed, 19 Jun 2013)
New Revision: 2825

Modified:
   trunk/cmake/options.cmake
   trunk/utilities/CMakeLists.txt
Log:
Updated utilities install directories and added BINDIR to the install.

Modified: trunk/cmake/options.cmake
===================================================================
--- trunk/cmake/options.cmake	2013-06-19 14:01:28 UTC (rev 2824)
+++ trunk/cmake/options.cmake	2013-06-20 00:36:54 UTC (rev 2825)
@@ -13,9 +13,11 @@
 IF(CMAKE_INSTALL_PREFIX)
 	SET(PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE STRING "Directory into which to install architecture-dependent files. Defaults to ${SWORD_INSTALL_DIR}.")
 ELSE(CMAKE_INSTALL_PREFIX)
-	OPTION(PREFIX "${SWORD_INSTALL_DIR}" CACHE STRING "Directory into which to install architecture-dependent files. Defaults to ${SWORD_INSTALL_DIR}")
+	SET(PREFIX "${SWORD_INSTALL_DIR}" CACHE STRING "Directory into which to install architecture-dependent files. Defaults to ${SWORD_INSTALL_DIR}")
 ENDIF(CMAKE_INSTALL_PREFIX)
 
-SET(LIBDIR "${PREFIX}/lib" CACHE STRING "Object code library install directory. Defaults to ${CMAKE_INSTALL_PREFIX}/lib")
+SET(LIBDIR "${PREFIX}/lib" CACHE STRING "Object code library install directory. Defaults to ${SWORD_INSTALL_DIR}/lib")
 
-SET(INCLUDEDIR "${PREFIX}/include" CACHE STRING "C Header files install directory. Defaults to ${CMAKE_INSTALL_PREFIX}/include.")
+SET(INCLUDEDIR "${PREFIX}/include" CACHE STRING "C Header files install directory. Defaults to ${SWORD_INSTALL_DIR}/include.")
+
+SET(BINDIR "${PREFIX}/bin" CACHE STRING "Directory to install binary executable files. Defaults to ${SWORD_INSTALL_DIR}/bin.")

Modified: trunk/utilities/CMakeLists.txt
===================================================================
--- trunk/utilities/CMakeLists.txt	2013-06-19 14:01:28 UTC (rev 2824)
+++ trunk/utilities/CMakeLists.txt	2013-06-20 00:36:54 UTC (rev 2825)
@@ -88,7 +88,7 @@
 # 
 FOREACH(UTIL ${install_UTILITIES})
 	INSTALL(TARGETS ${UTIL}
-		DESTINATION ${SWORD_INSTALL_DIR}/bin
+		DESTINATION ${BINDIR}
 		COMPONENT utilities
 	)
 ENDFOREACH(UTIL ${install_UTILITIES})
@@ -113,7 +113,7 @@
 	TARGET_LINK_LIBRARIES(diatheke sword_static)
 ENDIF(BUILDING_SHARED)
 INSTALL(TARGETS diatheke
-	DESTINATION ${SWORD_INSTALL_DIR}/bin
+	DESTINATION ${BINDIR}
 	COMPONENT utilities
 )