[sword-svn] r2831 - trunk/cmake

[chrislit at crosswire.org]

Author: chrislit
Date: 2013-06-22 21:21:14 -0700 (Sat, 22 Jun 2013)
New Revision: 2831

Modified:
   trunk/cmake/FindICU.cmake
   trunk/cmake/install.cmake
   trunk/cmake/muxsources.cmake
   trunk/cmake/sources.cmake
Log:
removed ICU stuff from CMake files to match autotools files


Modified: trunk/cmake/FindICU.cmake
===================================================================
--- trunk/cmake/FindICU.cmake	2013-06-23 01:22:45 UTC (rev 2830)
+++ trunk/cmake/FindICU.cmake	2013-06-23 04:21:14 UTC (rev 2831)
@@ -23,16 +23,6 @@
   DOC "Libraries to link against for the common parts of ICU")
 mark_as_advanced(ICU_LIBRARY)
 
-find_program(
-  ICU_GENRB
-  NAMES genrb)
-
-find_package(PkgConfig)
-if(PKG_CONFIG_FOUND)
-	pkg_check_modules(ICU icu-uc)
-	MESSAGE(STATUS "ICU version: ${ICU_VERSION}")
-endif(PKG_CONFIG_FOUND)
-
 # Copy the results to the output variables.
 if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
   set(ICU_FOUND 1)

Modified: trunk/cmake/install.cmake
===================================================================
--- trunk/cmake/install.cmake	2013-06-23 01:22:45 UTC (rev 2830)
+++ trunk/cmake/install.cmake	2013-06-23 04:21:14 UTC (rev 2831)
@@ -52,33 +52,3 @@
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/sword.pc.in ${CMAKE_CURRENT_BINARY_DIR}/sword.pc @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/sword.pc
 	DESTINATION "${LIBDIR}/pkgconfig")
-
-# Need to build/install the 
-IF(WITH_ICU AND ICU_GENRB)
-	ADD_DEFINITIONS(-DSWICU_DATA="${LIBDIR}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}")
-      FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/icu")
-      FOREACH(translit ${translit_SOURCES})
-	  STRING(REPLACE ".txt" ".res" translit_OUTPUT ${translit})
-	  # Only needs to be run once, really, so we'll hook it to the end of either
-	  IF(BUILDING_SHARED)
-		ADD_CUSTOM_COMMAND(TARGET sword
-		POST_BUILD
-		COMMAND ${ICU_GENRB} -s . -d "${CMAKE_CURRENT_BINARY_DIR}/icu" ${translit}
-		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/icu"
-		COMMENT "Converting ${translit}"
-		VERBATIM
-		)
-	  ELSE(BUILDING_SHARED)
-		ADD_CUSTOM_COMMAND(TARGET sword_static
-		POST_BUILD
-		COMMAND ${ICU_GENRB} -s . -d "${CMAKE_CURRENT_BINARY_DIR}/icu" ${translit}
-		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/icu"
-		COMMENT "Converting ${translit}"
-		VERBATIM
-		)
-	  ENDIF(BUILDING_SHARED)
-	  
-	  INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/icu/${translit_OUTPUT}"
-		  DESTINATION "${LIBDIR}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}")
-     ENDFOREACH(translit ${translit_SOURCES})
-ENDIF(WITH_ICU AND ICU_GENRB)

Modified: trunk/cmake/muxsources.cmake
===================================================================
--- trunk/cmake/muxsources.cmake	2013-06-23 01:22:45 UTC (rev 2830)
+++ trunk/cmake/muxsources.cmake	2013-06-23 04:21:14 UTC (rev 2831)
@@ -27,7 +27,7 @@
 	ENDIF(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes")
 ENDIF(SWORD_NO_ZLIB STREQUAL "Yes")
 
-# Check for if we've found ICU
+# Check for if we've found cURL
 IF(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes")
 	MESSAGE(STATUS "cURL: system ${CURL_LIBRARY} and ${CURL_INCLUDE_DIRS}")
 	ADD_DEFINITIONS(-DCURLAVAILABLE)

Modified: trunk/cmake/sources.cmake
===================================================================
--- trunk/cmake/sources.cmake	2013-06-23 01:22:45 UTC (rev 2830)
+++ trunk/cmake/sources.cmake	2013-06-23 04:21:14 UTC (rev 2831)
@@ -419,16 +419,3 @@
 SET(INTERNAL_REGEX_HEADER
 	include/internal/regex/regex.h
 )
-
-SET(translit_SOURCES
-	translit_Any_Latex.txt
-	translit_Any_Latin1.txt
-	translit_BETA_Greek.txt
-	translit_BGreek_Greek.txt
-	translit_CCAT_Hebrew.txt
-	translit_CCAT_Syriac.txt
-	translit_Latin_Coptic.txt
-	translit_Latin_Gothic.txt
-	translit_Latin_Ugaritic.txt
-	translit_swordindex.txt
-)