[Tux4kids-commits] r467 - in tuxmath/trunk: . cmake-modules

[tholy-guest at alioth.debian.org]

Author: tholy-guest
Date: 2008-04-23 09:30:51 +0000 (Wed, 23 Apr 2008)
New Revision: 467

Modified:
   tuxmath/trunk/CMakeLists.txt
   tuxmath/trunk/cmake-modules/FindMSGFMT.cmake
Log:
Continued (but not completed) work on supporting internationalization.


Modified: tuxmath/trunk/CMakeLists.txt
===================================================================
--- tuxmath/trunk/CMakeLists.txt	2008-04-22 18:25:02 UTC (rev 466)
+++ tuxmath/trunk/CMakeLists.txt	2008-04-23 09:30:51 UTC (rev 467)
@@ -34,31 +34,46 @@
 endif (APPLE)
 
 ## Code for internationalization: if we don't have gettext, we need to
-## compile the intl library
+## compile the intl library.  In some cases, we will need to compile
+## the intl library even if we have gettext---we might not be able to
+## count on the installed system having it, even if the development
+## system does.
 include (CheckSymbolExists)
 check_symbol_exists (gettext libintl.h HAVE_GETTEXT)
 find_package (MSGFMT)
+#message("MSGFMT_FOUND ${MSGFMT_FOUND}    MSGFMT_EXECUTABLE ${MSGFMT_EXECUTABLE}")
+set (BUILD_INTL FALSE)
+if (DEFINED HAVE_GETTEXT)
+  set (BUILD_INTL TRUE)
+endif (DEFINED HAVE_GETTEXT)
+if (NOT MSGFMT_FOUND)
+  message("Warning: internationalization disabled")
+endif (NOT MSGFMT_FOUND)
+message("HAVE_GETTEXT ${HAVE_GETTEXT}   BUILD_INTL ${BUILD_INTL}")
+if (APPLE)
+  set (BUILD_INTL TRUE)
+endif (APPLE)
+message("HAVE_GETTEXT ${HAVE_GETTEXT}   BUILD_INTL ${BUILD_INTL}")
 
 ## Add subdirectories
 add_subdirectory (src)
 add_subdirectory (data)
 add_subdirectory (doc)
-if (HAVE_GETTEXT)
+if (MSGFMT_FOUND)
   add_subdirectory (po)
-endif (HAVE_GETTEXT)
+endif (MSGFMT_FOUND)
+if (BUILD_INTL)
+  add_subdirectory (intl)
+endif (BUILD_INTL)
 
 if (APPLE)
-  macro (getFramework headerDir)
+  macro (copyFramework headerDir destDir)
     string(REPLACE "/Headers" "" FRAMEWORK_SOURCE_DIR ${headerDir})
-  endmacro(getFramework)
+    install(DIRECTORY ${FRAMEWORK_SOURCE_DIR} DESTINATION ${destDir})
+  endmacro(copyFramework)
   set(FRAMEWORK_DEST_DIR ${tuxmath_BINARY_DIR}/src/${MACOSX_BUNDLE_NAME}.app/Contents/Frameworks)
-
-  getFramework(${SDL_INCLUDE_DIR})
-  install (DIRECTORY ${FRAMEWORK_SOURCE_DIR} DESTINATION ${FRAMEWORK_DEST_DIR})
-  getFramework(${SDLMIXER_INCLUDE_DIR})
-  install (DIRECTORY ${FRAMEWORK_SOURCE_DIR} DESTINATION ${FRAMEWORK_DEST_DIR})
-  getFramework(${SDLIMAGE_INCLUDE_DIR})
-  install (DIRECTORY ${FRAMEWORK_SOURCE_DIR} DESTINATION ${FRAMEWORK_DEST_DIR})
-  getFramework(${SDLTTF_INCLUDE_DIR})
-  install (DIRECTORY ${FRAMEWORK_SOURCE_DIR} DESTINATION ${FRAMEWORK_DEST_DIR})
+  copyFramework(${SDL_INCLUDE_DIR} ${FRAMEWORK_DEST_DIR})
+  copyFramework(${SDLMIXER_INCLUDE_DIR} ${FRAMEWORK_DEST_DIR})
+  copyFramework(${SDLIMAGE_INCLUDE_DIR} ${FRAMEWORK_DEST_DIR})
+  copyFramework(${SDLTTF_INCLUDE_DIR} ${FRAMEWORK_DEST_DIR})
 endif (APPLE)

Modified: tuxmath/trunk/cmake-modules/FindMSGFMT.cmake
===================================================================
--- tuxmath/trunk/cmake-modules/FindMSGFMT.cmake	2008-04-22 18:25:02 UTC (rev 466)
+++ tuxmath/trunk/cmake-modules/FindMSGFMT.cmake	2008-04-23 09:30:51 UTC (rev 467)
@@ -17,7 +17,7 @@
 ELSE(MSGFMT_EXECUTABLE)
     FIND_PROGRAM(MSGFMT_EXECUTABLE
 	NAMES msgfmt gmsgfmt
-	PATHS /bin /usr/bin /usr/local/bin )
+	PATHS /bin /usr/bin /usr/local/bin /opt/local/bin)
     IF(MSGFMT_EXECUTABLE)
         SET(MSGFMT_FOUND TRUE)
     ELSE(MSGFMT_EXECUTABLE)