diff options
| author | Peter Colberg <peter@colberg.org> | 2015-12-29 00:06:02 -0500 |
|---|---|---|
| committer | Peter Colberg <peter@colberg.org> | 2015-12-29 00:06:02 -0500 |
| commit | 174983a3b73e7acefe6b29010f6fe2cf2e05af98 (patch) | |
| tree | 335e4fb63d4075004a2ffef605a5900dd1a8fa49 /src | |
| parent | 592d1997df7671e545f56628c1a39f076356b4f3 (diff) | |
| download | twinkle-174983a3b73e7acefe6b29010f6fe2cf2e05af98.tar twinkle-174983a3b73e7acefe6b29010f6fe2cf2e05af98.tar.gz twinkle-174983a3b73e7acefe6b29010f6fe2cf2e05af98.tar.lz twinkle-174983a3b73e7acefe6b29010f6fe2cf2e05af98.tar.xz twinkle-174983a3b73e7acefe6b29010f6fe2cf2e05af98.zip | |
Add cmake variable for common objects
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/gui/CMakeLists.txt | 15 |
2 files changed, 7 insertions, 16 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b1b0607..db1c9c4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -54,8 +54,7 @@ set(LIBTWINKLE_SRCS add_library(libtwinkle OBJECT ${LIBTWINKLE_SRCS}) -add_executable(twinkle-console - main.cpp +set(twinkle_OBJS $<TARGET_OBJECTS:libtwinkle> $<TARGET_OBJECTS:libtwinkle-audio> $<TARGET_OBJECTS:libtwinkle-gsm> @@ -72,6 +71,11 @@ add_executable(twinkle-console $<TARGET_OBJECTS:libtwinkle-utils> ) +add_executable(twinkle-console + main.cpp + ${twinkle_OBJS} +) + if (WITH_QT4 OR WITH_QT5) add_subdirectory(gui) endif (WITH_QT4 OR WITH_QT5) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index c178b9c..e4b5fd5 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -111,20 +111,7 @@ set(TWINKLE_GUI-SRCS osd.cpp incoming_call_popup.cpp - $<TARGET_OBJECTS:libtwinkle> - $<TARGET_OBJECTS:libtwinkle-audio> - $<TARGET_OBJECTS:libtwinkle-gsm> - $<TARGET_OBJECTS:libtwinkle-audits> - $<TARGET_OBJECTS:libtwinkle-im> - $<TARGET_OBJECTS:libtwinkle-mwi> - $<TARGET_OBJECTS:libtwinkle-parser> - $<TARGET_OBJECTS:libtwinkle-patterns> - $<TARGET_OBJECTS:libtwinkle-presence> - $<TARGET_OBJECTS:libtwinkle-sdp> - $<TARGET_OBJECTS:libtwinkle-sockets> - $<TARGET_OBJECTS:libtwinkle-stun> - $<TARGET_OBJECTS:libtwinkle-threads> - $<TARGET_OBJECTS:libtwinkle-utils> + ${twinkle_OBJS} ${twinkle_UIS} ${twinkle_QRC} ${twinkle_LANG} |