[Bf-blender-cvs] [4b39cbdeef2] functions: fix "make full" on windows

[Jacques Lucke]

Commit: 4b39cbdeef2d650bd00119c2c0501aa999368f09
Author: Jacques Lucke
Date:   Wed Mar 6 09:45:28 2019 +0100
Branches: functions
https://developer.blender.org/rB4b39cbdeef2d650bd00119c2c0501aa999368f09

fix "make full" on windows

===================================================================

M	build_files/cmake/platform/platform_win32.cmake
M	source/blender/functions/CMakeLists.txt
M	source/blender/functions/core/function.hpp

===================================================================

diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 02c346e845b..bddd293bc6d 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -427,6 +427,7 @@ endif()
 
 if(WITH_LLVM)
 	set(LLVM_ROOT_DIR ${LIBDIR}/llvm CACHE PATH	"Path to the LLVM installation")
+	set(LLVM_INCLUDE_DIRS ${LLVM_ROOT_DIR}/include CACHE PATH "Path to the LLVM include directory")
 	file(GLOB LLVM_LIBRARY_OPTIMIZED ${LLVM_ROOT_DIR}/lib/*.lib)
 
 	if(EXISTS ${LLVM_ROOT_DIR}/debug/lib)
diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index eb1a828f687..76c8a8dbf78 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -10,6 +10,7 @@ set(INC
 # TODO: figure out how not to hard code this
 set(INC_SYS
 	/usr/lib/llvm-6.0/include
+	${LLVM_INCLUDE_DIRS}
 )
 
 set(SRC
diff --git a/source/blender/functions/core/function.hpp b/source/blender/functions/core/function.hpp
index dde7259b5e3..3c57f4f6055 100644
--- a/source/blender/functions/core/function.hpp
+++ b/source/blender/functions/core/function.hpp
@@ -63,7 +63,7 @@ namespace FN {
 		template<typename T>
 		void add_body(T *body)
 		{
-			static_assert(std::is_base_of<FunctionBody, T>::value);
+			static_assert(std::is_base_of<FunctionBody, T>::value, "");
 			BLI_assert(m_bodies.get<T>() == nullptr);
 			BLI_assert(!body->has_owner());
 			m_bodies.add(body);