diff options
author | Christian Ulrich <christian@rechenwerk.net> | 2016-02-19 22:51:34 +0100 |
---|---|---|
committer | Christian Ulrich <christian@rechenwerk.net> | 2016-02-19 22:51:34 +0100 |
commit | 66d2e5f73ffae95f49cf28669bed1fb5a4451f0a (patch) | |
tree | 5bf464a0096a4a435f307d852bdf34b12a4e1a1c | |
parent | 0567a594dd93158b404fd8b8bd37a58eddf023fc (diff) | |
download | redthread-66d2e5f73ffae95f49cf28669bed1fb5a4451f0a.tar.gz redthread-66d2e5f73ffae95f49cf28669bed1fb5a4451f0a.zip |
maybe fix linker error
-rw-r--r-- | trunk/config.h | 9 | ||||
-rw-r--r-- | trunk/src/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/trunk/config.h b/trunk/config.h deleted file mode 100644 index 3a9b8a5..0000000 --- a/trunk/config.h +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | #ifndef CMAKE_CONFIG__H | ||
2 | #define CMAKE_CONFIG__H | ||
3 | |||
4 | /* #undef CONFIG_FILE */ | ||
5 | /* #undef STORAGE_DIR */ | ||
6 | |||
7 | #define QML_DIR "/home/christian/projects/secushare/redthread/trunk/ui" | ||
8 | |||
9 | #endif | ||
diff --git a/trunk/src/CMakeLists.txt b/trunk/src/CMakeLists.txt index cd186ca..08e3002 100644 --- a/trunk/src/CMakeLists.txt +++ b/trunk/src/CMakeLists.txt | |||
@@ -25,6 +25,10 @@ qt_wrap_cpp(redthread qt_wrappers ${hpp_files}) | |||
25 | set(source_files ${source_files} ${qt_wrappers}) | 25 | set(source_files ${source_files} ${qt_wrappers}) |
26 | set(LIBS ${LIBS} Qt5::Widgets Qt5::Quick) | 26 | set(LIBS ${LIBS} Qt5::Widgets Qt5::Quick) |
27 | 27 | ||
28 | # pthread | ||
29 | find_package (Threads REQUIRED) | ||
30 | set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) | ||
31 | |||
28 | # sigc++ | 32 | # sigc++ |
29 | #find_package(SigC++ REQUIRED) | 33 | #find_package(SigC++ REQUIRED) |
30 | #set(LIBS ${LIBS} ${SIGC++_LIBRARIES}) | 34 | #set(LIBS ${LIBS} ${SIGC++_LIBRARIES}) |