[Tux4kids-commits] r483 - in tuxmath/trunk: . intl macosx src

[tholy-guest at alioth.debian.org]

Author: tholy-guest
Date: 2008-05-07 14:18:22 +0000 (Wed, 07 May 2008)
New Revision: 483

Modified:
   tuxmath/trunk/CMakeLists.txt
   tuxmath/trunk/intl/CMakeLists.txt
   tuxmath/trunk/macosx/CMakeLists.txt
   tuxmath/trunk/src/CMakeLists.txt
Log:
Small fixes to Mac intl build.


Modified: tuxmath/trunk/CMakeLists.txt
===================================================================
--- tuxmath/trunk/CMakeLists.txt	2008-05-07 13:53:29 UTC (rev 482)
+++ tuxmath/trunk/CMakeLists.txt	2008-05-07 14:18:22 UTC (rev 483)
@@ -8,7 +8,7 @@
 
 project(TuxMath)
 
-set(TUXMATH_VERSION "1.6.1")
+set(TUXMATH_VERSION "1.6.3")
 set(TUXMATHADMIN_VERSION "0.1.1")
 message("Building TuxMath version ${TUXMATH_VERSION}")
 
@@ -48,6 +48,8 @@
   # instead include SDLmain.m as a source file
   set (TUXMATH_EXTRA_INCLUDE ${TuxMath_SOURCE_DIR}/macosx)
   set (TUXMATH_EXTRA_SRC ${TuxMath_SOURCE_DIR}/macosx/SDLMain.m)
+  # Set some variables
+  set(MACOSX_BUNDLE_BUNDLE_VERSION ${TUXMATH_VERSION})
 elseif (UNIX)
   # A non-apple Unix (Linux, Solaris, etc.)
   # This is where one would test for installed/relocatable, if that
@@ -99,7 +101,6 @@
   set(PREFIX ${CMAKE_BINARY_DIR})
   add_subdirectory(intl)
 endif (TUXMATH_BUILD_INTL)
-message("intl_sources1a: ${INTL_SOURCES}")
 add_subdirectory(src)
 add_subdirectory(data)
 add_subdirectory(doc)

Modified: tuxmath/trunk/intl/CMakeLists.txt
===================================================================
--- tuxmath/trunk/intl/CMakeLists.txt	2008-05-07 13:53:29 UTC (rev 482)
+++ tuxmath/trunk/intl/CMakeLists.txt	2008-05-07 14:18:22 UTC (rev 483)
@@ -39,7 +39,6 @@
 if (NOT INTL_SOURCE_DIR)
   set(INTL_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 endif ()
-message("INTL_BINARY_DIR2 ${INTL_BINARY_DIR}")
 
 # Generate the appropriate header files
 configure_file(libgnuintl.h.in ${INTL_BINARY_DIR}/libgnuintl.h)
@@ -105,8 +104,6 @@
       intl-compat.c
 )
 
-message("intl_sources1: ${INTL_SOURCES}")
-
 include_directories(${INTL_BINARY_DIR} ${INTL_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 if(ICONV_FOUND)

Modified: tuxmath/trunk/macosx/CMakeLists.txt
===================================================================
--- tuxmath/trunk/macosx/CMakeLists.txt	2008-05-07 13:53:29 UTC (rev 482)
+++ tuxmath/trunk/macosx/CMakeLists.txt	2008-05-07 14:18:22 UTC (rev 483)
@@ -11,6 +11,11 @@
   copyFramework(${SDLIMAGE_INCLUDE_DIR} ${FRAMEWORK_DEST_DIR})
   copyFramework(${SDLTTF_INCLUDE_DIR} ${FRAMEWORK_DEST_DIR})
 
+  # Internationalization library
+  if (TUXMATH_BUILD_INTL)
+    install(FILES ${CMAKE_BINARY_DIR}/intl/libintl.a DESTINATION ${FRAMEWORK_DEST_DIR})
+  endif (TUXMATH_BUILD_INTL)
+
   # Make the disk image
   install(CODE "file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/macdist)")
   install(CODE "execute_process(COMMAND mv ${CMAKE_BINARY_DIR}/src/tuxmath.app ${CMAKE_BINARY_DIR}/macdist/)")

Modified: tuxmath/trunk/src/CMakeLists.txt
===================================================================
--- tuxmath/trunk/src/CMakeLists.txt	2008-05-07 13:53:29 UTC (rev 482)
+++ tuxmath/trunk/src/CMakeLists.txt	2008-05-07 14:18:22 UTC (rev 483)
@@ -58,7 +58,6 @@
 
 if (TUXMATH_BUILD_INTL)
   link_directories(${INTL_BINARY_DIR})
-  message("Added link directory ${INTL_BINARY_DIR}")
 endif(TUXMATH_BUILD_INTL)