Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cmake: adjustments required for lib-upgrade on windows.

Browse Source
This commit is contained in:
Ray Molenkamp
2018-08-27 19:37:55 -06:00
parent 6dd394bf02
commit 5e8a030a08
7 changed files with 62 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -167,6 +167,7 @@ option_defaults_init(
_init_FFTW3 _init_FFTW3
_init_GAMEENGINE _init_GAMEENGINE
_init_OPENSUBDIV _init_OPENSUBDIV
_init_SYSTEM_OPENJPG
) )
# customize... # customize...
@@ -183,11 +184,13 @@ if(UNIX AND NOT APPLE)
set(_init_SDL OFF) set(_init_SDL OFF)
set(_init_FFTW3 OFF) set(_init_FFTW3 OFF)
set(_init_OPENSUBDIV OFF) set(_init_OPENSUBDIV OFF)
set(_init_SYSTEM_OPENJPG OFF)
elseif(WIN32) elseif(WIN32)
set(_init_JACK OFF) set(_init_JACK OFF)
elseif(APPLE) elseif(APPLE)
set(_init_JACK OFF) set(_init_JACK OFF)
set(_init_OPENSUBDIV OFF) set(_init_OPENSUBDIV OFF)
set(_init_SYSTEM_OPENJPG OFF)
endif() endif()
@@ -302,7 +305,7 @@ endif()
# (unix defaults to System OpenJPEG On) # (unix defaults to System OpenJPEG On)
option(WITH_SYSTEM_OPENJPEG "Use the operating systems OpenJPEG library" OFF) option(WITH_SYSTEM_OPENJPEG "Use the operating systems OpenJPEG library" ${_init_SYSTEM_OPENJPG})
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
option(WITH_SYSTEM_EIGEN3 "Use the systems Eigen3 library" OFF) option(WITH_SYSTEM_EIGEN3 "Use the systems Eigen3 library" OFF)

60
build_files/cmake/platform/platform_win32.cmake
View File

@@ -265,9 +265,7 @@ if(WITH_OPENCOLLADA)
${OPENCOLLADA}/lib/opencollada/ftoa.lib ${OPENCOLLADA}/lib/opencollada/ftoa.lib
) )
if(NOT WITH_LLVM) list(APPEND OPENCOLLADA_LIBRARIES ${OPENCOLLADA}/lib/opencollada/UTF.lib)
list(APPEND OPENCOLLADA_LIBRARIES ${OPENCOLLADA}/lib/opencollada/UTF.lib)
endif()
set(PCRE_LIBRARIES set(PCRE_LIBRARIES
${OPENCOLLADA}/lib/opencollada/pcre.lib ${OPENCOLLADA}/lib/opencollada/pcre.lib
@@ -282,8 +280,6 @@ if(WITH_CODEC_FFMPEG)
windows_find_package(FFMPEG) windows_find_package(FFMPEG)
if(NOT FFMPEG_FOUND) if(NOT FFMPEG_FOUND)
warn_hardcoded_paths(ffmpeg) warn_hardcoded_paths(ffmpeg)
set(FFMPEG_LIBRARY_VERSION 57)
set(FFMPEG_LIBRARY_VERSION_AVU 55)
set(FFMPEG_LIBRARIES set(FFMPEG_LIBRARIES
${LIBDIR}/ffmpeg/lib/avcodec.lib ${LIBDIR}/ffmpeg/lib/avcodec.lib
${LIBDIR}/ffmpeg/lib/avformat.lib ${LIBDIR}/ffmpeg/lib/avformat.lib
@@ -305,16 +301,16 @@ if(WITH_IMAGE_OPENEXR)
set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR) set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR)
set(OPENEXR_LIBPATH ${OPENEXR}/lib) set(OPENEXR_LIBPATH ${OPENEXR}/lib)
set(OPENEXR_LIBRARIES set(OPENEXR_LIBRARIES
optimized ${OPENEXR_LIBPATH}/Iex-2_2.lib optimized ${OPENEXR_LIBPATH}/Iex_s.lib
optimized ${OPENEXR_LIBPATH}/Half.lib optimized ${OPENEXR_LIBPATH}/Half_s.lib
optimized ${OPENEXR_LIBPATH}/IlmImf-2_2.lib optimized ${OPENEXR_LIBPATH}/IlmImf_s.lib
optimized ${OPENEXR_LIBPATH}/Imath-2_2.lib optimized ${OPENEXR_LIBPATH}/Imath_s.lib
optimized ${OPENEXR_LIBPATH}/IlmThread-2_2.lib optimized ${OPENEXR_LIBPATH}/IlmThread_s.lib
debug ${OPENEXR_LIBPATH}/Iex-2_2_d.lib debug ${OPENEXR_LIBPATH}/Iex_s_d.lib
debug ${OPENEXR_LIBPATH}/Half_d.lib debug ${OPENEXR_LIBPATH}/Half_s_d.lib
debug ${OPENEXR_LIBPATH}/IlmImf-2_2_d.lib debug ${OPENEXR_LIBPATH}/IlmImf_s_d.lib
debug ${OPENEXR_LIBPATH}/Imath-2_2_d.lib debug ${OPENEXR_LIBPATH}/Imath_s_d.lib
debug ${OPENEXR_LIBPATH}/IlmThread-2_2_d.lib debug ${OPENEXR_LIBPATH}/IlmThread_s_d.lib
) )
endif() endif()
endif() endif()
@@ -338,7 +334,7 @@ if(WITH_JACK)
endif() endif()
if(WITH_PYTHON) if(WITH_PYTHON)
set(PYTHON_VERSION 3.6) # CACHE STRING) set(PYTHON_VERSION 3.7) # CACHE STRING)
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION}) string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
# Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs # Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
@@ -373,14 +369,13 @@ if(WITH_BOOST)
warn_hardcoded_paths(BOOST) warn_hardcoded_paths(BOOST)
set(BOOST ${LIBDIR}/boost) set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include) set(BOOST_INCLUDE_DIR ${BOOST}/include)
if(MSVC12) set(BOOST_LIBPATH ${BOOST}/lib)
set(BOOST_LIBPATH ${BOOST}/lib) if(CMAKE_CL_64)
set(BOOST_POSTFIX "vc120-mt-s-1_60.lib") set(BOOST_POSTFIX "vc140-mt-s-x64-1_68.lib")
set(BOOST_DEBUG_POSTFIX "vc120-mt-sgd-1_60.lib") set(BOOST_DEBUG_POSTFIX "vc140-mt-sgd-x64-1_68.lib")
else() else()
set(BOOST_LIBPATH ${BOOST}/lib) set(BOOST_POSTFIX "vc140-mt-s-x32-1_68.lib")
set(BOOST_POSTFIX "vc140-mt-s-1_60.lib") set(BOOST_DEBUG_POSTFIX "vc140-mt-sgd-x32-1_68.lib")
set(BOOST_DEBUG_POSTFIX "vc140-mt-sgd-1_60.lib")
endif() endif()
set(BOOST_LIBRARIES set(BOOST_LIBRARIES
optimized ${BOOST_LIBPATH}/libboost_date_time-${BOOST_POSTFIX} optimized ${BOOST_LIBPATH}/libboost_date_time-${BOOST_POSTFIX}
@@ -459,7 +454,14 @@ if(WITH_OPENCOLORIO)
set(OPENCOLORIO ${LIBDIR}/opencolorio) set(OPENCOLORIO ${LIBDIR}/opencolorio)
set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include) set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
set(OPENCOLORIO_LIBPATH ${LIBDIR}/opencolorio/lib) set(OPENCOLORIO_LIBPATH ${LIBDIR}/opencolorio/lib)
set(OPENCOLORIO_LIBRARIES ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib) set(OPENCOLORIO_LIBRARIES
optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
optimized ${OPENCOLORIO_LIBPATH}/tinyxml.lib
optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib
debug ${OPENCOLORIO_LIBPATH}/OpenColorIO_d.lib
debug ${OPENCOLORIO_LIBPATH}/tinyxml_d.lib
debug ${OPENCOLORIO_LIBPATH}/libyaml-cpp_d.lib
)
set(OPENCOLORIO_DEFINITIONS) set(OPENCOLORIO_DEFINITIONS)
endif() endif()
@@ -471,7 +473,7 @@ if(WITH_OPENVDB)
set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib) set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include ${TBB_INCLUDE_DIR}) set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include ${TBB_INCLUDE_DIR})
set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib ${TBB_LIBRARIES} ${BLOSC_LIBRARIES}) set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
set(OPENVDB_DEFINITIONS -DNOMINMAX)
endif() endif()
if(WITH_ALEMBIC) if(WITH_ALEMBIC)
@@ -494,6 +496,12 @@ if(WITH_MOD_CLOTH_ELTOPO)
) )
endif() endif()
if(WITH_IMAGE_OPENJPEG)
set(OPENJPEG ${LIBDIR}/openjpeg)
set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include/openjpeg-2.3)
set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/openjp2.lib)
endif()
if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV) if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include) set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include)
set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib) set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
@@ -583,9 +591,11 @@ if(WITH_CYCLES_OSL)
optimized ${OSL_LIB_COMP} optimized ${OSL_LIB_COMP}
optimized ${OSL_LIB_EXEC} optimized ${OSL_LIB_EXEC}
optimized ${OSL_LIB_QUERY} optimized ${OSL_LIB_QUERY}
optimized ${CYCLES_OSL}/lib/pugixml.lib
debug ${OSL_LIB_EXEC_DEBUG} debug ${OSL_LIB_EXEC_DEBUG}
debug ${OSL_LIB_COMP_DEBUG} debug ${OSL_LIB_COMP_DEBUG}
debug ${OSL_LIB_QUERY_DEBUG} debug ${OSL_LIB_QUERY_DEBUG}
debug ${CYCLES_OSL}/lib/pugixml_d.lib
) )
find_path(OSL_INCLUDE_DIR OSL/oslclosure.h PATHS ${CYCLES_OSL}/include) find_path(OSL_INCLUDE_DIR OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin) find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)

3
intern/cycles/CMakeLists.txt
View File

@@ -200,6 +200,9 @@ endif()
if(WITH_CYCLES_OSL) if(WITH_CYCLES_OSL)
add_definitions(-DWITH_OSL) add_definitions(-DWITH_OSL)
#osl 1.9.x
add_definitions(-DOSL_STATIC_BUILD)
#pre 1.9
add_definitions(-DOSL_STATIC_LIBRARY) add_definitions(-DOSL_STATIC_LIBRARY)
include_directories( include_directories(
SYSTEM SYSTEM

9
intern/cycles/render/osl.cpp
View File

@@ -28,6 +28,7 @@
#include "kernel/osl/osl_globals.h" #include "kernel/osl/osl_globals.h"
#include "kernel/osl/osl_services.h" #include "kernel/osl/osl_services.h"
#include "kernel/osl/osl_shader.h" #include "kernel/osl/osl_shader.h"
#include "OSL/llvm_util.h"
#include "util/util_foreach.h" #include "util/util_foreach.h"
#include "util/util_logging.h" #include "util/util_logging.h"
@@ -66,6 +67,14 @@ OSLShaderManager::~OSLShaderManager()
{ {
shading_system_free(); shading_system_free();
texture_system_free(); texture_system_free();
#ifdef OSL_HAS_BLENDER_CLEANUP_FIX
/* There is a problem with llvm+osl: The order global destructors across
* different compilation units run cannot be guaranteed, on windows this means
* that the llvm destructors run before the osl destructors, causing a crash
* when the process exits. the OSL in svn has a special cleanup hack to
* sidestep this behavior */
OSL::pvt::LLVM_Util::Cleanup();
#endif
} }
void OSLShaderManager::reset(Scene * /*scene*/) void OSLShaderManager::reset(Scene * /*scene*/)

3
intern/opencolorio/CMakeLists.txt
View File

@@ -63,6 +63,9 @@ if(WITH_OPENCOLORIO)
list(APPEND INC_SYS list(APPEND INC_SYS
${BOOST_INCLUDE_DIR} ${BOOST_INCLUDE_DIR}
) )
add_definitions(
-DOpenColorIO_STATIC
)
endif() endif()
data_to_c_simple(gpu_shader_display_transform.glsl SRC) data_to_c_simple(gpu_shader_display_transform.glsl SRC)

1
intern/openvdb/CMakeLists.txt
View File

@@ -38,6 +38,7 @@ set(SRC
if(WITH_OPENVDB) if(WITH_OPENVDB)
add_definitions( add_definitions(
-DWITH_OPENVDB -DWITH_OPENVDB
${OPENVDB_DEFINITIONS}
) )
if(WITH_OPENVDB_3_ABI_COMPATIBLE) if(WITH_OPENVDB_3_ABI_COMPATIBLE)

23
source/creator/CMakeLists.txt
View File

@@ -717,7 +717,7 @@ elseif(WIN32)
) )
if(WITH_PYTHON_INSTALL_NUMPY) if(WITH_PYTHON_INSTALL_NUMPY)
set(PYTHON_NUMPY_VERSION 1.13) set(PYTHON_NUMPY_VERSION 1.15)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages
COMMAND ${CMAKE_COMMAND} -E COMMAND ${CMAKE_COMMAND} -E
make_directory ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages) make_directory ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages)
@@ -780,12 +780,12 @@ elseif(WIN32)
if(WITH_CODEC_FFMPEG) if(WITH_CODEC_FFMPEG)
install( install(
FILES FILES
${LIBDIR}/ffmpeg/lib/avcodec-57.dll ${LIBDIR}/ffmpeg/lib/avcodec-58.dll
${LIBDIR}/ffmpeg/lib/avformat-57.dll ${LIBDIR}/ffmpeg/lib/avformat-58.dll
${LIBDIR}/ffmpeg/lib/avdevice-57.dll ${LIBDIR}/ffmpeg/lib/avdevice-58.dll
${LIBDIR}/ffmpeg/lib/avutil-55.dll ${LIBDIR}/ffmpeg/lib/avutil-56.dll
${LIBDIR}/ffmpeg/lib/swscale-4.dll ${LIBDIR}/ffmpeg/lib/swscale-5.dll
${LIBDIR}/ffmpeg/lib/swresample-2.dll ${LIBDIR}/ffmpeg/lib/swresample-3.dll
DESTINATION "." DESTINATION "."
) )
endif() endif()
@@ -834,15 +834,6 @@ elseif(WIN32)
DESTINATION "." DESTINATION "."
) )
if(WITH_OPENCOLORIO)
set(OCIOBIN ${LIBDIR}/opencolorio/bin)
install(
FILES
${OCIOBIN}/OpenColorIO.dll
DESTINATION "."
)
endif()
elseif(APPLE) elseif(APPLE)
# handy install macro to exclude files, we use \$ escape for the "to" # handy install macro to exclude files, we use \$ escape for the "to"