No commit message

No commit message

sm/FindCairo.cmake

@@ -59,11 +59,11 @@ IF (CAIRO_LIBRARY)
     ENDIF(NOT CAIRO_FIND_QUIETLY)
     SET( CAIRO_LIBRARIES ${CAIRO_LIBRARY} )
 #     CB: We dont use this yet anyway
-     FIND_PROGRAM(CAIRO_CONFIG 
-       NAMES pkg-config
-       PATHS ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin /usr/bin /usr/nekoware/bin /usr/X11/bin
-     )
-     EXEC_PROGRAM(${CAIRO_CONFIG} ARGS "--libs cairo" OUTPUT_VARIABLE CAIRO_LIBS)
-     EXEC_PROGRAM(${CAIRO_CONFIG} ARGS "--cflags cairo" OUTPUT_VARIABLE CAIRO_CFLAGS)
+     # FIND_PROGRAM(CAIRO_CONFIG 
+     #   NAMES pkg-config
+     #   PATHS ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin /usr/bin /usr/nekoware/bin /usr/X11/bin
+     # )
+     # EXEC_PROGRAM(${CAIRO_CONFIG} ARGS "--libs cairo" OUTPUT_VARIABLE CAIRO_LIBS)
+     # EXEC_PROGRAM(${CAIRO_CONFIG} ARGS "--cflags cairo" OUTPUT_VARIABLE CAIRO_CFLAGS)
   ENDIF (CAIRO_INCLUDE_DIR)
 ENDIF (CAIRO_LIBRARY)

sm/lib/json-c/CMakeLists.txt

@@ -71,4 +71,4 @@ MY_CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
 MY_CHECK_FUNCTION_EXISTS(vsnprintf HAVE_VSNPRINTF)
 MY_CHECK_FUNCTION_EXISTS(vsyslog HAVE_VSYSLOG)
 
-CONFIGURE_FILE(config.h.cmake config.h)
+CONFIGURE_FILE(config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)

sm/lib/json-c/test1.c

@@ -6,6 +6,7 @@
 
 int main(int argc, char **argv)
 {
+  argc = 0; argv = 0;
   struct json_tokener *tok;
   struct json_object *my_string, *my_int, *my_object, *my_array;
   struct json_object *new_obj;
@@ -166,7 +167,7 @@ printf("Hello\n");
 	struct json_object *my_array = json_object_new_array();
 	int i; for(i=0;i<20;i++) {
 		json_object_array_add(my_array, 
-			i%5 > 0 ? json_object_new_double(i) :
+			i%5 > 0 ? json_object_new_double((double)i) :
 				json_tokener_parse("null")
 					);
 	}