From 294db46231ea91d70fff258b884fb9c5d8c806bf Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Thu, 18 May 2006 15:33:15 +0000 Subject: [PATCH] --- Makefile | 8 ++++++++ core/CMakeLists.txt | 6 ++++++ {main => core}/logger.cpp | 0 {main => core}/logger.h | 0 {main => core}/main.cpp | 0 {main => core}/quassel.cpp | 0 {main => core}/quassel.h | 0 main/CMakeLists.txt | 6 ------ 8 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 Makefile create mode 100644 core/CMakeLists.txt rename {main => core}/logger.cpp (100%) rename {main => core}/logger.h (100%) rename {main => core}/main.cpp (100%) rename {main => core}/quassel.cpp (100%) rename {main => core}/quassel.h (100%) delete mode 100644 main/CMakeLists.txt diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..eaaa4c0b --- /dev/null +++ b/Makefile @@ -0,0 +1,8 @@ +# This Makefile simply runs cmake from the build directory. +# This, of course, triggers an out-of-source build. +# Binaries are going to be in build/. + +default_target: run_cmake + +run_cmake: + cd build && cmake .. && make diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt new file mode 100644 index 00000000..71f620c2 --- /dev/null +++ b/core/CMakeLists.txt @@ -0,0 +1,6 @@ +SET(core_SRCS logger.cpp quassel.cpp) +SET(core_HDRS quassel.h) +SET(core_MOCS logger.h) + +QT4_WRAP_CPP(_MOC ${core_MOCS}) +ADD_LIBRARY(core ${_MOC} ${core_SRCS} ${core_HDRS}) diff --git a/main/logger.cpp b/core/logger.cpp similarity index 100% rename from main/logger.cpp rename to core/logger.cpp diff --git a/main/logger.h b/core/logger.h similarity index 100% rename from main/logger.h rename to core/logger.h diff --git a/main/main.cpp b/core/main.cpp similarity index 100% rename from main/main.cpp rename to core/main.cpp diff --git a/main/quassel.cpp b/core/quassel.cpp similarity index 100% rename from main/quassel.cpp rename to core/quassel.cpp diff --git a/main/quassel.h b/core/quassel.h similarity index 100% rename from main/quassel.h rename to core/quassel.h diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt deleted file mode 100644 index 86bbe990..00000000 --- a/main/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -SET(main_SRCS logger.cpp quassel.cpp) -SET(main_HDRS quassel.h) -SET(main_MOCS logger.h) - -QT4_WRAP_CPP(_MOC ${main_MOCS}) -ADD_LIBRARY(main ${_MOC} ${main_SRCS} ${main_HDRS}) -- 2.20.1