[sword-svn] r3560 - in branches/sword-1-8-x: . bindings/swig/python cmake tests/testsuite utilities utilities/diatheke

greg.hellings at crosswire.org greg.hellings at crosswire.org
Thu Jan 4 01:13:41 MST 2018 

Author: greg.hellings
Date: 2018-01-04 01:13:41 -0700 (Thu, 04 Jan 2018)
New Revision: 3560

Added:
   branches/sword-1-8-x/utilities/diatheke/CMakeLists.txt
Modified:
   branches/sword-1-8-x/
   branches/sword-1-8-x/CMakeLists.txt
   branches/sword-1-8-x/bindings/swig/python/CMakeLists.txt
   branches/sword-1-8-x/cmake/options.cmake
   branches/sword-1-8-x/tests/testsuite/CMakeLists.txt
   branches/sword-1-8-x/utilities/CMakeLists.txt
Log:
Merge r3558 and r3559



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
   + /trunk:3459-3471,3473,3475,3477-3482,3485-3514,3516,3518-3523,3525-3536,3538,3540,3545-3547,3551,3555,3558-3559

Modified: branches/sword-1-8-x/CMakeLists.txt
===================================================================
--- branches/sword-1-8-x/CMakeLists.txt	2018-01-04 07:19:22 UTC (rev 3559)
+++ branches/sword-1-8-x/CMakeLists.txt	2018-01-04 08:13:41 UTC (rev 3560)
@@ -5,8 +5,8 @@
 #
 # NOTES: Defaults to build type of Shared
 #        Forces out-of-source tree build
-#        
 #
+#
 # This file started on 18 January 2010 by Gregory Hellings
 # It is ceded to The SWORD Library developers and CrossWire under the terms
 # of their own GPLv2 license and all copyright is transferred to them for
@@ -106,7 +106,7 @@
 	# same exact name.  In other systems, the .a and .so suffixes suffice
 	# to keep them separate
 	IF(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*")
-		SET_TARGET_PROPERTIES(sword_static PROPERTIES 
+		SET_TARGET_PROPERTIES(sword_static PROPERTIES
 			OUTPUT_NAME "sword")
 		#MESSAGE(STATUS "Building Static library with name sword")
 	ELSE(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*")
@@ -263,7 +263,7 @@
 #############################################################################################
 # Platform-specifc bits that I will eventually refactor out into their own files, once I am happy
 # with the stuff that is here.
-# 
+#
 IF(APPLE OR iPhone)
 	ADD_DEFINITIONS(-Dunix)
 ENDIF(APPLE OR iPhone)
@@ -281,7 +281,7 @@
 
 ##############################################################################################
 # Installing the library, headers, utilies, etc
-# 
+#
 
 INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/install.cmake")
 
@@ -295,7 +295,7 @@
 
 ##############################################################################################
 # Utilities are hawt
-# 
+#
 
 IF(NOT SWORD_BUILD_UTILS STREQUAL "No")
 	ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/utilities")
@@ -303,7 +303,7 @@
 
 ##############################################################################################
 # Demos are also hawt
-# 
+#
 
 IF(SWORD_BUILD_EXAMPLES STREQUAL "Yes")
 	ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/examples/cmdline")

Modified: branches/sword-1-8-x/bindings/swig/python/CMakeLists.txt
===================================================================
--- branches/sword-1-8-x/bindings/swig/python/CMakeLists.txt	2018-01-04 07:19:22 UTC (rev 3559)
+++ branches/sword-1-8-x/bindings/swig/python/CMakeLists.txt	2018-01-04 08:13:41 UTC (rev 3560)
@@ -44,11 +44,9 @@
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 # Allow user installation to custom directory
-IF(SWORD_PYTHON_INSTALL_DIR)
-    SET(SETUP_ARGS "--home=${SWORD_PYTHON_INSTALL_DIR} --root \$ENV{DESTDIR}")
-ELSE(SWORD_PYTHON_INSTALL_DIR)
-    SET(SETUP_ARGS "--root \$ENV{DESTDIR}")
-ENDIF(SWORD_PYTHON_INSTALL_DIR)
+IF(NOT SWORD_PYTHON_INSTALL_DIR STREQUAL "")
+	SET(SETUP_ARGS "\"--prefix=${SWORD_PYTHON_INSTALL_DIR}\"")
+ENDIF(NOT SWORD_PYTHON_INSTALL_DIR STREQUAL "")
 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/install.cmake.in"
 	       "${CMAKE_CURRENT_BINARY_DIR}/install.cmake")
 

Modified: branches/sword-1-8-x/cmake/options.cmake
===================================================================
--- branches/sword-1-8-x/cmake/options.cmake	2018-01-04 07:19:22 UTC (rev 3559)
+++ branches/sword-1-8-x/cmake/options.cmake	2018-01-04 08:13:41 UTC (rev 3560)
@@ -22,9 +22,6 @@
     endif()
 endmacro(_SET_FANCY)
 
-# A list of the options that the library supports
-SET(SWORD_PYTHON_INSTALL_DIR "" CACHE STRING "Directory where the Python bindings will be installed. Defaults to default Python path.")
-
 # Installation options
 IF(APPLE)
 	SET(SWORD_INSTALL_DIR "/opt/local")
@@ -34,6 +31,7 @@
 	SET(SWORD_INSTALL_DIR "/usr/local")
 ENDIF(APPLE)
 
+# A list of the options that the library supports
 _SET_FANCY(CMAKE_INSTALL_PREFIX "${SWORD_INSTALL_DIR}" "Directory into which to install architecture-dependent files. Defaults to ${SWORD_INSTALL_DIR}.")
 
 _SET_FANCY(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" "Object code library install directory. Defaults to ${SWORD_INSTALL_DIR}/lib")
@@ -46,6 +44,8 @@
 
 _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.")
+
 # Post-processing of variables
 MACRO(PROCESS_VERSION LEVEL VALUE)
     SET(SWORD_VERSION_${LEVEL} ${VALUE})

Modified: branches/sword-1-8-x/tests/testsuite/CMakeLists.txt
===================================================================
--- branches/sword-1-8-x/tests/testsuite/CMakeLists.txt	2018-01-04 07:19:22 UTC (rev 3559)
+++ branches/sword-1-8-x/tests/testsuite/CMakeLists.txt	2018-01-04 08:13:41 UTC (rev 3560)
@@ -1,12 +1,12 @@
 #############################################################################
 # This file will actually be responsible for running the tests
-# 
+#
 
+FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/sword.conf" "[Install]\nLocalePath=${CMAKE_CURRENT_SOURCE_DIR}/../../")
+
 ADD_CUSTOM_TARGET(
 	tests_configure
-	COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/*.sh ${CMAKE_CURRENT_BINARY_DIR}
-	COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/*.good ${CMAKE_CURRENT_BINARY_DIR}
-	COMMAND echo \"[Install]\\nLocalePath=${CMAKE_CURRENT_SOURCE_DIR}/../../\" > ${CMAKE_CURRENT_BINARY_DIR}/sword.conf
+	COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/*.{sh,good,imp,txt,xml}" "${CMAKE_CURRENT_BINARY_DIR}"
 	DEPENDS ${test_PROGRAMS}
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )

Modified: branches/sword-1-8-x/utilities/CMakeLists.txt
===================================================================
--- branches/sword-1-8-x/utilities/CMakeLists.txt	2018-01-04 07:19:22 UTC (rev 3559)
+++ branches/sword-1-8-x/utilities/CMakeLists.txt	2018-01-04 08:13:41 UTC (rev 3560)
@@ -4,12 +4,12 @@
 # The general assumption is that each of these utilities is built from
 # a single source file, which shares its name with the utility itself (appended with .cpp),
 # and then linked against the SWORD library.
-# 
+#
 # This list will be built and installed, if so chosen
 #
 # These are in alphbetical order now - please keep them that way
 # if you edit this list in the future.
-# 
+#
 SET(install_UTILITIES
 	addld
 	emptyvss
@@ -35,7 +35,7 @@
 
 ######################################################################
 # These utilities will be built, but they will not be installed
-# 
+#
 # Again, I have gone to great lengths of travail to make this list
 # alphabetical.  If you add utilities to this list, please do so in a
 # way that maintains this.
@@ -53,7 +53,7 @@
 #####################################################################
 # This will loop over both of the above utility lists and add build targets
 # to the system for each one of them.
-# 
+#
 
 FOREACH(UTIL ${install_UTILITIES} ${noinstall_UTILITIES})
 	ADD_EXECUTABLE("${UTIL}"	"${UTIL}.cpp")
@@ -67,7 +67,7 @@
 ####################################################################
 # Just to be difficult, we have a single C file that is a utility
 # and, therefore, needs its own treatment.
-# 
+#
 
 ADD_EXECUTABLE(lexdump	lexdump.c)
 IF(BUILDING_SHARED)
@@ -84,7 +84,7 @@
 # is limited to CMake files in this directory and below, so rather than
 # replicate the above list in another place, we'll just handle our
 # own install, since this whole directory is optional, anyway.
-# 
+#
 FOREACH(UTIL ${install_UTILITIES})
 	INSTALL(TARGETS ${UTIL}
         RUNTIME DESTINATION "${BINDIR}"
@@ -92,27 +92,4 @@
 	)
 ENDFOREACH(UTIL ${install_UTILITIES})
 
-####################################################################
-# And, of course, diatheke is a beast unto itself
-#
-# Let's go!
-#
-ADD_EXECUTABLE(diatheke
-	diatheke/diatheke.cpp
-	diatheke/corediatheke.cpp
-	diatheke/diathekemgr.cpp
-	diatheke/diafiltmgr.cpp
-	diatheke/thmlcgi.cpp
-	diatheke/gbfcgi.cpp
-	diatheke/osiscgi.cpp
-)
-IF(BUILDING_SHARED)
-	TARGET_LINK_LIBRARIES(diatheke sword)
-ELSE(BUILDING_SHARED)
-	TARGET_LINK_LIBRARIES(diatheke sword_static)
-ENDIF(BUILDING_SHARED)
-INSTALL(TARGETS diatheke
-	DESTINATION "${BINDIR}"
-	COMPONENT utilities
-)
-
+ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/diatheke")

Copied: branches/sword-1-8-x/utilities/diatheke/CMakeLists.txt (from rev 3558, trunk/utilities/diatheke/CMakeLists.txt)
===================================================================
--- branches/sword-1-8-x/utilities/diatheke/CMakeLists.txt	                        (rev 0)
+++ branches/sword-1-8-x/utilities/diatheke/CMakeLists.txt	2018-01-04 08:13:41 UTC (rev 3560)
@@ -0,0 +1,24 @@
+####################################################################
+# And, of course, diatheke is a beast unto itself
+#
+# Let's go!
+#
+ADD_EXECUTABLE(diatheke
+	diatheke.cpp
+	corediatheke.cpp
+	diathekemgr.cpp
+	diafiltmgr.cpp
+	thmlcgi.cpp
+	gbfcgi.cpp
+	osiscgi.cpp
+)
+IF(BUILDING_SHARED)
+	TARGET_LINK_LIBRARIES(diatheke sword)
+ELSE(BUILDING_SHARED)
+	TARGET_LINK_LIBRARIES(diatheke sword_static)
+ENDIF(BUILDING_SHARED)
+INSTALL(TARGETS diatheke
+	DESTINATION "${BINDIR}"
+	COMPONENT utilities
+)
+

More information about the sword-cvs mailing list