Commit 49c5d83 1 parent 8a5fd0c commit 49c5d83 Copy full SHA for 49c5d83
File tree 4 files changed +6
-7
lines changed
4 files changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -199,7 +199,7 @@ if (_GLFW_X11)
199
199
200
200
# Set up library and include paths
201
201
list (APPEND glfw_INCLUDE_DIRS "${X11_X11_INCLUDE_PATH} " )
202
- list (APPEND glfw_LIBRARIES "${X11_X11_LIB} " " ${CMAKE_THREAD_LIBS_INIT} " )
202
+ list (APPEND glfw_LIBRARIES "${X11_X11_LIB} " )
203
203
204
204
# Check for XRandR (modern resolution switching and gamma control)
205
205
if (NOT X11_Xrandr_INCLUDE_PATH)
@@ -241,7 +241,7 @@ if (_GLFW_WAYLAND)
241
241
list (APPEND glfw_PKG_DEPS "wayland-egl" )
242
242
243
243
list (APPEND glfw_INCLUDE_DIRS "${Wayland_INCLUDE_DIRS} " )
244
- list (APPEND glfw_LIBRARIES "${Wayland_LIBRARIES} " " ${CMAKE_THREAD_LIBS_INIT} " )
244
+ list (APPEND glfw_LIBRARIES "${Wayland_LIBRARIES} " )
245
245
246
246
find_package (XKBCommon REQUIRED)
247
247
list (APPEND glfw_INCLUDE_DIRS "${XKBCOMMON_INCLUDE_DIRS} " )
@@ -265,7 +265,6 @@ endif()
265
265
#--------------------------------------------------------------------
266
266
if (_GLFW_OSMESA)
267
267
find_package (OSMesa REQUIRED)
268
- list (APPEND glfw_LIBRARIES "${CMAKE_THREAD_LIBS_INIT} " )
269
268
endif ()
270
269
271
270
#--------------------------------------------------------------------
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ add_executable(splitview WIN32 MACOSX_BUNDLE splitview.c ${ICON} ${GLAD_GL})
34
34
add_executable (triangle-opengl WIN32 MACOSX_BUNDLE triangle-opengl.c ${ICON} ${GLAD_GL} )
35
35
add_executable (wave WIN32 MACOSX_BUNDLE wave.c ${ICON} ${GLAD_GL} )
36
36
37
- target_link_libraries (particles " ${CMAKE_THREAD_LIBS_INIT} " )
37
+ target_link_libraries (particles Threads::Threads )
38
38
if (RT_LIBRARY)
39
39
target_link_libraries (particles "${RT_LIBRARY} " )
40
40
endif ()
Original file line number Diff line number Diff line change @@ -95,7 +95,7 @@ target_include_directories(glfw PRIVATE
95
95
"${GLFW_SOURCE_DIR} /src"
96
96
"${GLFW_BINARY_DIR} /src"
97
97
${glfw_INCLUDE_DIRS} )
98
- target_link_libraries (glfw PRIVATE ${glfw_LIBRARIES} )
98
+ target_link_libraries (glfw PRIVATE Threads::Threads ${glfw_LIBRARIES} )
99
99
100
100
if (APPLE )
101
101
# For some reason CMake didn't know about .m until version 3.16
Original file line number Diff line number Diff line change @@ -42,8 +42,8 @@ add_executable(title WIN32 MACOSX_BUNDLE title.c ${GLAD_GL})
42
42
add_executable (triangle-vulkan WIN32 triangle-vulkan.c ${GLAD_VULKAN} )
43
43
add_executable (windows WIN32 MACOSX_BUNDLE windows.c ${GLAD_GL} )
44
44
45
- target_link_libraries (empty " ${CMAKE_THREAD_LIBS_INIT} " )
46
- target_link_libraries (threads " ${CMAKE_THREAD_LIBS_INIT} " )
45
+ target_link_libraries (empty Threads::Threads )
46
+ target_link_libraries (threads Threads::Threads )
47
47
if (RT_LIBRARY)
48
48
target_link_libraries (empty "${RT_LIBRARY} " )
49
49
target_link_libraries (threads "${RT_LIBRARY} " )
You can’t perform that action at this time.
0 commit comments