renamed example binary and require CMake 2.8

actor-framework · Nov 13, 2012 · 0fb5be4 · 0fb5be4
1 parent 89e93c7
commit 0fb5be4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.4)
+cmake_minimum_required(VERSION 2.8)
 project(cppa CXX)
 
 set(LIBCPPA_VERSION_MAJOR 0)

diff --git a/cppa.files b/cppa.files
@@ -281,7 +281,7 @@ src/recursive_queue_node.cpp
 cppa/intrusive_fwd_ptr.hpp
 cppa/memory_managed.hpp
 src/memory_managed.cpp
-examples/qtsupport/group_chat.cpp
+examples/qtsupport/qt_group_chat.cpp
 examples/qtsupport/chatwindow.ui
 examples/qtsupport/chatwidget.hpp
 examples/qtsupport/chatwidget.cpp

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 2.6)
-project(cppas CXX)
+cmake_minimum_required(VERSION 2.8)
+project(cppa_examples CXX)
 
 add_custom_target(all_examples)
 
@@ -26,12 +26,15 @@ find_package(Qt4)
 
 if (QT4_FOUND)
   include(${QT_USE_FILE})
+  QT4_ADD_RESOURCES(GROUP_CHAT_RCS )
   QT4_WRAP_UI(GROUP_CHAT_UI_HDR qtsupport/chatwindow.ui)
   QT4_WRAP_CPP(GROUP_CHAT_MOC_SRC qtsupport/chatwidget.hpp)
-  include_directories(. qtsupport ${CMAKE_BINARY_DIR}/examples ${CPPA_INCLUDE})
+  # generated headers will be in cmake build directory
+  #include_directories(. qtsupport ${CMAKE_CURRENT_BINARY_DIR} ${CPPA_INCLUDE})
+  include_directories(qtsupport ${CMAKE_CURRENT_BINARY_DIR})
+  set(GROUP_CHAT_SRCS qtsupport/qt_group_chat.cpp qtsupport/chatwidget.cpp)
   add_executable(qt_group_chat
-                 qtsupport/group_chat.cpp
-                 qtsupport/chatwidget.cpp
+                 ${GROUP_CHAT_SRCS}
                  ${GROUP_CHAT_MOC_SRC}
                  ${GROUP_CHAT_UI_HDR})
   target_link_libraries(qt_group_chat

diff --git a/examples/qtsupport/group_chat.cpp → examples/qtsupport/qt_group_chat.cpp b/examples/qtsupport/group_chat.cpp → examples/qtsupport/qt_group_chat.cpp
@@ -1,11 +1,12 @@
 /******************************************************************************\
- * This example program represents a minimal terminal chat program            *
- * based on group communication.                                              *
+ * This example program represents a minimal GUI chat program                 *
+ * based on group communication. This chat program is compatible to the       *
+ * terminal version in remote_actors/group_chat.cpp.                          *
  *                                                                            *
  * Setup for a minimal chat between "alice" and "bob":                        *
  * - ./build/bin/group_server -p 4242                                         *
- * - ./build/bin/group_chat -g remote:chatroom@localhost:4242 -n alice        *
- * - ./build/bin/group_chat -g remote:chatroom@localhost:4242 -n bob          *
+ * - ./build/bin/qt_group_chat -g remote:chatroom@localhost:4242 -n alice     *
+ * - ./build/bin/qt_group_chat -g remote:chatroom@localhost:4242 -n bob       *
 \******************************************************************************/
 
 #include <set>

diff --git a/unit_testing/CMakeLists.txt b/unit_testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 project(cppa_unit_tests CXX)
 
 add_custom_target(all_unit_tests)