diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-08-21 10:05:40 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-21 10:05:40 +0300 |
commit | 797274d25666d6442648ae3e206364773d72b133 (patch) | |
tree | 6b9c92b368b53c1e0439ad09fad3247a5d2ddc5c /build_files | |
parent | f189ad1f4b3602e1764994c78c4d906dc12dcc8f (diff) | |
parent | 0734541bc43005609a390ab2e32020ae175d328a (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
7 files changed, 1 insertions, 8 deletions
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt index 15ac68ef0b0..81810e3e457 100644 --- a/build_files/build_environment/CMakeLists.txt +++ b/build_files/build_environment/CMakeLists.txt @@ -102,7 +102,7 @@ if(WIN32) #ocio deps include(cmake/tinyxml.cmake) include(cmake/yamlcpp.cmake) - #lcms is an ocio dep, but only if you build the apps, leaving it here for convenience + #lcms is an ocio dep, but only if you build the apps, leaving it here for convenience #include(cmake/lcms.cmake) endif() diff --git a/build_files/build_environment/cmake/blosc.cmake b/build_files/build_environment/cmake/blosc.cmake index e432096b93f..b0a0460aa94 100644 --- a/build_files/build_environment/cmake/blosc.cmake +++ b/build_files/build_environment/cmake/blosc.cmake @@ -72,4 +72,3 @@ if (WIN32) ) endif() endif() - diff --git a/build_files/build_environment/cmake/ffmpeg.cmake b/build_files/build_environment/cmake/ffmpeg.cmake index 7a3c884e7bc..b1e69b794df 100644 --- a/build_files/build_environment/cmake/ffmpeg.cmake +++ b/build_files/build_environment/cmake/ffmpeg.cmake @@ -145,5 +145,3 @@ if(BUILD_MODE STREQUAL Release AND WIN32) DEPENDEES install ) endif() - - diff --git a/build_files/build_environment/cmake/opencolorio.cmake b/build_files/build_environment/cmake/opencolorio.cmake index db0350e8d9d..c0187e8a27e 100644 --- a/build_files/build_environment/cmake/opencolorio.cmake +++ b/build_files/build_environment/cmake/opencolorio.cmake @@ -110,4 +110,3 @@ if(WIN32) endif() endif() - diff --git a/build_files/build_environment/cmake/openvdb.cmake b/build_files/build_environment/cmake/openvdb.cmake index 85c3d84771a..a9533a89b1b 100644 --- a/build_files/build_environment/cmake/openvdb.cmake +++ b/build_files/build_environment/cmake/openvdb.cmake @@ -97,4 +97,3 @@ if(WIN32) ) endif() endif() - diff --git a/build_files/build_environment/cmake/sdl.cmake b/build_files/build_environment/cmake/sdl.cmake index 4e32245f81f..8383c5a5a79 100644 --- a/build_files/build_environment/cmake/sdl.cmake +++ b/build_files/build_environment/cmake/sdl.cmake @@ -46,4 +46,3 @@ if(BUILD_MODE STREQUAL Release AND WIN32) DEPENDEES install ) endif() - diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 0d5d8e773e3..594aa990d31 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -274,4 +274,3 @@ set(PUGIXML_HASH 9346ca1dce2c48f1748c12fdac41a714) set(FLEXBISON_VERSION 2.5.5) set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip) set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce) - |