From c637e749b2bab67f9ce27937cf0430965cacc907 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 7 Apr 2017 16:06:05 +0200 Subject: Tests: Fix compilation error with static OpenMP --- build_files/cmake/Modules/GTestTesting.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'build_files') diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index 0732e10133c..e688db35ef1 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -39,6 +39,9 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST) ${PTHREADS_LIBRARIES} extern_glog extern_gflags) + if(WITH_OPENMP_STATIC) + target_link_libraries(${NAME}_test ${OpenMP_LIBRARIES}) + endif() set_target_properties(${NAME}_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTS_OUTPUT_DIR}" RUNTIME_OUTPUT_DIRECTORY_RELEASE "${TESTS_OUTPUT_DIR}" -- cgit v1.2.3 From 4360a74715c635b7dd6c5a5cb76e4679fb6d5e42 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 7 Apr 2017 17:00:06 +0200 Subject: CMake: Fix detection of idiff program --- build_files/cmake/Modules/FindOpenImageIO.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files') diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake index 789097dfd51..d59f9cfcdfc 100644 --- a/build_files/cmake/Modules/FindOpenImageIO.cmake +++ b/build_files/cmake/Modules/FindOpenImageIO.cmake @@ -60,7 +60,7 @@ FIND_FILE(OPENIMAGEIO_IDIFF NAMES idiff HINTS - ${OPENIMAGEIO_ROOT_DIR} + ${_openimageio_SEARCH_DIRS} PATH_SUFFIXES bin ) -- cgit v1.2.3 From 07708b85b4e903ea1be82d82396285c2518e1b3a Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 7 Apr 2017 17:00:43 +0200 Subject: Buildbot: Link statically against freetype --- build_files/buildbot/config/blender_linux.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'build_files') diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index ed5417c1c6e..45b327f8aeb 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -94,6 +94,10 @@ set(OPENCOLORIO_OPENCOLORIO_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libOpenColorIO. set(OPENCOLORIO_TINYXML_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libtinyxml.a" CACHE STRING "" FORCE) set(OPENCOLORIO_YAML-CPP_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libyaml-cpp.a" CACHE STRING "" FORCE) +# Freetype +set(FREETYPE_INCLUDE_DIRS "/usr/include/freetype2" CACHE STRING "" FORCE) +set(FREETYPE_LIBRARY "/usr/lib${MULTILIB}/libfreetype.a" CACHE STRING "" FORCE) + # OpenImageIO if(GLIBC EQUAL "2.19") set(OPENIMAGEIO_LIBRARY -- cgit v1.2.3 From eae691f89e3cb584047196b15c6e75eaea287dcc Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 7 Apr 2017 17:01:07 +0200 Subject: Buildbot: List freetype for OIIO libraries OIIO in release environment is compiled with Freetype support. This fixes compilation error of static unit tests. --- build_files/buildbot/config/blender_linux.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'build_files') diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 45b327f8aeb..56f18967300 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -106,6 +106,7 @@ if(GLIBC EQUAL "2.19") /usr/lib${MULTILIB}/libwebp.a /usr/lib${MULTILIB}/liblzma.a /usr/lib${MULTILIB}/libjbig.a + ${FREETYPE_LIBRARY} CACHE STRING "" FORCE ) endif() -- cgit v1.2.3