[x265-commits] [x265] cmake: hack to avoid escaping problems in cmake 3.1 parser

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/17f2fb0996db
branches:  
changeset: 8835:17f2fb0996db
user:      Steve Borho <steve at borho.org>
date:      Thu Nov 13 17:16:07 2014 -0600
description:
cmake: hack to avoid escaping problems in cmake 3.1 parser

Fix suggested by Mario *LigH* Rohkrämer
Subject: [x265] analysis: don't add the cost of picture boundary CU to avgCost [CHANGES OUTPUT]

details:   http://hg.videolan.org/x265/rev/64314f8061f1
branches:  
changeset: 8836:64314f8061f1
user:      Satoshi Nakagawa <nakagawa424 at oki.com>
date:      Thu Nov 13 18:40:35 2014 +0900
description:
analysis: don't add the cost of picture boundary CU to avgCost [CHANGES OUTPUT]

diffstat:

 source/cmake/FindVLD.cmake  |  7 +++++--
 source/encoder/analysis.cpp |  4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r 03974d78f241 -r 64314f8061f1 source/cmake/FindVLD.cmake
--- a/source/cmake/FindVLD.cmake	Thu Nov 13 16:29:35 2014 +0900
+++ b/source/cmake/FindVLD.cmake	Thu Nov 13 18:40:35 2014 +0900
@@ -54,11 +54,14 @@ ELSEIF (CMAKE_SIZEOF_VOID_P EQUAL 8)
   LIST (APPEND _VLD_POSSIBLE_LIB_SUFFIXES lib/Win64)
 ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4)
 
+SET (PFILES "ProgramFiles")
+SET (PFILES_X86 "ProgramFiles(x86)") # hack to avoid escaping issues in cmake 3.1
+
 FIND_PATH (VLD_ROOT_DIR
   NAMES include/vld.h
   PATHS ENV VLDROOT
-        "$ENV{PROGRAMFILES}/Visual Leak Detector"
-        "$ENV{PROGRAMFILES(X86)}/Visual Leak Detector"
+        "$ENV{PFILES}/Visual Leak Detector"
+        "$ENV{PFILES_X86}/Visual Leak Detector"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Visual Leak Detector;InstallLocation]"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Visual Leak Detector;InstallLocation]"
   DOC "VLD root directory")
diff -r 03974d78f241 -r 64314f8061f1 source/encoder/analysis.cpp
--- a/source/encoder/analysis.cpp	Thu Nov 13 16:29:35 2014 +0900
+++ b/source/encoder/analysis.cpp	Thu Nov 13 18:40:35 2014 +0900
@@ -762,7 +762,7 @@ void Analysis::compressInterCU_dist(cons
         checkBestMode(*splitPred, depth);
     }
 
-    if (!depth || md.bestMode->cu.isInter(0))
+    if (mightNotSplit)
     {
         /* early-out statistics */
         FrameData& curEncData = const_cast<FrameData&>(*m_frame->m_encData);
@@ -1044,7 +1044,7 @@ void Analysis::compressInterCU_rd0_4(con
             md.bestMode = splitPred;
     }
 
-    if (!depth || md.bestMode->cu.isInter(0))
+    if (mightNotSplit)
     {
         /* early-out statistics */
         FrameData& curEncData = const_cast<FrameData&>(*m_frame->m_encData);