diff options
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/ganalytics/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | libraries/systeminfo/CMakeLists.txt | 27 | ||||
| -rw-r--r-- | libraries/systeminfo/include/sys.h (renamed from libraries/ganalytics/include/sys.h) | 0 | ||||
| -rw-r--r-- | libraries/systeminfo/src/sys_apple.cpp (renamed from libraries/ganalytics/src/sys_apple.cpp) | 0 | ||||
| -rw-r--r-- | libraries/systeminfo/src/sys_test.cpp (renamed from libraries/ganalytics/src/sys_test.cpp) | 0 | ||||
| -rw-r--r-- | libraries/systeminfo/src/sys_unix.cpp (renamed from libraries/ganalytics/src/sys_unix.cpp) | 0 | ||||
| -rw-r--r-- | libraries/systeminfo/src/sys_win32.cpp (renamed from libraries/ganalytics/src/sys_win32.cpp) | 0 |
7 files changed, 28 insertions, 17 deletions
diff --git a/libraries/ganalytics/CMakeLists.txt b/libraries/ganalytics/CMakeLists.txt index 9d218c6d..26b1b47c 100644 --- a/libraries/ganalytics/CMakeLists.txt +++ b/libraries/ganalytics/CMakeLists.txt @@ -8,26 +8,10 @@ set(ganalytics_SOURCES src/ganalytics.cpp src/ganalytics_worker.cpp src/ganalytics_worker.h -include/sys.h include/ganalytics.h ) -if (WIN32) - list(APPEND ganalytics_SOURCES src/sys_win32.cpp) -elseif (UNIX) - if(APPLE) - list(APPEND ganalytics_SOURCES src/sys_apple.cpp) - else() - list(APPEND ganalytics_SOURCES src/sys_unix.cpp) - endif() -endif() - add_library(ganalytics STATIC ${ganalytics_SOURCES}) qt5_use_modules(ganalytics Core Gui Network) target_include_directories(ganalytics PUBLIC include) - -include (UnitTest) -add_unit_test(sys - SOURCES src/sys_test.cpp - LIBS ganalytics -) +target_link_libraries(ganalytics systeminfo) diff --git a/libraries/systeminfo/CMakeLists.txt b/libraries/systeminfo/CMakeLists.txt new file mode 100644 index 00000000..77cba173 --- /dev/null +++ b/libraries/systeminfo/CMakeLists.txt @@ -0,0 +1,27 @@ +project(systeminfo) + +find_package(Qt5Core) + +set(systeminfo_SOURCES +include/sys.h +) + +if (WIN32) + list(APPEND systeminfo_SOURCES src/sys_win32.cpp) +elseif (UNIX) + if(APPLE) + list(APPEND systeminfo_SOURCES src/sys_apple.cpp) + else() + list(APPEND systeminfo_SOURCES src/sys_unix.cpp) + endif() +endif() + +add_library(systeminfo STATIC ${systeminfo_SOURCES}) +qt5_use_modules(systeminfo Core Gui Network) +target_include_directories(systeminfo PUBLIC include) + +include (UnitTest) +add_unit_test(sys + SOURCES src/sys_test.cpp + LIBS systeminfo +) diff --git a/libraries/ganalytics/include/sys.h b/libraries/systeminfo/include/sys.h index 36f7d9cd..36f7d9cd 100644 --- a/libraries/ganalytics/include/sys.h +++ b/libraries/systeminfo/include/sys.h diff --git a/libraries/ganalytics/src/sys_apple.cpp b/libraries/systeminfo/src/sys_apple.cpp index 49a61165..49a61165 100644 --- a/libraries/ganalytics/src/sys_apple.cpp +++ b/libraries/systeminfo/src/sys_apple.cpp diff --git a/libraries/ganalytics/src/sys_test.cpp b/libraries/systeminfo/src/sys_test.cpp index 6221da45..6221da45 100644 --- a/libraries/ganalytics/src/sys_test.cpp +++ b/libraries/systeminfo/src/sys_test.cpp diff --git a/libraries/ganalytics/src/sys_unix.cpp b/libraries/systeminfo/src/sys_unix.cpp index 866c9fdb..866c9fdb 100644 --- a/libraries/ganalytics/src/sys_unix.cpp +++ b/libraries/systeminfo/src/sys_unix.cpp diff --git a/libraries/ganalytics/src/sys_win32.cpp b/libraries/systeminfo/src/sys_win32.cpp index 502b980d..502b980d 100644 --- a/libraries/ganalytics/src/sys_win32.cpp +++ b/libraries/systeminfo/src/sys_win32.cpp |