[sword-svn] r2591 - trunk/cmake

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2010-12-06 12:25:48 -0700 (Mon, 06 Dec 2010)
New Revision: 2591

Modified:
   trunk/cmake/install.cmake
Log:
Fixing install location of ICU resources.

I moved the install location of the ICU resources of SWORD into a subdir
of the ${libdir} so that the ICU was not directly cluttering up the libdir.
This makes CMake behavior identical to autotools in this regard and fixes
up an issue reported by the packaging team.


Modified: trunk/cmake/install.cmake
===================================================================
--- trunk/cmake/install.cmake	2010-11-21 16:14:35 UTC (rev 2590)
+++ trunk/cmake/install.cmake	2010-12-06 19:25:48 UTC (rev 2591)
@@ -62,7 +62,7 @@
 
 # Need to build/install the 
 IF(WITH_ICU AND ICU_GENRB)
-      ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/${SWORD_VERSION}_icu_${ICU_VERSION}")
+      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})
@@ -86,6 +86,6 @@
 	  ENDIF(BUILDING_SHARED)
 	  
 	  INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/icu/${translit_OUTPUT}"
-	       DESTINATION "${libdir}/${SWORD_VERSION}_icu_${ICU_VERSION}")
+	       DESTINATION "${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}")
      ENDFOREACH(translit ${translit_SOURCES})
-ENDIF(WITH_ICU AND ICU_GENRB)
\ No newline at end of file
+ENDIF(WITH_ICU AND ICU_GENRB)