Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 12 Sep 2018 05:54:07 +0000 (15:54 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 12 Sep 2018 05:54:07 +0000 (15:54 +1000)
1  2 
CMakeLists.txt
build_files/build_environment/install_deps.sh
build_files/buildbot/config/blender_linux.cmake
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_apple.cmake
extern/CMakeLists.txt

diff --cc CMakeLists.txt
index f86a696d419b17235247b566012d7445b8afe522,91a79af8141b17d6664250c04d218334200695cc..fa1405994c3835385c5da0e16bfde5e054698183
@@@ -165,8 -165,8 +165,7 @@@ option_defaults_init
        _init_OPENCOLORIO
        _init_SDL
        _init_FFTW3
 -      _init_GAMEENGINE
        _init_OPENSUBDIV
-       _init_SYSTEM_OPENJPG
  )
  
  # customize...
Simple merge
index 4f8f2ff2b54b779831fce72f04cc80e0c0c92b26,5e89ecc1d926e22dabb8fd5c57bcfae314997d59..3abf88fd2597b5b44e2d8d7c22964fd99a54dd21
@@@ -63,10 -63,10 +63,6 @@@ if(NOT WITH_SYSTEM_GLEW
        endif()
  endif()
  
- if(WITH_IMAGE_OPENJPEG AND (NOT WITH_SYSTEM_OPENJPEG))
-       add_subdirectory(libopenjpeg)
 -if(WITH_GAMEENGINE)
 -      add_subdirectory(recastnavigation)
--endif()
--
  if(WITH_LZO AND NOT WITH_SYSTEM_LZO)
        add_subdirectory(lzo)
  endif()