[Bf-blender-cvs] [21f7accd3b0] greasepencil-refactor: include last master changes
Antonio Vazquez
noreply at git.blender.org
Wed Feb 5 17:07:56 CET 2020
Commit: 21f7accd3b0d0ad08c11ca6a0bd70e7939ad6f14
Author: Antonio Vazquez
Date: Wed Feb 5 16:52:40 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB21f7accd3b0d0ad08c11ca6a0bd70e7939ad6f14
include last master changes
There was a problem in the last merge
===================================================================
M CMakeLists.txt
M build_files/build_environment/patches/cmake/modules/FindBlosc.cmake
M build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake
M build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
M build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake
M build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
M build_files/build_environment/patches/cmake/modules/FindTBB.cmake
M build_files/cmake/Modules/FindAlembic.cmake
M build_files/cmake/Modules/FindAudaspace.cmake
M build_files/cmake/Modules/FindBlosc.cmake
M build_files/cmake/Modules/FindEigen3.cmake
M build_files/cmake/Modules/FindEmbree.cmake
M build_files/cmake/Modules/FindFftw3.cmake
M build_files/cmake/Modules/FindGLEW.cmake
M build_files/cmake/Modules/FindGflags.cmake
M build_files/cmake/Modules/FindGlog.cmake
M build_files/cmake/Modules/FindHDF5.cmake
M build_files/cmake/Modules/FindIcuLinux.cmake
M build_files/cmake/Modules/FindJack.cmake
M build_files/cmake/Modules/FindJeMalloc.cmake
M build_files/cmake/Modules/FindLZO.cmake
M build_files/cmake/Modules/FindOpenCOLLADA.cmake
M build_files/cmake/Modules/FindOpenColorIO.cmake
M build_files/cmake/Modules/FindOpenEXR.cmake
M build_files/cmake/Modules/FindOpenGLES.cmake
M build_files/cmake/Modules/FindOpenImageDenoise.cmake
M build_files/cmake/Modules/FindOpenImageIO.cmake
M build_files/cmake/Modules/FindOpenJPEG.cmake
M build_files/cmake/Modules/FindOpenShadingLanguage.cmake
M build_files/cmake/Modules/FindOpenSubdiv.cmake
M build_files/cmake/Modules/FindOpenVDB.cmake
M build_files/cmake/Modules/FindOptiX.cmake
M build_files/cmake/Modules/FindPCRE.cmake
M build_files/cmake/Modules/FindPugiXML.cmake
M build_files/cmake/Modules/FindPythonLibsUnix.cmake
M build_files/cmake/Modules/FindSDL2.cmake
M build_files/cmake/Modules/FindSndFile.cmake
M build_files/cmake/Modules/FindSpacenav.cmake
M build_files/cmake/Modules/FindTBB.cmake
M build_files/cmake/Modules/FindUSD.cmake
M build_files/cmake/Modules/FindXML2.cmake
M build_files/cmake/platform/platform_unix.cmake
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/collada/ErrorHandler.cpp
M source/blender/makesdna/DNA_scene_types.h
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbca47f26c1..509de9943e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -793,61 +793,6 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "Release")
endif()
endif()
-#-----------------------------------------------------------------------------
-# Platform specifics
-
-if(WITH_X11)
- find_package(X11 REQUIRED)
-
- find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
- mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
-
- list(APPEND PLATFORM_LINKLIBS ${X11_X11_LIB})
-
- if(WITH_X11_XINPUT)
- if(X11_Xinput_LIB)
- list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB})
- else()
- message(FATAL_ERROR "LibXi not found. Disable WITH_X11_XINPUT if you
- want to build without tablet support")
- endif()
- endif()
-
- if(WITH_X11_XF86VMODE)
- # XXX, why doesn't cmake make this available?
- find_library(X11_Xxf86vmode_LIB Xxf86vm ${X11_LIB_SEARCH_PATH})
- mark_as_advanced(X11_Xxf86vmode_LIB)
- if(X11_Xxf86vmode_LIB)
- list(APPEND PLATFORM_LINKLIBS ${X11_Xxf86vmode_LIB})
- else()
- message(FATAL_ERROR "libXxf86vm not found. Disable WITH_X11_XF86VMODE if you
- want to build without")
- endif()
- endif()
-
- if(WITH_X11_XFIXES)
- if(X11_Xfixes_LIB)
- list(APPEND PLATFORM_LINKLIBS ${X11_Xfixes_LIB})
- else()
- message(FATAL_ERROR "libXfixes not found. Disable WITH_X11_XFIXES if you
- want to build without")
- endif()
- endif()
-
- if(WITH_X11_ALPHA)
- find_library(X11_Xrender_LIB Xrender ${X11_LIB_SEARCH_PATH})
- mark_as_advanced(X11_Xrender_LIB)
- if(X11_Xrender_LIB)
- list(APPEND PLATFORM_LINKLIBS ${X11_Xrender_LIB})
- else()
- message(FATAL_ERROR "libXrender not found. Disable WITH_X11_ALPHA if you
- want to build without")
- endif()
- endif()
-
-endif()
-
-
# ----------------------------------------------------------------------------
# Main Platform Checks
#
diff --git a/build_files/build_environment/patches/cmake/modules/FindBlosc.cmake b/build_files/build_environment/patches/cmake/modules/FindBlosc.cmake
index 8565ddc73ed..015d211b818 100644
--- a/build_files/build_environment/patches/cmake/modules/FindBlosc.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindBlosc.cmake
@@ -29,9 +29,6 @@ ENDIF()
SET(_blosc_SEARCH_DIRS
${BLOSC_ROOT_DIR}
- /usr/local
- /sw # Fink
- /opt/local # DarwinPorts
/opt/lib/blosc
)
diff --git a/build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake b/build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake
index 781ec0ce6c8..80cb07ece2a 100644
--- a/build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake
@@ -29,9 +29,6 @@ ENDIF()
SET(_cppunit_SEARCH_DIRS
${CPPUNIT_ROOT_DIR}
- /usr/local
- /sw # Fink
- /opt/local # DarwinPorts
/opt/lib/cppunit
)
diff --git a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
index 62ccc17d014..fed30505708 100644
--- a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
@@ -124,7 +124,6 @@ set(IlmBase_generic_include_paths
/usr/include
/usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
/usr/local/include
- /sw/include
/opt/local/include
)
set(IlmBase_generic_library_paths
@@ -133,7 +132,6 @@ set(IlmBase_generic_library_paths
/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
/usr/local/lib
/usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
- /sw/lib
/opt/local/lib
)
diff --git a/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake b/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake
index 6575cd0c763..d1a021a88bb 100644
--- a/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake
@@ -29,9 +29,6 @@ ENDIF()
SET(_logc4plus_SEARCH_DIRS
${LOGC4PLUS_ROOT_DIR}
- /usr/local
- /sw # Fink
- /opt/local # DarwinPorts
/opt/lib/logc4plus
)
diff --git a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
index 9c390d77743..2f7cae436eb 100644
--- a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
@@ -119,7 +119,6 @@ set(OpenEXR_generic_include_paths
/usr/include
/usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
/usr/local/include
- /sw/include
/opt/local/include
)
set(OpenEXR_generic_library_paths
@@ -128,7 +127,6 @@ set(OpenEXR_generic_library_paths
/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
/usr/local/lib
/usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
- /sw/lib
/opt/local/lib
)
diff --git a/build_files/build_environment/patches/cmake/modules/FindTBB.cmake b/build_files/build_environment/patches/cmake/modules/FindTBB.cmake
index c44e03b207d..de7db09ddb5 100644
--- a/build_files/build_environment/patches/cmake/modules/FindTBB.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindTBB.cmake
@@ -29,9 +29,6 @@ ENDIF()
SET(_tbb_SEARCH_DIRS
${TBB_ROOT_DIR}
- /usr/local
- /sw # Fink
- /opt/local # DarwinPorts
/opt/lib/tbb
)
diff --git a/build_files/cmake/Modules/FindAlembic.cmake b/build_files/cmake/Modules/FindAlembic.cmake
index 59eb240804f..2d69613ad84 100644
--- a/build_files/cmake/Modules/FindAlembic.cmake
+++ b/build_files/cmake/Modules/FindAlembic.cmake
@@ -27,9 +27,6 @@ ENDIF()
SET(_alembic_SEARCH_DIRS
${ALEMBIC_ROOT_DIR}
- /usr/local
- /sw # Fink
- /opt/local # DarwinPorts
/opt/lib/alembic
)
diff --git a/build_files/cmake/Modules/FindAudaspace.cmake b/build_files/cmake/Modules/FindAudaspace.cmake
index cd5116979e2..eeef49af60f 100644
--- a/build_files/cmake/Modules/FindAudaspace.cmake
+++ b/build_files/cmake/Modules/FindAudaspace.cmake
@@ -17,9 +17,6 @@ ENDIF()
SET(_audaspace_SEARCH_DIRS
${AUDASPACE_ROOT_DIR}
- /usr/local
- /sw # Fink
- /opt/local # DarwinPorts
)
# Use pkg-config to get hints about paths
diff --git a/build_files/cmake/Modules/FindBlosc.cmake b/build_files/cmake/Modules/FindBlosc.cmake
index 79590f11c4f..bec934ad7c3 100644
--- a/build_files/cmake/Modules/FindBlosc.cmake
+++ b/build_files/cmake/Modules/FindBlosc.cmake
@@ -29,9 +29,6 @@ ENDIF()
SET(_blosc_SEARCH_DIRS
${BLOSC_ROOT_DIR}
- /usr/local
- /sw # Fink
- /opt/local # DarwinPorts
/opt/lib/blosc
)
diff --git a/build_files/cmake/Modules/FindEigen3.cmake b/build_files/cmake/Modules/FindEigen3.cmake
index 2b23c2a6edc..82261294df2 100644
--- a/build_files/cmake/Modules/FindEigen3.cmake
+++ b/build_files/cmake/Modules/FindEigen3.cmake
@@ -25,9 +25,6 @@ ENDIF()
SET(_eigen3_SEARCH_DIRS
${EIGEN3_ROOT_DIR}
- /usr/local
- /sw # Fink
- /opt/local # DarwinPorts
)
FIND_PATH(EIGEN3_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindEmbree.cmake b/build_files/cmake/Modules/FindEmbree.cmake
index cb660b98a90..d9d525d4586 100644
--- a/build_files/cmake/Modules/FindEmbree.cmake
+++ b/build_files/cmake/Modules/FindEmbree.cmake
@@ -29,10 +29,6 @@ ENDIF()
SET(_embree_SEARCH_DIRS
${EMBREE_ROOT_DIR}
- /usr/local
- /sw # Fink
- /opt/local # DarwinPorts
- /opt/embree
/opt/lib/embree
)
diff --git a/build_files/cmake/Modules/FindFftw3.cmake b/build_files/cmake/Modules/FindFftw3.cmake
index 767846af015..3da19290b0d 100644
--- a/build_files/cmake/Modules/FindFftw3.cmake
+++ b/build_files/cmake/Modules/FindFftw3.cmake
@@ -29,9 +29,6 @@ ENDIF()
SET(_fftw3_SEARCH_DIRS
${FFTW3_ROOT_DIR}
- /usr/local
- /sw # Fink
- /opt/local # DarwinPorts
)
FIND_PATH(FFTW3_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindGLEW.cmake b/build_files/cmake/Modules/FindGLEW.cmake
index 593b1693fd0..652b0835807 100644
--- a/build_files/cmake/Modules/FindGLEW.cmake
+++ b/build_files/cmake/Modules/FindGLEW.cmake
@@ -28,7 +28,6 @@ ENDIF()
SET(_glew_SEARCH_DIRS
${GLEW_ROOT_DIR}
- /usr/local
)
FIND_PATH(GLEW_INCLUDE_DIR
diff --git a/build_files/cmake/Modules/FindGflags.cmake b/build_files/cmake/Modules/FindGflags.cmake
index 31d951318c8..71a05b423ed 100644
--- a/build_files/cmake/Modules/FindGflags.cmake
+++ b/build_files/cmake/Modules/FindGflags.cmake
@@ -444,7 +444,6 @@ if(NOT GFLAGS_FOUND)
/opt/local/var/macports/software # Mac OS X.
/opt/local/include
/usr/include
- /sw/include # Fink
/opt/lib/gflags/include)
list(APPEND GFLAGS_CHECK_PATH_SUFFIXES
@@ -457,7 +456,6 @@ if(NOT GFLAGS_FOUND)
/usr/local/homebrew/lib # Mac OS X.
/opt/local/lib
/usr/lib
- /sw/lib # Fink
/opt/lib/gflags/lib)
list(APPEND GFLAGS_CHECK_LIBRARY_SUFFIXES
gflags/lib # Windows (for C:/Program Files prefix).
diff --git a/build_files/cmake/Modules/FindGlog.cmake b/build_files/cmake/Modules/FindGlog.cmake
index 105d42875f6..bd1480dbaf1 100644
--- a/build_files/cmake/Modules/FindGlog.cmake
+++ b/build_files/cmake/Modules/FindGlog.cmake
@@ -128,7 +128,6 @@ list(APPEND GLOG_CHECK_INCLUDE_DIRS
/opt/local/var/macports/software # Mac OS X.
/opt/local/include
/usr/include
- /sw/include # Fink
/opt/lib/glog/include)
# Windows (for C:/Program Files prefix).
list(APPEND GLOG_CHECK_PATH_SUFFIXES
@@ -143,7 +142,6 @@ list(APPEND GLOG_CHECK_LIBRARY_DIRS
/usr/local/homebrew/lib # Mac OS X.
/opt/local/lib
/usr/lib
- /sw/lib # Fink
/opt/lib/gflags/lib)
# Windows (for C:/Program Files prefix).
list(APPEND GLOG_CHECK_LIBRARY_SUFFIXES
diff --git a/build_files/cmake/Modules/FindHDF5.cmake b/build_files/cmake/Modules/FindHDF5.cmake
index ed140614aa2..ea77c5d7826 100644
--- a/build_files/cmake/Modules/FindHDF5.cmake
+++ b/build_files/cmake/Modules/FindHDF5.cmake
@@ -26,9 +26,6 @@ ENDIF()
SET(_hdf5_SEARCH_DIRS
${HDF5_ROOT_DIR}
- /usr/local
- /sw # Fink
- /opt/local # DarwinPorts
/opt/lib/hdf5
)
diff --git a/build_files/cmake/Modules/FindIcuLinux.cmake b/build_files/cmake/Modules/FindIcuLinux.cmake
index 689550a17bb..9a467fa0115 100644
---
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list