CMake: Fix Compiling Shader Builder on macOS
Due to changes in the build environment shader_builder wasn't able to compile on macOs. This patch reverts several recent changes to CMake files. *dbb2844ed9*94817f64b9*1b6cd937ffThe idea is that in the near future shader_builder will run on the buildbot as part of any regular build to ensure that changes to the CMake doesn't break shader_builder and we only detect it after a few days. Pull Request: https://projects.blender.org/blender/blender/pulls/115929
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
set(INC
|
||||
PUBLIC .
|
||||
.
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
@@ -19,16 +19,14 @@ set(SRC
|
||||
set(LIB
|
||||
)
|
||||
|
||||
# This library is currently windows only, for the other platforms an empty target is created this
|
||||
# way we don't have to clutter if(WIN32) ... endif() all over the place to use this library.
|
||||
# This is odd but leave it for now...
|
||||
# Why have win32 check here? - this is only used for windows.
|
||||
# ... because one day we might want to use it on other platforms.
|
||||
if(WIN32)
|
||||
list(APPEND SRC
|
||||
utf_winfunc.cc
|
||||
utf_winfunc.hh
|
||||
)
|
||||
blender_add_lib(bf_intern_utfconv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
||||
else()
|
||||
add_library(bf_intern_utfconv INTERFACE)
|
||||
endif()
|
||||
|
||||
add_library(bf::intern::utfconv ALIAS bf_intern_utfconv)
|
||||
blender_add_lib(bf_intern_utfconv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
||||
|
||||
Reference in New Issue
Block a user