[Tux4kids-commits] r480 - in tuxmath/trunk: . cmake-modules intl src

tholy-guest at alioth.debian.org tholy-guest at alioth.debian.org
Tue May 6 13:33:55 UTC 2008


Author: tholy-guest
Date: 2008-05-06 13:33:51 +0000 (Tue, 06 May 2008)
New Revision: 480

Added:
   tuxmath/trunk/cmake-modules/FindIconv.cmake
   tuxmath/trunk/intl/intl_config.h.cmake
Removed:
   tuxmath/trunk/cmake-modules/FindICONV.cmake
   tuxmath/trunk/cmake-modules/MacroBoolTo01.cmake
Modified:
   tuxmath/trunk/CMakeLists.txt
   tuxmath/trunk/cmake-modules/ConfigureChecksIntl.cmake
   tuxmath/trunk/config.h.cmake
   tuxmath/trunk/intl/CMakeLists.txt
   tuxmath/trunk/src/CMakeLists.txt
Log:
Preliminary CMake support for internationalization.


Modified: tuxmath/trunk/CMakeLists.txt
===================================================================
--- tuxmath/trunk/CMakeLists.txt	2008-05-05 11:57:09 UTC (rev 479)
+++ tuxmath/trunk/CMakeLists.txt	2008-05-06 13:33:51 UTC (rev 480)
@@ -15,8 +15,10 @@
 ## Setting up CMake itself
 cmake_minimum_required(VERSION 2.4)
 set(CMAKE_MODULE_PATH "${TuxMath_SOURCE_DIR}/cmake-modules")
-message("CMP: ${CMAKE_MODULE_PATH}")
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
+#message("CMP: ${CMAKE_MODULE_PATH}")
+
 ## Decide on our build-type: installed or relocatable
 ## Linux (& Windows?) would be installed, Mac relocatable
 ## Someday we might supply a Linux relocatable package; this would be
@@ -53,7 +55,7 @@
   set (TUXMATH_DATA_PREFIX ${CMAKE_INSTALL_PREFIX}/share/tuxmath)
   set (LOCALE_DIR ${CMAKE_INSTALL_PREFIX}/share/locale)
 endif (APPLE)
-message("TDP ${TUXMATH_DATA_PREFIX}")
+#message("TDP ${TUXMATH_DATA_PREFIX}")
 
 
 ## Decide on whether we're going to build with internationalization
@@ -77,8 +79,9 @@
 else (ENABLE_NLS)
   set(TUXMATH_BUILD_INTL false)  # No point in building intl if no NLS
 endif (ENABLE_NLS)
+message("ENABLE_NLS ${ENABLE_NLS}")
+set(HAVE_GETTEXT ENABLE_NLS)
 
-
 ## Run configure checks
 if (TUXMATH_BUILD_INTL)
   include(ConfigureChecksIntl)
@@ -100,8 +103,8 @@
   add_subdirectory(intl)
 endif (TUXMATH_BUILD_INTL)
 
-message("TMBD ${TuxMath_BINARY_DIR}")
-message("TMBN ${TUXMATH_MACOSX_BUNDLE_NAME}")
+#message("TMBD ${TuxMath_BINARY_DIR}")
+#message("TMBN ${TUXMATH_MACOSX_BUNDLE_NAME}")
 
 if (APPLE)
    add_subdirectory(macosx)

Modified: tuxmath/trunk/cmake-modules/ConfigureChecksIntl.cmake
===================================================================
--- tuxmath/trunk/cmake-modules/ConfigureChecksIntl.cmake	2008-05-05 11:57:09 UTC (rev 479)
+++ tuxmath/trunk/cmake-modules/ConfigureChecksIntl.cmake	2008-05-06 13:33:51 UTC (rev 480)
@@ -1,3 +1,7 @@
+# This is a relatively minimal set of checks needed to get the
+# gettext-runtime library to compile.  It's possible that more extensive
+# checks would optimize it.
+
 if (NOT INTL_CHECKS_DONE)
   include(CheckIncludeFiles)
   include(CheckSymbolExists)
@@ -2,40 +6,67 @@
   include(CheckCSourceCompiles)
+  include(CheckCSourceRuns)
   include(CheckTypeSize)
-  include(MacroBoolTo01)
 
-  #message(STATUS "CMAKE_REQUIRED_INCLUDES: ${CMAKE_REQUIRED_INCLUDES}")
-  #set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/include)
-  #message(STATUS "CMAKE_REQUIRED_INCLUDES: ${CMAKE_REQUIRED_INCLUDES}")
-  
-  #check_include_files(sys/types.h HAVE_SYS_TYPES_H)
-  #check_include_files(inttypes.h HAVE_INTTYPES_H)
-  #check_include_files(stdint.h HAVE_STDINT_H)
-  #check_include_files(stddef.h HAVE_STDDEF_H)
-  
+  # Set _GNU_SOURCE appropriately; this is required for certain checks
+  # below (e.g., asprintf, stpcpy, mempcpy).
+  check_c_source_compiles("
+  #include <features.h>
+  #ifdef __GNU_LIBRARY__
+  int main() {return 0;} 
+  #endif
+  " HAVE_GNU_SOURCE)
+  if (HAVE_GNU_SOURCE)
+    set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
+  endif()
+
+  # These first three are necessary if the check_type_size calls are to work
+  check_include_files(sys/types.h HAVE_SYS_TYPES_H)
+  check_include_files(stdint.h HAVE_STDINT_H)
+  check_include_files(stddef.h HAVE_STDDEF_H)
+  # Other checks (in some cases only for check_symbol_exists commands)
+  check_include_files(inttypes.h HAVE_INTTYPES_H)
+  check_include_files(unistd.h HAVE_UNISTD_H)
+  #check_include_files(fcntl.h HAVE_FCNTL_H)
+  #check_include_files(string.h HAVE_STRING_H)
+  #check_include_files(wchar.h HAVE_WCHAR_H)
+  #check_include_files(alloca.h HAVE_ALLOCA_H)
+  #check_include_files(stdio.h HAVE_STDIO_H)
+
+  # The next 4 checks are required for the conversion of libgnuintl.h.in
+  # to libintl.h and libgnuintl.h
   check_symbol_exists(snprintf "stdio.h" HAVE_SNPRINTF)
   check_symbol_exists(asprintf "stdio.h" HAVE_ASPRINTF)
   check_symbol_exists(wprintf "stdio.h" HAVE_WPRINTF)
-  check_symbol_exists(printf "stdio.h" HAVE_POSIX_PRINTF)
-
-  # Alternate for HAVE_POSIX_PRINTF: which is right?
-  check_c_source_compiles("
+  check_c_source_runs("
   #include <stdio.h>
   #include <string.h>
-  static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
+  static char *format = \"%2$d %1$d\";
   static char buf[100];
   int main ()
   {
     sprintf (buf, format, 33, 55);
+    return (strcmp (buf, \"55 33\") != 0);
   }" HAVE_POSIX_PRINTF)
 
 
-  check_symbol_exists(intmax_t "inttypes.h" HAVE_INTTYPES_H_WITH_UINTMAX)
-  check_symbol_exists(intmax_t "stdint.h" HAVE_INTTYPES_H_WITH_UINTMAX)
-  check_symbol_exists(uintmax_t "stdint.h" HAVE_STDINT_H_WITH_UINTMAX)
   check_symbol_exists(LC_MESSAGES "locale.h" HAVE_LC_MESSAGES)
-  check_symbol_exists(fcntl "stdio.h" HAVE_FCNTL)
+  check_symbol_exists(fcntl "fcntl.h" HAVE_FCNTL)
+  check_symbol_exists(stpcpy "string.h" HAVE_STPCPY)
+  check_symbol_exists(mempcpy "string.h" HAVE_MEMPCPY)
+  check_symbol_exists(getcwd "unistd.h" HAVE_GETCWD)
+  check_symbol_exists(alloca "alloca.h" HAVE_ALLOCA)
+  check_c_source_compiles("
+  #include <inttypes.h>
+  #include <sys/types.h>
+  int main() {uintmax_t tmp; return 0;}
+  " HAVE_INTTYPES_H_WITH_UINTMAX)
+  check_c_source_compiles("
+  #include <stdint.h>
+  #include <sys/types.h>
+  int main() {uintmax_t tmp; return 0;}
+  " HAVE_STDINT_H_WITH_UINTMAX)
+  
 
   check_type_size(intmax_t INTMAX_T)
-  message("HIT ${HAVE_INTMAX_T}, IT ${INTMAX_T}")
-  macro_bool_to_01(HAVE_STDINT_H_WITH_UINTMAX HAVE_UINTMAX_T)
+  check_type_size(uintmax_t UINTMAX_T)
 

Deleted: tuxmath/trunk/cmake-modules/FindICONV.cmake
===================================================================
--- tuxmath/trunk/cmake-modules/FindICONV.cmake	2008-05-05 11:57:09 UTC (rev 479)
+++ tuxmath/trunk/cmake-modules/FindICONV.cmake	2008-05-06 13:33:51 UTC (rev 480)
@@ -1,99 +0,0 @@
-#
-#  Copyright (c) 2006, Peter K�mmel, <syntheticpp at gmx.net>
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#  
-#  1. Redistributions of source code must retain the copyright
-#     notice, this list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#  3. The name of the author may not be used to endorse or promote products 
-#     derived from this software without specific prior written permission.
-#  
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-#  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-#  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-#  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-#  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-#  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-#  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#  
-
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
-
-if (ICONV_INCLUDE_DIR)
-  # Already in cache, be silent
-  set(ICONV_FIND_QUIETLY TRUE)
-endif()
-
-find_path(ICONV_INCLUDE_DIR iconv.h
- /usr/include
- /usr/local/include)
-
-set(POTENTIAL_ICONV_LIBS iconv libiconv libiconv2)
-
-find_library(ICONV_LIBRARY NAMES ${POTENTIAL_ICONV_LIBS}
-	PATHS /usr/lib /usr/local/lib)
-
-if(WIN32)
-	set(ICONV_DLL_NAMES iconv.dll  libiconv.dll libiconv2.dll)
-	find_file(ICONV_DLL   
-					NAMES ${ICONV_DLL_NAMES}
-					PATHS ENV PATH
-					NO_DEFAULT_PATH)
-	find_file(ICONV_DLL_HELP   
-					NAMES ${ICONV_DLL_NAMES}
-					PATHS ENV PATH
-					${ICONV_INCLUDE_DIR}/../bin)
-	if(ICONV_FIND_REQUIRED)
-		if(NOT ICONV_DLL AND NOT ICONV_DLL_HELP)
-			message(FATAL_ERROR "Could not find iconv.dll, please add correct your PATH environment variable")
-		endif()
-		if(NOT ICONV_DLL AND ICONV_DLL_HELP)
-			get_filename_component(ICONV_DLL_HELP ${ICONV_DLL_HELP} PATH)
-			message(STATUS)
-			message(STATUS "Could not find iconv.dll in standard search path, please add ")
-			message(STATUS "${ICONV_DLL_HELP}")
-			message(STATUS "to your PATH environment variable.")
-			message(STATUS)
-			message(FATAL_ERROR "exit cmake")
-		endif()
-	endif()
-	if(ICONV_INCLUDE_DIR AND ICONV_LIBRARY AND ICONV_DLL)
-   		set(ICONV_FOUND TRUE)
-	endif()
-else()
-	check_function_exists(iconv HAVE_ICONV_IN_LIBC)
-	if(ICONV_INCLUDE_DIR AND HAVE_ICONV_IN_LIBC)
-   		set(ICONV_FOUND TRUE)
-		set(ICONV_LIBRARY  CACHE TYPE STRING FORCE)
-	endif()
-	if(ICONV_INCLUDE_DIR AND ICONV_LIBRARY)
-   		set(ICONV_FOUND TRUE)
-	endif()
-endif()
-
-
-
-if(ICONV_FOUND)
-   if(NOT ICONV_FIND_QUIETLY)
-      message(STATUS "Found iconv library: ${ICONV_LIBRARY}")
-      #message(STATUS "Found iconv   dll  : ${ICONV_DLL}")
-   endif()
-else()
-   if(ICONV_FIND_REQUIRED)
-      message(STATUS "Looked for iconv library named ${POTENTIAL_ICONV_LIBS}.")
-      message(STATUS "Found no acceptable iconv library. This is fatal.")
-      message(STATUS "iconv header: ${ICONV_INCLUDE_DIR}")
-      message(STATUS "iconv lib   : ${ICONV_LIBRARY}")
-      message(FATAL_ERROR "Could NOT find iconv library")
-   endif()
-endif()
-
-mark_as_advanced(ICONV_LIBRARY ICONV_INCLUDE_DIR)

Added: tuxmath/trunk/cmake-modules/FindIconv.cmake
===================================================================
--- tuxmath/trunk/cmake-modules/FindIconv.cmake	                        (rev 0)
+++ tuxmath/trunk/cmake-modules/FindIconv.cmake	2008-05-06 13:33:51 UTC (rev 480)
@@ -0,0 +1,57 @@
+# - Try to find Iconv 
+# Once done this will define 
+# 
+#  ICONV_FOUND - system has Iconv 
+#  ICONV_INCLUDE_DIR - the Iconv include directory 
+#  ICONV_LIBRARIES - Link these to use Iconv 
+#  ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
+# 
+include(CheckCXXSourceCompiles)
+
+IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+  # Already in cache, be silent
+  SET(ICONV_FIND_QUIETLY TRUE)
+ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+
+FIND_PATH(ICONV_INCLUDE_DIR iconv.h) 
+ 
+FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c)
+ 
+IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
+   SET(ICONV_FOUND TRUE) 
+ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
+
+set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
+set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
+IF(ICONV_FOUND)
+  check_cxx_source_compiles("
+  #include <iconv.h>
+  int main(){
+    iconv_t conv = 0;
+    const char* in = 0;
+    size_t ilen = 0;
+    char* out = 0;
+    size_t olen = 0;
+    iconv(conv, &in, &ilen, &out, &olen);
+    return 0;
+  }
+" ICONV_SECOND_ARGUMENT_IS_CONST )
+ENDIF(ICONV_FOUND)
+set(CMAKE_REQUIRED_INCLUDES)
+set(CMAKE_REQUIRED_LIBRARIES)
+
+IF(ICONV_FOUND) 
+  IF(NOT ICONV_FIND_QUIETLY) 
+    MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") 
+  ENDIF(NOT ICONV_FIND_QUIETLY) 
+ELSE(ICONV_FOUND) 
+  IF(Iconv_FIND_REQUIRED) 
+    MESSAGE(FATAL_ERROR "Could not find Iconv") 
+  ENDIF(Iconv_FIND_REQUIRED) 
+ENDIF(ICONV_FOUND) 
+
+MARK_AS_ADVANCED(
+  ICONV_INCLUDE_DIR
+  ICONV_LIBRARIES
+  ICONV_SECOND_ARGUMENT_IS_CONST
+)

Deleted: tuxmath/trunk/cmake-modules/MacroBoolTo01.cmake
===================================================================
--- tuxmath/trunk/cmake-modules/MacroBoolTo01.cmake	2008-05-05 11:57:09 UTC (rev 479)
+++ tuxmath/trunk/cmake-modules/MacroBoolTo01.cmake	2008-05-06 13:33:51 UTC (rev 480)
@@ -1,20 +0,0 @@
-# MACRO_BOOL_TO_01( VAR RESULT0 ... RESULTN )
-# This macro evaluates its first argument
-# and sets all the given vaiables either to 0 or 1
-# depending on the value of the first one
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-MACRO(MACRO_BOOL_TO_01 FOUND_VAR )
-   FOREACH (_current_VAR ${ARGN})
-      IF(${FOUND_VAR})
-         SET(${_current_VAR} 1)
-      ELSE(${FOUND_VAR})
-         SET(${_current_VAR} 0)
-      ENDIF(${FOUND_VAR})
-   ENDFOREACH(_current_VAR)
-ENDMACRO(MACRO_BOOL_TO_01)

Modified: tuxmath/trunk/config.h.cmake
===================================================================
--- tuxmath/trunk/config.h.cmake	2008-05-05 11:57:09 UTC (rev 479)
+++ tuxmath/trunk/config.h.cmake	2008-05-06 13:33:51 UTC (rev 480)
@@ -1,4 +1,5 @@
 #cmakedefine HAVE_ERROR_H 1
-#cmakedefine HAVE_GETTEXT 1
 #cmakedefine HAVE_SCANDIR 1
 
+#cmakedefine HAVE_GETTEXT 1
+#cmakedefine ENABLE_NLS 1
\ No newline at end of file

Modified: tuxmath/trunk/intl/CMakeLists.txt
===================================================================
--- tuxmath/trunk/intl/CMakeLists.txt	2008-05-05 11:57:09 UTC (rev 479)
+++ tuxmath/trunk/intl/CMakeLists.txt	2008-05-06 13:33:51 UTC (rev 480)
@@ -19,11 +19,13 @@
 
 project(intl)
 
-#set(CMAKE_MODULE_PATH "/home/tim/src/tux4kids/tuxmath/trunk/cmake-modules")
+set(CMAKE_MODULE_PATH "/home/tim/src/tux4kids/tuxmath/trunk/cmake-modules")
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 include(CheckFunctionExists)
 
 # We require the iconv library to be available
-find_package(ICONV REQUIRED)
+find_package(Iconv REQUIRED)
+#message("Iconv const: ${ICONV_SECOND_ARGUMENT_IS_CONST}")
 add_definitions(-DHAVE_ICONV=1)
 
 # This can either be called in standalone mode, or as part of a larger
@@ -43,10 +45,7 @@
 configure_file(libgnuintl.h.in ${INTL_BINARY_DIR}/libgnuintl.h)
 configure_file(${INTL_BINARY_DIR}/libgnuintl.h ${INTL_BINARY_DIR}/libintl.h COPYONLY)
 # Generate the appropriate config.h file
-#configure_file(intl_config.h.cmake ${INTL_BINARY_DIR}/config.h)
-# For the moment, this doesn't work: you have to run automake's
-# "configure" and then copy config.h into the build directory
-check_include_file(config.h HAVE_CONFIG_H REQUIRED)
+configure_file(intl_config.h.cmake ${INTL_BINARY_DIR}/config.h)
 
 add_definitions(
     -DHAVE_CONFIG_H=1
@@ -104,7 +103,6 @@
       intl-compat.c
 )
 
-#lyx_add_path(intl_sources ${TOP_SRC_DIR}/intl)
 
 include_directories(${INTL_BINARY_DIR} ${INTL_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 

Added: tuxmath/trunk/intl/intl_config.h.cmake
===================================================================
--- tuxmath/trunk/intl/intl_config.h.cmake	                        (rev 0)
+++ tuxmath/trunk/intl/intl_config.h.cmake	2008-05-06 13:33:51 UTC (rev 480)
@@ -0,0 +1,53 @@
+/* Required headers */
+#cmakedefine HAVE_INTTYPES_H 1
+#cmakedefine HAVE_UNISTD_H 1
+#cmakedefine HAVE_INTTYPES_H_WITH_UINTMAX 1
+#cmakedefine HAVE_STDINT_H_WITH_UINTMAX 1
+
+/* Required functions */
+#cmakedefine HAVE_STPCPY 1
+#cmakedefine HAVE_MEMPCPY 1
+#cmakedefine HAVE_GETCWD 1
+
+/* Required definitions */
+#cmakedefine ICONV_SECOND_ARGUMENT_IS_CONST 1
+#ifdef ICONV_SECOND_ARGUMENT_IS_CONST
+#define ICONV_CONST const
+#else
+#define ICONV_CONST
+#endif
+#define ENABLE_NLS 1
+
+/* Stuff that may be optional */
+#cmakedefine HAVE_ALLOCA_H 1
+#cmakedefine HAVE_ALLOCA 1
+
+#define __libc_lock_t                   gl_lock_t
+#define __libc_lock_define              gl_lock_define
+#define __libc_lock_define_initialized  gl_lock_define_initialized
+#define __libc_lock_init                gl_lock_init
+#define __libc_lock_lock                gl_lock_lock
+#define __libc_lock_unlock              gl_lock_unlock
+#define __libc_lock_recursive_t                   gl_recursive_lock_t
+#define __libc_lock_define_recursive              gl_recursive_lock_define
+#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
+#define __libc_lock_init_recursive                gl_recursive_lock_init
+#define __libc_lock_lock_recursive                gl_recursive_lock_lock
+#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
+#define glthread_in_use  libintl_thread_in_use
+#define glthread_lock_init     libintl_lock_init
+#define glthread_lock_lock     libintl_lock_lock
+#define glthread_lock_unlock   libintl_lock_unlock
+#define glthread_lock_destroy  libintl_lock_destroy
+#define glthread_rwlock_init     libintl_rwlock_init
+#define glthread_rwlock_rdlock   libintl_rwlock_rdlock
+#define glthread_rwlock_wrlock   libintl_rwlock_wrlock
+#define glthread_rwlock_unlock   libintl_rwlock_unlock
+#define glthread_rwlock_destroy  libintl_rwlock_destroy
+#define glthread_recursive_lock_init     libintl_recursive_lock_init
+#define glthread_recursive_lock_lock     libintl_recursive_lock_lock
+#define glthread_recursive_lock_unlock   libintl_recursive_lock_unlock
+#define glthread_recursive_lock_destroy  libintl_recursive_lock_destroy
+#define glthread_once                 libintl_once
+#define glthread_once_call            libintl_once_call
+#define glthread_once_singlethreaded  libintl_once_singlethreaded

Modified: tuxmath/trunk/src/CMakeLists.txt
===================================================================
--- tuxmath/trunk/src/CMakeLists.txt	2008-05-05 11:57:09 UTC (rev 479)
+++ tuxmath/trunk/src/CMakeLists.txt	2008-05-06 13:33:51 UTC (rev 480)
@@ -46,12 +46,12 @@
 endif (NOT APPLE)
 
 ## Include files
-if (NOT ENABLE_NLS)
+#if (NOT ENABLE_NLS)
    # If you want internationalization, this doesn't work: you have to
    # run automake's "configure" and then copy config.h into the build
    # directory
    configure_file(${TuxMath_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-endif (NOT ENABLE_NLS)
+#endif (NOT ENABLE_NLS)
 #check_include_file(config.h HAVE_CONFIG_H REQUIRED)
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${TUXMATH_EXTRA_INCLUDES})
 




More information about the Tux4kids-commits mailing list