diff options
Diffstat (limited to 'build_files/cmake')
26 files changed, 2 insertions, 28 deletions
diff --git a/build_files/cmake/Modules/FindAlembic.cmake b/build_files/cmake/Modules/FindAlembic.cmake index 1f61b5ef462..9f975c08e1a 100644 --- a/build_files/cmake/Modules/FindAlembic.cmake +++ b/build_files/cmake/Modules/FindAlembic.cmake @@ -30,7 +30,6 @@ SET(_alembic_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave /opt/lib/alembic ) diff --git a/build_files/cmake/Modules/FindAudaspace.cmake b/build_files/cmake/Modules/FindAudaspace.cmake index c332ef9a039..cd5116979e2 100644 --- a/build_files/cmake/Modules/FindAudaspace.cmake +++ b/build_files/cmake/Modules/FindAudaspace.cmake @@ -20,7 +20,6 @@ SET(_audaspace_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave ) # Use pkg-config to get hints about paths diff --git a/build_files/cmake/Modules/FindEigen3.cmake b/build_files/cmake/Modules/FindEigen3.cmake index 400e8eb047d..c1b25d4169c 100644 --- a/build_files/cmake/Modules/FindEigen3.cmake +++ b/build_files/cmake/Modules/FindEigen3.cmake @@ -28,7 +28,6 @@ SET(_eigen3_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave ) FIND_PATH(EIGEN3_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindFftw3.cmake b/build_files/cmake/Modules/FindFftw3.cmake index 197d4aab7b6..8917cc1c120 100644 --- a/build_files/cmake/Modules/FindFftw3.cmake +++ b/build_files/cmake/Modules/FindFftw3.cmake @@ -32,7 +32,6 @@ SET(_fftw3_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave ) FIND_PATH(FFTW3_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindGflags.cmake b/build_files/cmake/Modules/FindGflags.cmake index 0a138c02465..31d951318c8 100644 --- a/build_files/cmake/Modules/FindGflags.cmake +++ b/build_files/cmake/Modules/FindGflags.cmake @@ -445,7 +445,6 @@ if(NOT GFLAGS_FOUND) /opt/local/include /usr/include /sw/include # Fink - /opt/csw/include # Blastwave /opt/lib/gflags/include) list(APPEND GFLAGS_CHECK_PATH_SUFFIXES @@ -459,7 +458,6 @@ if(NOT GFLAGS_FOUND) /opt/local/lib /usr/lib /sw/lib # Fink - /opt/csw/lib # Blastwave /opt/lib/gflags/lib) list(APPEND GFLAGS_CHECK_LIBRARY_SUFFIXES gflags/lib # Windows (for C:/Program Files prefix). diff --git a/build_files/cmake/Modules/FindGlog.cmake b/build_files/cmake/Modules/FindGlog.cmake index 66c2aab2762..105d42875f6 100644 --- a/build_files/cmake/Modules/FindGlog.cmake +++ b/build_files/cmake/Modules/FindGlog.cmake @@ -129,7 +129,6 @@ list(APPEND GLOG_CHECK_INCLUDE_DIRS /opt/local/include /usr/include /sw/include # Fink - /opt/csw/include # Blastwave /opt/lib/glog/include) # Windows (for C:/Program Files prefix). list(APPEND GLOG_CHECK_PATH_SUFFIXES @@ -145,7 +144,6 @@ list(APPEND GLOG_CHECK_LIBRARY_DIRS /opt/local/lib /usr/lib /sw/lib # Fink - /opt/csw/lib # Blastwave /opt/lib/gflags/lib) # Windows (for C:/Program Files prefix). list(APPEND GLOG_CHECK_LIBRARY_SUFFIXES diff --git a/build_files/cmake/Modules/FindHDF5.cmake b/build_files/cmake/Modules/FindHDF5.cmake index 56ceda8fb5e..ed140614aa2 100644 --- a/build_files/cmake/Modules/FindHDF5.cmake +++ b/build_files/cmake/Modules/FindHDF5.cmake @@ -29,7 +29,6 @@ SET(_hdf5_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave /opt/lib/hdf5 ) diff --git a/build_files/cmake/Modules/FindIcuLinux.cmake b/build_files/cmake/Modules/FindIcuLinux.cmake index e0e5873a4eb..5ccd327da16 100644 --- a/build_files/cmake/Modules/FindIcuLinux.cmake +++ b/build_files/cmake/Modules/FindIcuLinux.cmake @@ -35,7 +35,6 @@ SET(_icu_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave ) # We don't need includes, only libs to link against... diff --git a/build_files/cmake/Modules/FindJack.cmake b/build_files/cmake/Modules/FindJack.cmake index caafa3c34a1..ab4fdc99f25 100644 --- a/build_files/cmake/Modules/FindJack.cmake +++ b/build_files/cmake/Modules/FindJack.cmake @@ -32,7 +32,6 @@ SET(_jack_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave ) FIND_PATH(JACK_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindJeMalloc.cmake b/build_files/cmake/Modules/FindJeMalloc.cmake index 466456baf32..707739a3d98 100644 --- a/build_files/cmake/Modules/FindJeMalloc.cmake +++ b/build_files/cmake/Modules/FindJeMalloc.cmake @@ -32,7 +32,6 @@ SET(_jemalloc_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave /opt/lib/jemalloc ) diff --git a/build_files/cmake/Modules/FindLZO.cmake b/build_files/cmake/Modules/FindLZO.cmake index a21aa0a03bb..7aa4adca777 100644 --- a/build_files/cmake/Modules/FindLZO.cmake +++ b/build_files/cmake/Modules/FindLZO.cmake @@ -32,7 +32,6 @@ SET(_lzo_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave ) FIND_PATH(LZO_INCLUDE_DIR lzo/lzo1x.h diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake index 63bc520ea15..ed9948b8a6c 100644 --- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake +++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake @@ -65,7 +65,6 @@ SET(_opencollada_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave /opt/lib/opencollada ) diff --git a/build_files/cmake/Modules/FindOpenColorIO.cmake b/build_files/cmake/Modules/FindOpenColorIO.cmake index bd1ecac0a39..bcc22f55bcc 100644 --- a/build_files/cmake/Modules/FindOpenColorIO.cmake +++ b/build_files/cmake/Modules/FindOpenColorIO.cmake @@ -38,7 +38,6 @@ SET(_opencolorio_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave /opt/lib/ocio ) diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake index 41e60a75294..ef8d76ea3a5 100644 --- a/build_files/cmake/Modules/FindOpenEXR.cmake +++ b/build_files/cmake/Modules/FindOpenEXR.cmake @@ -50,7 +50,6 @@ SET(_openexr_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave /opt/lib/openexr ) diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake index d59f9cfcdfc..52b7856c79c 100644 --- a/build_files/cmake/Modules/FindOpenImageIO.cmake +++ b/build_files/cmake/Modules/FindOpenImageIO.cmake @@ -34,7 +34,6 @@ SET(_openimageio_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave /opt/lib/oiio ) @@ -76,6 +75,8 @@ IF(OPENIMAGEIO_FOUND) SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR}) IF(EXISTS ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/pugixml.hpp) SET(OPENIMAGEIO_PUGIXML_FOUND TRUE) + ELSE() + SET(OPENIMAGEIO_PUGIXML_FOUND FALSE) ENDIF() ELSE() SET(OPENIMAGEIO_PUGIXML_FOUND FALSE) diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake index d765103638b..4b021f13634 100644 --- a/build_files/cmake/Modules/FindOpenJPEG.cmake +++ b/build_files/cmake/Modules/FindOpenJPEG.cmake @@ -32,7 +32,6 @@ SET(_openjpeg_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave ) FIND_PATH(OPENJPEG_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindOpenShadingLanguage.cmake b/build_files/cmake/Modules/FindOpenShadingLanguage.cmake index 824d0f90597..9d9788b9900 100644 --- a/build_files/cmake/Modules/FindOpenShadingLanguage.cmake +++ b/build_files/cmake/Modules/FindOpenShadingLanguage.cmake @@ -38,7 +38,6 @@ SET(_osl_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave /opt/lib/osl ) diff --git a/build_files/cmake/Modules/FindOpenSubdiv.cmake b/build_files/cmake/Modules/FindOpenSubdiv.cmake index 72025506c97..3fca453a7a0 100644 --- a/build_files/cmake/Modules/FindOpenSubdiv.cmake +++ b/build_files/cmake/Modules/FindOpenSubdiv.cmake @@ -37,7 +37,6 @@ SET(_opensubdiv_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave /opt/lib/opensubdiv /opt/lib/osd # install_deps.sh ) diff --git a/build_files/cmake/Modules/FindOpenVDB.cmake b/build_files/cmake/Modules/FindOpenVDB.cmake index a13feab8e0e..510a5fab261 100644 --- a/build_files/cmake/Modules/FindOpenVDB.cmake +++ b/build_files/cmake/Modules/FindOpenVDB.cmake @@ -32,7 +32,6 @@ SET(_openvdb_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave /opt/openvdb /opt/lib/openvdb ) diff --git a/build_files/cmake/Modules/FindPCRE.cmake b/build_files/cmake/Modules/FindPCRE.cmake index ff4b7261555..1649a6cbb36 100644 --- a/build_files/cmake/Modules/FindPCRE.cmake +++ b/build_files/cmake/Modules/FindPCRE.cmake @@ -32,7 +32,6 @@ SET(_pcre_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave ) FIND_PATH(PCRE_INCLUDE_DIR pcre.h diff --git a/build_files/cmake/Modules/FindPugiXML.cmake b/build_files/cmake/Modules/FindPugiXML.cmake index f7104c16921..2a0dcf08c7e 100644 --- a/build_files/cmake/Modules/FindPugiXML.cmake +++ b/build_files/cmake/Modules/FindPugiXML.cmake @@ -32,7 +32,6 @@ SET(_pugixml_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave /opt/lib/oiio ) diff --git a/build_files/cmake/Modules/FindSDL2.cmake b/build_files/cmake/Modules/FindSDL2.cmake index 2a835cf94fa..7c40a6ef6f3 100644 --- a/build_files/cmake/Modules/FindSDL2.cmake +++ b/build_files/cmake/Modules/FindSDL2.cmake @@ -34,7 +34,6 @@ SET(_sdl2_SEARCH_DIRS /usr /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave ) FIND_PATH(SDL2_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindSndFile.cmake b/build_files/cmake/Modules/FindSndFile.cmake index 1b685eacfbd..4094b05adab 100644 --- a/build_files/cmake/Modules/FindSndFile.cmake +++ b/build_files/cmake/Modules/FindSndFile.cmake @@ -32,7 +32,6 @@ SET(_sndfile_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave ) FIND_PATH(SNDFILE_INCLUDE_DIR sndfile.h diff --git a/build_files/cmake/Modules/FindSpacenav.cmake b/build_files/cmake/Modules/FindSpacenav.cmake index 206f3611ed6..84599643c2d 100644 --- a/build_files/cmake/Modules/FindSpacenav.cmake +++ b/build_files/cmake/Modules/FindSpacenav.cmake @@ -32,7 +32,6 @@ SET(_spacenav_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave ) FIND_PATH(SPACENAV_INCLUDE_DIR diff --git a/build_files/cmake/Modules/FindTBB.cmake b/build_files/cmake/Modules/FindTBB.cmake index 8a821f8092e..c44e03b207d 100644 --- a/build_files/cmake/Modules/FindTBB.cmake +++ b/build_files/cmake/Modules/FindTBB.cmake @@ -32,7 +32,6 @@ SET(_tbb_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave /opt/lib/tbb ) diff --git a/build_files/cmake/Modules/FindXML2.cmake b/build_files/cmake/Modules/FindXML2.cmake index 40cc332fb88..d2df90fa2ec 100644 --- a/build_files/cmake/Modules/FindXML2.cmake +++ b/build_files/cmake/Modules/FindXML2.cmake @@ -32,7 +32,6 @@ SET(_xml2_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave ) FIND_PATH(XML2_INCLUDE_DIR libxml2/libxml/xpath.h |