Skip to content

Commit d2dccb2

Browse files
committed
fixed linux build
1 parent 2f63f76 commit d2dccb2

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.16)
1+
cmake_minimum_required(VERSION 3.5)
22

33
project(hwinfo VERSION 1.0.0 LANGUAGES CXX)
44

src/CMakeLists.txt

+20-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ if (HWINFO_BATTERY)
3333
target_link_libraries(hwinfo_battery_static PRIVATE "-framework IOKit" "-framework CoreFoundation")
3434
endif()
3535

36-
target_link_libraries(hwinfo INTERFACE hwinfo_battery hwinfo_cpu hwinfo_disk hwinfo_gpu hwinfo_mainboard hwinfo_os hwinfo_ram)
37-
target_link_libraries(hwinfo_static INTERFACE hwinfo_battery hwinfo_cpu hwinfo_disk hwinfo_gpu hwinfo_mainboard hwinfo_os hwinfo_ram)
36+
target_link_libraries(hwinfo INTERFACE hwinfo_battery)
37+
target_link_libraries(hwinfo_static INTERFACE hwinfo_battery_static)
3838
endif ()
3939
# ______________________________________________________________________________________________________________________
4040

@@ -58,6 +58,9 @@ if (HWINFO_CPU)
5858
add_library(hwinfo_cpu_static STATIC ${CPU_SRC_FILES})
5959
target_compile_definitions(hwinfo_cpu_static PUBLIC HWINFO_CPU)
6060
target_include_directories(hwinfo_cpu_static PUBLIC $<BUILD_INTERFACE:${HWINFO_INCLUDE_DIR}>)
61+
62+
target_link_libraries(hwinfo INTERFACE hwinfo_cpu)
63+
target_link_libraries(hwinfo_static INTERFACE hwinfo_cpu_static)
6164
endif()
6265
# ______________________________________________________________________________________________________________________
6366

@@ -86,6 +89,9 @@ if (HWINFO_DISK)
8689
if(APPLE)
8790
target_link_libraries(hwinfo_disk_static PRIVATE "-framework IOKit" "-framework CoreFoundation")
8891
endif()
92+
93+
target_link_libraries(hwinfo INTERFACE hwinfo_disk)
94+
target_link_libraries(hwinfo_static INTERFACE hwinfo_disk_static)
8995
endif ()
9096
# ______________________________________________________________________________________________________________________
9197

@@ -123,6 +129,9 @@ if (HWINFO_GPU)
123129
target_link_libraries(hwinfo_gpu_static PRIVATE opencl_device)
124130
endif ()
125131
target_include_directories(hwinfo_gpu_static PUBLIC $<BUILD_INTERFACE:${HWINFO_INCLUDE_DIR}>)
132+
133+
target_link_libraries(hwinfo INTERFACE hwinfo_gpu)
134+
target_link_libraries(hwinfo_static INTERFACE hwinfo_gpu_static)
126135
endif ()
127136
# ______________________________________________________________________________________________________________________
128137

@@ -146,6 +155,9 @@ if (HWINFO_MAINBOARD)
146155
add_library(hwinfo_mainboard_static STATIC ${MAINBOARD_SRC_FILES})
147156
target_compile_definitions(hwinfo_mainboard_static PUBLIC HWINFO_MAINBOARD)
148157
target_include_directories(hwinfo_mainboard_static PUBLIC $<BUILD_INTERFACE:${HWINFO_INCLUDE_DIR}>)
158+
159+
target_link_libraries(hwinfo INTERFACE hwinfo_mainboard)
160+
target_link_libraries(hwinfo_static INTERFACE hwinfo_mainboard_static)
149161
endif ()
150162
# ______________________________________________________________________________________________________________________
151163

@@ -169,6 +181,9 @@ if (HWINFO_OS)
169181
add_library(hwinfo_os_static STATIC ${OS_SRC_FILES})
170182
target_compile_definitions(hwinfo_os_static PUBLIC HWINFO_OS)
171183
target_include_directories(hwinfo_os_static PUBLIC $<BUILD_INTERFACE:${HWINFO_INCLUDE_DIR}>)
184+
185+
target_link_libraries(hwinfo INTERFACE hwinfo_os)
186+
target_link_libraries(hwinfo_static INTERFACE hwinfo_os_static)
172187
endif ()
173188
# ______________________________________________________________________________________________________________________
174189

@@ -192,5 +207,8 @@ if (HWINFO_RAM)
192207
add_library(hwinfo_ram_static STATIC ${RAM_SRC_FILES})
193208
target_compile_definitions(hwinfo_ram_static PUBLIC HWINFO_RAM)
194209
target_include_directories(hwinfo_ram_static PUBLIC $<BUILD_INTERFACE:${HWINFO_INCLUDE_DIR}>)
210+
211+
target_link_libraries(hwinfo INTERFACE hwinfo_ram)
212+
target_link_libraries(hwinfo_static INTERFACE hwinfo_ram_static)
195213
endif ()
196214
# ______________________________________________________________________________________________________________________

0 commit comments

Comments
 (0)