[Bf-blender-cvs] [8864dde5bb3] master: Cleanup: remove unused build environment patches.
Brecht Van Lommel
noreply at git.blender.org
Wed Aug 29 16:41:28 CEST 2018
Commit: 8864dde5bb39f11ddc28f4108e944611662826a7
Author: Brecht Van Lommel
Date: Wed Aug 29 14:33:42 2018 +0200
Branches: master
https://developer.blender.org/rB8864dde5bb39f11ddc28f4108e944611662826a7
Cleanup: remove unused build environment patches.
===================================================================
M build_files/build_environment/cmake/osl.cmake
M build_files/build_environment/cmake/python.cmake
D build_files/build_environment/patches/alembic.diff
D build_files/build_environment/patches/cmakelists_openvdb.txt
D build_files/build_environment/patches/distutildebugflags.diff
D build_files/build_environment/patches/osl_simd_oiio.diff
D build_files/build_environment/patches/pyshell.diff
D build_files/build_environment/patches/python.diff
D build_files/build_environment/patches/python_apple.diff
D build_files/build_environment/patches/python_runtime_vc2013.diff
===================================================================
diff --git a/build_files/build_environment/cmake/osl.cmake b/build_files/build_environment/cmake/osl.cmake
index 469f0eee69d..eaf6a62d18a 100644
--- a/build_files/build_environment/cmake/osl.cmake
+++ b/build_files/build_environment/cmake/osl.cmake
@@ -90,7 +90,6 @@ ExternalProject_Add(external_osl
URL_HASH MD5=${OSL_HASH}
PREFIX ${BUILD_DIR}/osl
PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff
- # ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl_simd_oiio.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/osl
)
diff --git a/build_files/build_environment/cmake/python.cmake b/build_files/build_environment/cmake/python.cmake
index cf928ecd794..22b4052189e 100644
--- a/build_files/build_environment/cmake/python.cmake
+++ b/build_files/build_environment/cmake/python.cmake
@@ -86,7 +86,6 @@ else()
set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && export PKG_CONFIG_PATH=${BREW_PKG_CONFIG} && ${PYTHON_FUNC_CONFIGS})
set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
- #set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_apple.diff)
set(PYTHON_PATCH echo .)
set(PYTHON_CONFIGURE_EXTRA_ENV echo .)
set(PYTHON_CONFIGURE_EXTRA_ARGS)
diff --git a/build_files/build_environment/patches/alembic.diff b/build_files/build_environment/patches/alembic.diff
deleted file mode 100644
index f869858efb2..00000000000
--- a/build_files/build_environment/patches/alembic.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3e09c57..26565ae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -116,7 +116,7 @@ IF (NOT ${ALEMBIC_LIB_USES_TR1} AND NOT ${ALEMBIC_LIB_USES_BOOST})
- INCLUDE(CheckCXXCompilerFlag)
- CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
- CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
-- IF (COMPILER_SUPPORTS_CXX1X)
-+ IF (COMPILER_SUPPORTS_CXX11)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- ELSEIF (COMPILER_SUPPORTS_CXX0X)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
---- a/lib/Alembic/AbcCoreOgawa/StreamManager.cpp
-+++ b/lib/Alembic/AbcCoreOgawa/StreamManager.cpp
-@@ -47,7 +47,18 @@
- #define COMPARE_EXCHANGE( V, COMP, EXCH ) V.compare_exchange_weak( COMP, EXCH, std::memory_order_seq_cst, std::memory_order_seq_cst )
- // Windows
- #elif defined( _MSC_VER )
--#define COMPARE_EXCHANGE( V, COMP, EXCH ) InterlockedCompareExhange64( &V, EXCH, COMP ) == COMP
-+#define COMPARE_EXCHANGE( V, COMP, EXCH ) InterlockedCompareExchange64( &V, EXCH, COMP ) == COMP
-+int ffsll(long long value)
-+{
-+ if (!value)
-+ return 0;
-+
-+ for (int bit = 0; bit < 63; bit++)
-+ {
-+ if (value & (1 << bit))
-+ return bit + 1;
-+ }
-+}
- // gcc 4.8 and above not using C++11
- #elif defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8
- #define COMPARE_EXCHANGE( V, COMP, EXCH ) __atomic_compare_exchange_n( &V, &COMP, EXCH, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST )
diff --git a/build_files/build_environment/patches/cmakelists_openvdb.txt b/build_files/build_environment/patches/cmakelists_openvdb.txt
deleted file mode 100644
index 43161b8acff..00000000000
--- a/build_files/build_environment/patches/cmakelists_openvdb.txt
+++ /dev/null
@@ -1,398 +0,0 @@
-# --------------------------------------------------------------------------------
-
-cmake_minimum_required(VERSION 2.8)
-
-# --------------------------------------------------------------------------------
-
-project(OpenVDB)
-
-# --------------------------------------------------------------------------------
-
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
-
-# --------------------------------------------------------------------------------
-
-set(CMAKE_BUILD_TYPE_INIT "Release")
-
-# --------------------------------------------------------------------------------
-# Options
-
-option(WITH_BLOSC "Enable Blosc support for compression" OFF)
-option(WITH_LOGC4PLUS "Enable logging" OFF)
-option(WITH_OPENVDB_2_ABI "Enable building the library to be compability with the OpenVDB 2 ABI" OFF)
-option(WITH_PRINTER "Enable building the OpenVDB print executable" OFF)
-option(WITH_PYTHON "Enable building the OpenVDB python API" OFF)
-option(WITH_RENDERER "Enable building the OpenVDB render executable" OFF)
-option(WITH_UNITTEST "Enable building the unit tests" OFF)
-option(WITH_VIEWER "Enable building the OpenVDB viewer executable" OFF)
-
-# --------------------------------------------------------------------------------
-# Find packages
-#set(BOOST_LIBRARIES boost_iostreams boost_system boost_thread)
-
-find_package(IlmBase)
-find_package(OpenEXR)
-find_package(TBB)
-find_package(Boost)
-
-if(WITH_BLOSC)
- find_package(Blosc)
-
- if(NOT BLOSC_FOUND)
- set(WITH_BLOSC OFF)
- endif()
-endif()
-
-# todo
-if(WITH_VIEWER)
- set(GLFW_INCLUDE_DIRS ${GLFW_INCLUDE_PATH})
- set(GLFW_LIBRARY_DIRS ${GLFW_LIBRARY_PATH})
-endif()
-
-if(WITH_LOGC4PLUS)
- find_package(LogC4Plus)
-
- if(NOT LOGC4PLUS_FOUND)
- set(WITH_LOGC4PLUS OFF)
- endif()
-endif()
-
-# todo
-if(WITH_PYTHON)
- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_PATH})
- set(PYTHON_LIBRARY_DIRS ${PYTHON_LIBRARY_PATH})
-endif()
-
-if(WITH_UNITTEST)
- find_package(CppUnit)
-
- if(NOT CPPUNIT_FOUND)
- set(WITH_UNITTEST OFF)
- endif()
-endif()
-
-# --------------------------------------------------------------------------------
-
-message (STATUS "BOOST_ROOT ${BOOST_ROOT}")
-message (STATUS "Boost found ${Boost_FOUND} ")
-message (STATUS "Boost version ${Boost_VERSION}")
-message (STATUS "Boost include dirs ${Boost_INCLUDE_DIRS}")
-message (STATUS "Boost library dirs ${Boost_LIBRARY_DIRS}")
-message (STATUS "Boost libraries ${Boost_LIBRARIES}")
-
-message (STATUS "ILMBase found ${ILMBASE_FOUND} ")
-message (STATUS "ILMBase include dir ${ILMBASE_INCLUDE_DIR}")
-message (STATUS "ILMBase libraries ${ILMBASE_LIBRARIES}")
-
-message (STATUS "TBB found ${TBB_FOUND} ")
-message (STATUS "TBB include dir ${TBB_INCLUDE_DIR}")
-message (STATUS "TBB libraries ${TBB_LIBRARIES}")
-
-if(MSVC)
- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj" )
- set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /bigobj" )
-endif()
-
-set(OPENVDB_LIBRARIES ${BLOSC_LIBRARIES} ${BOOST_LIBRARIES} ${OPENEXR_LIBRARIES} ${ILMBASE_LIBRARIES} ${TBB_LIBRARIES} ${ZLIB_LIBRARY} )
-
-include_directories(. ${CMAKE_CURRENT_SOURCE_DIR}/../ ${Boost_INCLUDE_DIRS} ${ILMBASE_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR} ${TBB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
-link_directories(${Boost_LIBRARY_DIRS} ${OPENEXR_LIBRARY_DIRS} ${TBB_INCLUDE_DIRS})
-add_definitions(-DNOMINMAX -D__TBB_NO_IMPLICIT_LINKAGE -DOPENVDB_STATICLIB -DOPENVDB_OPENEXR_STATICLIB)
-
-if(WITH_BLOSC)
- add_definitions(-DOPENVDB_USE_BLOSC)
- include_directories(${BLOSC_INCLUDE_DIRS})
- link_directories(${BLOSC_LIBRARY_DIRS})
-endif()
-
-if(WITH_LOGC4PLUS)
- add_definitions(-DOPENVDB_USE_LOG4CPLUS)
- include_directories(${LOG4CPLUS_INCLUDE_DIRS})
- link_directories(${LOG4CPLUS_LIBRARY_DIRS})
-endif()
-
-if(WITH_OPENVDB_2_ABI)
- add_definitions(-DOPENVDB_2_ABI_COMPATIBLE)
-endif()
-
-# todo
-if(WITH_OPENVDB_USE_GLFW_3)
- add_definitions(-DOPENVDB_USE_GLFW_3)
-endif()
-
-if(WITH_UNITTEST)
- include_directories(${CPPUNIT_INCLUDE_DIRS})
- link_directories(${CPPUNIT_LIBRARY_DIRS})
-endif()
-
-# --------------------------------------------------------------------------------
-
-set(SRC_FILES
- openvdb/openvdb.cc
- openvdb/io/Compression.cc
- openvdb/io/File.cc
- openvdb/io/Queue.cc
- openvdb/io/Stream.cc
- openvdb/io/TempFile.cc
- openvdb/io/GridDescriptor.cc
- openvdb/io/Archive.cc
- openvdb/metadata/MetaMap.cc
- openvdb/metadata/Metadata.cc
- openvdb/math/Maps.cc
- openvdb/math/Transform.cc
- openvdb/math/QuantizedUnitVec.cc
- openvdb/math/Proximity.cc
- openvdb/Grid.cc
- openvdb/util/Formats.cc
- openvdb/util/Util.cc
-)
-
-set(HEADER_FILES
- openvdb/openvdb.h
- openvdb/version.h
- openvdb/PlatformConfig.h
- openvdb/Metadata.h
- openvdb/Exceptions.h
- openvdb/Grid.h
- openvdb/Types.h
- openvdb/Platform.h
- openvdb/tree/ValueAccessor.h
- openvdb/tree/NodeUnion.h
- openvdb/tree/Tree.h
- openvdb/tree/Iterator.h
- openvdb/tree/LeafNodeBool.h
- openvdb/tree/TreeIterator.h
- openvdb/tree/LeafNode.h
- openvdb/tree/NodeManager.h
- openvdb/tree/LeafManager.h
- openvdb/tree/InternalNode.h
- openvdb/tree/RootNode.h
- openvdb/tools/PointScatter.h
- openvdb/tools/VolumeAdvect.h
- openvdb/tools/LevelSetTracker.h
- openvdb/tools/Composite.h
- openvdb/tools/Morphology.h
- openvdb/tools/ValueTransformer.h
- openvdb/tools/ChangeBackground.h
- openvdb/tools/GridTransformer.h
- openvdb/tools/Prune.h
- openvdb/tools/LevelSetUtil.h
- openvdb/tools/VolumeToSpheres.h
- openvdb/tools/LevelSetAdvect.h
- openvdb/tools/Statistics.h
- openvdb/tools/LevelSetMeasure.h
- openvdb/tools/VectorTransformer.h
- openvdb/tools/RayIntersector.h
- openvdb/tools/PointPartitioner.h
- openvdb/tools/Interpolation.h
- openvdb/tools/VelocityFields.h
- openvdb/tools/PointIndexGrid.h
- openvdb/tools/LevelSetRebuild.h
- openvdb/tools/Clip.h
- openvdb/tools/SignedFloodFill.h
- openvdb/tools/MeshToVolume.h
- openvdb/tools/Dense.h
- openvdb/tools/Filter.h
- openvdb/tools/RayTracer.h
- openvdb/tools/Diagnostics.h
- openvdb/tools/VolumeToMesh.h
- openvdb/tools/PoissonSolver.h
- openvdb/tools/LevelSetFracture.h
- openvdb/tools/GridOperators.h
- openvdb/tools/DenseSparseTools.h
- openvdb/tools/ParticlesToLevelSet.h
- openvdb/tools/LevelSetSphere.h
- openvdb/tools/LevelSetMorph.h
- openvdb/tools/LevelSetFilter.h
- openvdb/tools/PointAdvect.h
- openvdb/io/Queue.h
- openvdb/io/TempFile.h
- openvdb/io/Stream.h
- openvdb/io/GridDescriptor.h
- openvdb/io/Archive.h
- openvdb/io/io.h
- openvdb/io/Compression.h
- openvdb/io/File.h
- openvdb/metadata/StringMetadata.h
- openvdb/metadata/MetaMap.h
- openvdb/metadata/Metadata.h
- openvdb/math/DDA.h
- openvdb/math/Vec2.h
- openvdb/math/FiniteDifference.h
- openvdb/math/Stencils.h
- openvdb/math/BBox.h
- openvdb/math
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list