Преглед на файлове

cmake: Correct CMake checks for LINUX

Some CMake checks were recently switched from UNIX to LINUX to get them
to not apply to macOS/OSX. Since LINUX doesn't seem to be defined,
switch these checks to UNIX AND NOT APPLE.
Ryan Foster преди 7 години
родител
ревизия
12abbd9205
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1 1
      UI/frontend-plugins/frontend-tools/CMakeLists.txt
  2. 1 1
      deps/glad/CMakeLists.txt

+ 1 - 1
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})

+ 1 - 1
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()