- Added Linux support for the CMakeLists. This meant downgrading them for

CMake 2.4, since the distros don't seem to consider 2.6 stable yet.
  As a bonus, GTK+ is no longer a required dependency; now it's optional.
- Made dehsupp ignore CR characters, so it doesn't spew warnings on Linux.



SVN r1092 (trunk)

tools/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required( VERSION 2.6 )
+cmake_minimum_required( VERSION 2.4 )
 
 add_subdirectory( lemon )
 add_subdirectory( re2c )

tools/dehsupp/CMakeLists.txt

@@ -1,19 +1,24 @@
-cmake_minimum_required( VERSION 2.6 )
-project( dehsupp )
+cmake_minimum_required( VERSION 2.4 )
+include( CheckFunctionExists )
 
 set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG" )
 
 add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/parse.h ${CMAKE_CURRENT_BINARY_DIR}/parse.c
 	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/parse.y ${CMAKE_CURRENT_BINARY_DIR}
-	COMMAND lemon parse.y
+	COMMAND ${CMAKE_BINARY_DIR}/tools/lemon/lemon parse.y
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 	DEPENDS lemon parse.y )
 
 add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/scanner.c
-	COMMAND re2c -s -o ${CMAKE_CURRENT_BINARY_DIR}/scanner.c ${CMAKE_CURRENT_SOURCE_DIR}/scanner.re
+	COMMAND ${CMAKE_BINARY_DIR}/tools/re2c/re2c -s -o ${CMAKE_CURRENT_BINARY_DIR}/scanner.c ${CMAKE_CURRENT_SOURCE_DIR}/scanner.re
 	DEPENDS re2c scanner.re )
 
 include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
 
+CHECK_FUNCTION_EXISTS( stricmp STRICMP_EXISTS )
+if( NOT STRICMP_EXISTS )
+	add_definitions( -Dstricmp=strcasecmp )
+endif( NOT STRICMP_EXISTS )
+
 add_executable( dehsupp dehsupp.c parse.c scanner.c )
 add_dependencies( dehsupp ${CMAKE_CURRENT_BINARY_DIR}/parse.c ${CMAKE_CURRENT_BINARY_DIR}/scanner.c )

tools/dehsupp/scanner.re

@@ -122,7 +122,10 @@ ESC	= [\\] ([abfnrtv?'"\\] | "x" H+ | O+);
 
 	any
 		{
-		printf("unexpected character: %c\n", *s->tok);
+		if (*s->tok != '\r')
+		{
+			printf("unexpected character: %c (%#02x)\n", *s->tok, *s->tok);
+		}
 		goto std;
 		}
 */

tools/fixrtext/CMakeLists.txt

@@ -1,4 +1,2 @@
-cmake_minimum_required( VERSION 2.6 )
-project( fixrtext )
-
+cmake_minimum_required( VERSION 2.4 )
 add_executable( fixrtext fixrtext.c )

tools/lemon/CMakeLists.txt

@@ -1,5 +1,4 @@
-cmake_minimum_required( VERSION 2.6 )
-project( lemon )
+cmake_minimum_required( VERSION 2.4 )
 
 set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG" )
 

tools/re2c/CMakeLists.txt

@@ -1,5 +1,4 @@
 cmake_minimum_required( VERSION 2.4 )
-include( CheckIncludeFiles )
 include( CheckFunctionExists )
 include( CheckTypeSize )
 
@@ -9,11 +8,6 @@ set( PACKAGE_VERSION 0.12.3 )
 set( PACKAGE_STRING "re2c 0.12.3" )
 set( PACKAGE_BUGREPORT "re2c-general@lists.sourceforge.net" )
 
-set( PACKAGE ${PACKAGE_NAME} )
-set( VERSION ${PACKAGE_VERSION} )
-
-CHECK_INCLUDE_FILES( unistd.h HAVE_UNISTD_H )
-
 CHECK_FUNCTION_EXISTS( strdup HAVE_STRDUP )
 CHECK_FUNCTION_EXISTS( strndup HAVE_STRNDUP )
 

tools/updaterevision/CMakeLists.txt

@@ -1,5 +1,4 @@
-cmake_minimum_required( VERSION 2.6 )
-project( updaterevision )
+cmake_minimum_required( VERSION 2.4 )
 
 if( WIN32 )
 	if( CMAKE_COMPILER_IS_GNUC OR CMAKE_COMPILER_IS_GNUCXX )