Fix out of source build. Set build profiles options.

CMakeLists.txt

@@ -17,6 +17,11 @@ cmake_minimum_required(VERSION 2.6)
 project(mcabber-jingle C) 
 set(PROJECT_VERSION "0.0.1")
 
+set(CMAKE_C_FLAGS_DEBUG "-Wall -O0 -g")
+set(CMAKE_C_FLAGS_RELEASE "-O2")
+set(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Wall -O2 -g")
+
 ## User settable options
 #option(USE_LIBNAME "Option Description")
 #if(USE_LIBNAME)
@@ -34,7 +39,7 @@ link_directories(${GLIB_LIBRARY_DIRS} ${LM_LIBRARY_DIRS} ${MCABBER_LIBRARY_DIRS}
 
 ## Compiler setup
 configure_file(config.h.in config.h)
-include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} ${MCABBER_INCLUDE_DIRS})
+include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} ${LM_INCLUDE_DIRS} ${MCABBER_INCLUDE_DIRS})
 
 ## Target definitions
 add_subdirectory(jingle)

jingle-ft/CMakeLists.txt

@@ -1,5 +1,3 @@
 add_library(jingle-ft MODULE filetransfer.c)
-set_target_properties(jingle-ft PROPERTIES COMPILE_FLAGS "-Wall -O2 -g")
-include_directories(${CMAKE_SOURCE_DIR})
-target_link_libraries(jingle-ft ${GLIB_LIBRARIES} ${LM_LIBRARIES})
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
 install(TARGETS jingle-ft DESTINATION lib/mcabber)

jingle-ibb/CMakeLists.txt

@@ -1,5 +1,3 @@
 add_library(jingle-ibb MODULE ibb.c ibb.h)
-set_target_properties(jingle-ibb PROPERTIES COMPILE_FLAGS "-Wall -O2 -g")
-include_directories(${CMAKE_SOURCE_DIR})
-target_link_libraries(jingle-ibb ${GLIB_LIBRARIES} ${LM_LIBRARIES})
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
 install(TARGETS jingle-ibb DESTINATION lib/mcabber)

jingle-s5b/CMakeLists.txt

@@ -1,11 +1,7 @@
 add_library(jingle-s5b MODULE socks5.c socks5.h)
-set_target_properties(jingle-s5b PROPERTIES COMPILE_FLAGS "-Wall -O2 -g")
-pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
-pkg_check_modules(GTHREAD REQUIRED gthread-2.0)
 pkg_check_modules(GIO REQUIRED gio-2.0)
-link_directories(${GOBJECT_LIBRARY_DIRS} ${GIO_LIBRARY_DIRS})
-include_directories(SYSTEM ${GOBJECT_SOURCE_DIR} ${GIO_SOURCE_DIR})
-target_link_libraries(jingle-s5b -lgio-2.0)#${GLIB_LIBRARIES} ${LM_LIBRARIES}
-                      #${GIO_LIBRARIES} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES})
-include_directories(${CMAKE_SOURCE_DIR})
+link_directories(${GIO_LIBRARY_DIRS})
+include_directories(SYSTEM ${GIO_SOURCE_DIR})
+target_link_libraries(jingle-s5b ${GIO_LIBRARIES})
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
 install(TARGETS jingle-s5b DESTINATION lib/mcabber)

jingle-s5b/socks5.c

@@ -252,12 +252,8 @@ static gconstpointer new(void)
 {
   JingleS5B *js5b = g_new0(JingleS5B, 1);
 
-
   js5b->mode = JINGLE_S5B_TCP;
   js5b->sid  = gen_random_sid();
-  // the user can manually specify a port range to use in for format:
-  // portstart-portend
-
 
   js5b->ourcandidates = get_our_candidates(get_port());
 
@@ -352,7 +348,6 @@ static void init(session_content *sc, gconstpointer data)
                    err->message != NULL ? err->message : "(no message)");
       goto cleancontinue;
     }
-    g_object_unref(saddr);
 
     if (!g_socket_listen(cand->sock, &err)) {
       scr_LogPrint(LPRINT_LOGNORM, "Jingle S5B: Unable to listen on %s port %u: %s",
@@ -363,11 +358,15 @@ static void init(session_content *sc, gconstpointer data)
     }
 
     if (!g_socket_listener_add_socket(js5b->listener, cand->sock, NULL, &err)) {
-      scr_LogPrint(LPRINT_LOGNORM, "Jingle S5B: Error while  to the host: %s",
+      scr_LogPrint(LPRINT_LOGNORM, "Jingle S5B: Unable to add our socket to the"
+                   " GSocketListener: %s",
                    err->message != NULL ? err->message : "(no message)");
       goto cleancontinue;
 	}
 
+    scr_LogPrint(LPRINT_LOGNORM, "Jingle S5B: Listening on %s:%u",
+                 g_inet_address_to_string(cand->host),
+                 cand->port);
 	++numlistening;
 
 cleancontinue:

jingle/CMakeLists.txt

@@ -1,5 +1,3 @@
 add_library(jingle MODULE jingle.c jingle.h check.c check.h action-handlers.c action-handlers.c register.c register.h sessions.c sessions.h send.c send.h)
-set_target_properties(jingle PROPERTIES COMPILE_FLAGS "-Wall -O2 -g")
-include_directories(${LM_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
-target_link_libraries(jingle ${GLIB_LIBRARIES} ${LM_LIBRARIES})
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
 install(TARGETS jingle DESTINATION lib/mcabber)