Merge pull request #1103 from RytoEX/fix-ci-linux

cmake: Correct CMake checks for LINUX

Merge pull request #1103 from RytoEX/fix-ci-linux
cmake: Correct CMake checks for LINUX
46d54ce6 · Jim · GitHub · 0daade5f · 12abbd92 · 46d54ce6
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

UI/frontend-plugins/frontend-tools/CMakeLists.txt UI/frontend-plugins/frontend-tools/CMakeLists.txt +1 -1

deps/glad/CMakeLists.txt deps/glad/CMakeLists.txt +1 -1

未找到文件。
--- a/UI/frontend-plugins/frontend-tools/CMakeLists.txt
+++ b/UI/frontend-plugins/frontend-tools/CMakeLists.txt
@@ -5,7 +5,7 @@ if(APPLE)
 	include_directories(${COCOA})
 endif()

-if(LINUX)
+if(UNIX AND NOT APPLE)
 	find_package(X11 REQUIRED)
 	link_libraries(${X11_LIBRARIES})
 	include_directories(${X11_INCLUDE_DIR})

--- a/deps/glad/CMakeLists.txt
+++ b/deps/glad/CMakeLists.txt
@@ -23,7 +23,7 @@ endif()
 set(glad_include_dirs
 	PRIVATE ${OPENGL_INCLUDE_DIR})

-if (LINUX)
+if (UNIX AND NOT APPLE)
 list (APPEND glad_include_dirs
 	PRIVATE ${X11_X11_INCLUDE_PATH})
 endif()