diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-10 09:21:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-10 09:21:50 +0300 |
commit | a52152c59fa28993dd9e82866cf69a76cc63d9d9 (patch) | |
tree | fa91891bc6b2b87432511d7bc243508781f6af62 /build_files/cmake/Modules | |
parent | dd67d703a749649fb13e4a5b5c993a1f2785d06b (diff) | |
parent | ae01df5779de8ba76f46e51449891e567701d2d8 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/cmake/Modules')
19 files changed, 21 insertions, 21 deletions
diff --git a/build_files/cmake/Modules/FindAlembic.cmake b/build_files/cmake/Modules/FindAlembic.cmake index 9f975c08e1a..59eb240804f 100644 --- a/build_files/cmake/Modules/FindAlembic.cmake +++ b/build_files/cmake/Modules/FindAlembic.cmake @@ -51,7 +51,7 @@ FIND_LIBRARY(ALEMBIC_LIBRARY lib64 lib lib/static ) -# handle the QUIETLY and REQUIRED arguments and set ALEMBIC_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set ALEMBIC_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALEMBIC DEFAULT_MSG ALEMBIC_LIBRARY ALEMBIC_INCLUDE_DIR) diff --git a/build_files/cmake/Modules/FindEigen3.cmake b/build_files/cmake/Modules/FindEigen3.cmake index c1b25d4169c..2b23c2a6edc 100644 --- a/build_files/cmake/Modules/FindEigen3.cmake +++ b/build_files/cmake/Modules/FindEigen3.cmake @@ -40,7 +40,7 @@ FIND_PATH(EIGEN3_INCLUDE_DIR include/eigen3 ) -# handle the QUIETLY and REQUIRED arguments and set EIGEN3_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set EIGEN3_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Eigen3 DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindFftw3.cmake b/build_files/cmake/Modules/FindFftw3.cmake index 8917cc1c120..767846af015 100644 --- a/build_files/cmake/Modules/FindFftw3.cmake +++ b/build_files/cmake/Modules/FindFftw3.cmake @@ -52,7 +52,7 @@ FIND_LIBRARY(FFTW3_LIBRARY lib64 lib ) -# handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fftw3 DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindGLEW.cmake b/build_files/cmake/Modules/FindGLEW.cmake index 3057237f3c6..b36a3272e3d 100644 --- a/build_files/cmake/Modules/FindGLEW.cmake +++ b/build_files/cmake/Modules/FindGLEW.cmake @@ -49,7 +49,7 @@ FIND_LIBRARY(GLEW_LIBRARY lib64 lib ) -# handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Glew DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindIcuLinux.cmake b/build_files/cmake/Modules/FindIcuLinux.cmake index 5ccd327da16..c5164913f7f 100644 --- a/build_files/cmake/Modules/FindIcuLinux.cmake +++ b/build_files/cmake/Modules/FindIcuLinux.cmake @@ -115,7 +115,7 @@ if(Boost_USE_STATIC_LIBS) set(CMAKE_FIND_LIBRARY_SUFFIXES ${_icu_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) endif() -# handle the QUIETLY and REQUIRED arguments and set ICU_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set ICU_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Icu DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindJack.cmake b/build_files/cmake/Modules/FindJack.cmake index ab4fdc99f25..dbfc30edb99 100644 --- a/build_files/cmake/Modules/FindJack.cmake +++ b/build_files/cmake/Modules/FindJack.cmake @@ -52,7 +52,7 @@ FIND_LIBRARY(JACK_LIBRARY lib64 lib ) -# handle the QUIETLY and REQUIRED arguments and set JACK_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set JACK_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jack DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindJeMalloc.cmake b/build_files/cmake/Modules/FindJeMalloc.cmake index 707739a3d98..506892b34ba 100644 --- a/build_files/cmake/Modules/FindJeMalloc.cmake +++ b/build_files/cmake/Modules/FindJeMalloc.cmake @@ -53,7 +53,7 @@ FIND_LIBRARY(JEMALLOC_LIBRARY lib64 lib ) -# handle the QUIETLY and REQUIRED arguments and set JEMALLOC_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set JEMALLOC_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(JeMalloc DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindLZO.cmake b/build_files/cmake/Modules/FindLZO.cmake index 7aa4adca777..6a70186150f 100644 --- a/build_files/cmake/Modules/FindLZO.cmake +++ b/build_files/cmake/Modules/FindLZO.cmake @@ -50,7 +50,7 @@ FIND_LIBRARY(LZO_LIBRARY lib64 lib ) -# handle the QUIETLY and REQUIRED arguments and set LZO_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set LZO_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZO DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake index ed9948b8a6c..45ef682cb61 100644 --- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake +++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake @@ -1,7 +1,7 @@ # - Find OpenCOLLADA library # Find the native OpenCOLLADA includes and library # This module defines -# OPENCOLLADA_INCLUDE_DIRS, where to find COLLADABaseUtils/ and +# OPENCOLLADA_INCLUDE_DIRS, where to find COLLADABaseUtils/ and # COLLADAFramework/, Set when OPENCOLLADA_INCLUDE_DIR is found. # OPENCOLLADA_LIBRARIES, libraries to link against to use OpenCOLLADA. # OPENCOLLADA_ROOT_DIR, The base directory to search for OpenCOLLADA. @@ -129,7 +129,7 @@ FOREACH(COMPONENT ${_opencollada_FIND_STATIC_COMPONENTS}) ENDFOREACH() -# handle the QUIETLY and REQUIRED arguments and set OPENCOLLADA_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set OPENCOLLADA_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenCOLLADA DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindOpenColorIO.cmake b/build_files/cmake/Modules/FindOpenColorIO.cmake index bcc22f55bcc..1d26d6b0f86 100644 --- a/build_files/cmake/Modules/FindOpenColorIO.cmake +++ b/build_files/cmake/Modules/FindOpenColorIO.cmake @@ -68,7 +68,7 @@ FOREACH(COMPONENT ${_opencolorio_FIND_COMPONENTS}) ENDFOREACH() -# handle the QUIETLY and REQUIRED arguments and set OPENCOLORIO_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set OPENCOLORIO_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenColorIO DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake index ef8d76ea3a5..fa02d3f3f28 100644 --- a/build_files/cmake/Modules/FindOpenEXR.cmake +++ b/build_files/cmake/Modules/FindOpenEXR.cmake @@ -106,7 +106,7 @@ FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS}) FIND_LIBRARY(OPENEXR_${UPPERCOMPONENT}_LIBRARY NAMES - ${COMPONENT}-${_openexr_libs_ver} ${COMPONENT} + ${COMPONENT}-${_openexr_libs_ver} ${COMPONENT} HINTS ${_openexr_SEARCH_DIRS} PATH_SUFFIXES @@ -117,7 +117,7 @@ ENDFOREACH() UNSET(_openexr_libs_ver) -# handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake index 52b7856c79c..5652e1649c8 100644 --- a/build_files/cmake/Modules/FindOpenImageIO.cmake +++ b/build_files/cmake/Modules/FindOpenImageIO.cmake @@ -64,7 +64,7 @@ FIND_FILE(OPENIMAGEIO_IDIFF bin ) -# handle the QUIETLY and REQUIRED arguments and set OPENIMAGEIO_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set OPENIMAGEIO_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake index 4b021f13634..85a4c131fb1 100644 --- a/build_files/cmake/Modules/FindOpenJPEG.cmake +++ b/build_files/cmake/Modules/FindOpenJPEG.cmake @@ -53,7 +53,7 @@ FIND_LIBRARY(OPENJPEG_LIBRARY lib64 lib ) -# handle the QUIETLY and REQUIRED arguments and set OPENJPEG_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set OPENJPEG_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenJPEG DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindPCRE.cmake b/build_files/cmake/Modules/FindPCRE.cmake index 1649a6cbb36..20b5c1d5c28 100644 --- a/build_files/cmake/Modules/FindPCRE.cmake +++ b/build_files/cmake/Modules/FindPCRE.cmake @@ -50,7 +50,7 @@ FIND_LIBRARY(PCRE_LIBRARY lib64 lib ) -# handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindPugiXML.cmake b/build_files/cmake/Modules/FindPugiXML.cmake index 2a0dcf08c7e..629069c9032 100644 --- a/build_files/cmake/Modules/FindPugiXML.cmake +++ b/build_files/cmake/Modules/FindPugiXML.cmake @@ -53,7 +53,7 @@ FIND_LIBRARY(PUGIXML_LIBRARY lib64 lib ) -# handle the QUIETLY and REQUIRED arguments and set PUGIXML_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set PUGIXML_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(PUGIXML DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindPythonLibsUnix.cmake b/build_files/cmake/Modules/FindPythonLibsUnix.cmake index 493fb0df6a7..140f8be048a 100644 --- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake +++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake @@ -175,7 +175,7 @@ UNSET(_IS_INC_CONF_DEF) UNSET(_IS_LIB_DEF) UNSET(_IS_LIB_PATH_DEF) -# handle the QUIETLY and REQUIRED arguments and SET PYTHONLIBSUNIX_FOUND to TRUE IF +# handle the QUIETLY and REQUIRED arguments and SET PYTHONLIBSUNIX_FOUND to TRUE IF # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibsUnix DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindSndFile.cmake b/build_files/cmake/Modules/FindSndFile.cmake index c210c523c58..ef6fb73598f 100644 --- a/build_files/cmake/Modules/FindSndFile.cmake +++ b/build_files/cmake/Modules/FindSndFile.cmake @@ -50,7 +50,7 @@ FIND_LIBRARY(LIBSNDFILE_LIBRARY lib64 lib ) -# handle the QUIETLY and REQUIRED arguments and set LIBSNDFILE_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set LIBSNDFILE_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(SndFile DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindSpacenav.cmake b/build_files/cmake/Modules/FindSpacenav.cmake index 84599643c2d..593ed54a08e 100644 --- a/build_files/cmake/Modules/FindSpacenav.cmake +++ b/build_files/cmake/Modules/FindSpacenav.cmake @@ -52,7 +52,7 @@ FIND_LIBRARY(SPACENAV_LIBRARY lib64 lib ) -# handle the QUIETLY and REQUIRED arguments and set SPACENAV_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set SPACENAV_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Spacenav DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindXML2.cmake b/build_files/cmake/Modules/FindXML2.cmake index d2df90fa2ec..e69a14c9306 100644 --- a/build_files/cmake/Modules/FindXML2.cmake +++ b/build_files/cmake/Modules/FindXML2.cmake @@ -50,7 +50,7 @@ FIND_LIBRARY(XML2_LIBRARY lib64 lib ) -# handle the QUIETLY and REQUIRED arguments and set XML2_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set XML2_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(XML2 DEFAULT_MSG |