diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake index b1848517a..35da8a7d2 100644 --- a/CMakeModules/FindCOLLADA.cmake +++ b/CMakeModules/FindCOLLADA.cmake @@ -30,9 +30,6 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h ${COLLADA_DOM_ROOT}/include $ENV{COLLADA_DIR}/include $ENV{COLLADA_DIR} - $ENV{OSGDIR}/include - $ENV{OSGDIR} - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include @@ -43,7 +40,6 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h /opt/local/include # DarwinPorts /opt/csw/include # Blastwave /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /usr/freeware/include ) @@ -55,9 +51,6 @@ FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY $ENV{COLLADA_DIR}/lib $ENV{COLLADA_DIR}/lib-dbg $ENV{COLLADA_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -68,7 +61,6 @@ FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) @@ -80,9 +72,6 @@ FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY_DEBUG $ENV{COLLADA_DIR}/lib $ENV{COLLADA_DIR}/lib-dbg $ENV{COLLADA_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -93,7 +82,6 @@ FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY_DEBUG /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) @@ -105,9 +93,6 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY $ENV{COLLADA_DIR}/lib $ENV{COLLADA_DIR}/lib-dbg $ENV{COLLADA_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -118,7 +103,6 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) @@ -130,9 +114,6 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG $ENV{COLLADA_DIR}/lib $ENV{COLLADA_DIR}/lib-dbg $ENV{COLLADA_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -143,7 +124,6 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) diff --git a/CMakeModules/FindFFmpeg.cmake b/CMakeModules/FindFFmpeg.cmake index eabe5a0b8..096866341 100644 --- a/CMakeModules/FindFFmpeg.cmake +++ b/CMakeModules/FindFFmpeg.cmake @@ -30,8 +30,6 @@ MACRO(FFMPEG_FIND varname shortname headername) PATHS ${FFMPEG_ROOT}/include $ENV{FFMPEG_DIR}/include - $ENV{OSGDIR}/include - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include @@ -51,8 +49,6 @@ MACRO(FFMPEG_FIND varname shortname headername) FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername} ${FFMPEG_ROOT}/include $ENV{FFMPEG_DIR}/include - $ENV{OSGDIR}/include - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include @@ -72,8 +68,6 @@ MACRO(FFMPEG_FIND varname shortname headername) PATHS ${FFMPEG_ROOT}/lib $ENV{FFMPEG_DIR}/lib - $ENV{OSGDIR}/lib - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib diff --git a/CMakeModules/FindFLTK.cmake b/CMakeModules/FindFLTK.cmake index ca843cb3a..fb6ba4cbe 100644 --- a/CMakeModules/FindFLTK.cmake +++ b/CMakeModules/FindFLTK.cmake @@ -12,9 +12,6 @@ FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h $ENV{FLTK_DIR}/include $ENV{FLTK_DIR} - $ENV{OSGDIR}/include - $ENV{OSGDIR} - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include @@ -23,7 +20,6 @@ FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h /opt/local/include # DarwinPorts /opt/csw/include # Blastwave /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /usr/freeware/include ) @@ -34,9 +30,6 @@ MACRO(FIND_FLTK_LIBRARY MYLIBRARY MYLIBRARYNAME) PATHS $ENV{FLTK_DIR}/lib $ENV{FLTK_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -45,7 +38,6 @@ MACRO(FIND_FLTK_LIBRARY MYLIBRARY MYLIBRARYNAME) /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) diff --git a/CMakeModules/FindFOX.cmake b/CMakeModules/FindFOX.cmake index c11a60976..730764cce 100644 --- a/CMakeModules/FindFOX.cmake +++ b/CMakeModules/FindFOX.cmake @@ -12,9 +12,6 @@ FIND_PATH(FOX_INCLUDE_DIR fx.h $ENV{FOX_DIR}/include/fox-1.6 $ENV{FOX_DIR}/fox-1.6 - $ENV{OSGDIR}/include/fox-1.6 - $ENV{OSGDIR}/fox-1.6 - $ENV{OSG_ROOT}/include/fox-1.6 ~/Library/Frameworks/fox-1.6 /Library/Frameworks/fox-1.6 /usr/local/include/fox-1.6 @@ -23,13 +20,9 @@ FIND_PATH(FOX_INCLUDE_DIR fx.h /opt/local/include/fox-1.6 # DarwinPorts /opt/csw/include/fox-1.6 # Blastwave /opt/include/fox-1.6 - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include/fox-1.6 /usr/freeware/include/fox-1.6 $ENV{FOX_DIR}/include $ENV{FOX_DIR} - $ENV{OSGDIR}/include - $ENV{OSGDIR} - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include @@ -38,7 +31,6 @@ FIND_PATH(FOX_INCLUDE_DIR fx.h /opt/local/include # DarwinPorts /opt/csw/include # Blastwave /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /usr/freeware/include ) @@ -49,9 +41,6 @@ MACRO(FIND_FOX_LIBRARY MYLIBRARY MYLIBRARYNAME) PATHS $ENV{FOX_DIR}/lib $ENV{FOX_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -60,7 +49,6 @@ MACRO(FIND_FOX_LIBRARY MYLIBRARY MYLIBRARYNAME) /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) diff --git a/CMakeModules/FindGIFLIB.cmake b/CMakeModules/FindGIFLIB.cmake index b2b2f23c1..33c16f9eb 100644 --- a/CMakeModules/FindGIFLIB.cmake +++ b/CMakeModules/FindGIFLIB.cmake @@ -31,7 +31,6 @@ FIND_PATH(GIFLIB_INCLUDE_DIR gif_lib.h /opt/local/include # DarwinPorts /opt/csw/include # Blastwave /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /usr/freeware/include ) @@ -61,7 +60,6 @@ FIND_LIBRARY(GIFLIB_LIBRARY /opt/local /opt/csw /opt - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] /usr/freeware PATH_SUFFIXES lib64 lib ) diff --git a/CMakeModules/FindJasper.cmake b/CMakeModules/FindJasper.cmake index 36050aecf..0bd732a38 100644 --- a/CMakeModules/FindJasper.cmake +++ b/CMakeModules/FindJasper.cmake @@ -12,9 +12,6 @@ FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h $ENV{JASPER_DIR}/include $ENV{JASPER_DIR} - $ENV{OSGDIR}/include - $ENV{OSGDIR} - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include @@ -23,7 +20,6 @@ FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h /opt/local/include # DarwinPorts /opt/csw/include # Blastwave /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /usr/freeware/include ) @@ -32,9 +28,6 @@ FIND_LIBRARY(JASPER_LIBRARY PATHS $ENV{JASPER_DIR}/lib $ENV{JASPER_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -43,7 +36,6 @@ FIND_LIBRARY(JASPER_LIBRARY /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) diff --git a/CMakeModules/FindLibVNCServer.cmake b/CMakeModules/FindLibVNCServer.cmake index 5ef5bbe36..563e25e21 100644 --- a/CMakeModules/FindLibVNCServer.cmake +++ b/CMakeModules/FindLibVNCServer.cmake @@ -11,9 +11,6 @@ FIND_PATH(LIBVNCSERVER_INCLUDE_DIR rfb/rfb.h $ENV{LIBVNCSERVER_DIR}/include $ENV{LIBVNCSERVER_DIR} - $ENV{OSGDIR}/include - $ENV{OSGDIR} - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include @@ -22,7 +19,6 @@ FIND_PATH(LIBVNCSERVER_INCLUDE_DIR rfb/rfb.h /opt/local/include # DarwinPorts /opt/csw/include # Blastwave /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /usr/freeware/include ) @@ -31,9 +27,6 @@ FIND_LIBRARY(LIBVNCCLIENT_LIBRARY PATHS $ENV{LIBVNCSERVER_DIR}/lib $ENV{LIBVNCSERVER_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -42,7 +35,6 @@ FIND_LIBRARY(LIBVNCCLIENT_LIBRARY /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) @@ -51,9 +43,6 @@ FIND_LIBRARY(LIBVNCSERVER_LIBRARY PATHS $ENV{LIBVNCSERVER_DIR}/lib $ENV{LIBVNCSERVER_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -62,7 +51,6 @@ FIND_LIBRARY(LIBVNCSERVER_LIBRARY /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) diff --git a/CMakeModules/FindOpenEXR.cmake b/CMakeModules/FindOpenEXR.cmake index b5ac1e5cc..50ef9ec58 100644 --- a/CMakeModules/FindOpenEXR.cmake +++ b/CMakeModules/FindOpenEXR.cmake @@ -12,9 +12,6 @@ FIND_PATH(OPENEXR_INCLUDE_DIR OpenEXR/ImfIO.h $ENV{OPENEXR_DIR}/include $ENV{OPENEXR_DIR} - $ENV{OSGDIR}/include - $ENV{OSGDIR} - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include @@ -23,7 +20,6 @@ FIND_PATH(OPENEXR_INCLUDE_DIR OpenEXR/ImfIO.h /opt/local/include # DarwinPorts /opt/csw/include # Blastwave /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /usr/freeware/include ) @@ -32,9 +28,6 @@ FIND_LIBRARY(OPENEXR_IlmIlf_LIBRARY PATHS $ENV{OPENEXR_DIR}/lib $ENV{OPENEXR_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -43,7 +36,6 @@ FIND_LIBRARY(OPENEXR_IlmIlf_LIBRARY /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) @@ -52,9 +44,6 @@ FIND_LIBRARY(OPENEXR_Half_LIBRARY PATHS $ENV{OPENEXR_DIR}/lib $ENV{OPENEXR_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -63,7 +52,6 @@ FIND_LIBRARY(OPENEXR_Half_LIBRARY /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) diff --git a/CMakeModules/FindOpenVRML.cmake b/CMakeModules/FindOpenVRML.cmake index df500b260..835a1ec8f 100644 --- a/CMakeModules/FindOpenVRML.cmake +++ b/CMakeModules/FindOpenVRML.cmake @@ -13,9 +13,6 @@ FIND_PATH(OPENVRML_INCLUDE_DIR openvrml/openvrml/common.h $ENV{OPENVRML_DIR}/include $ENV{OPENVRML_DIR} - $ENV{OSGDIR}/include - $ENV{OSGDIR} - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include @@ -24,7 +21,6 @@ FIND_PATH(OPENVRML_INCLUDE_DIR openvrml/openvrml/common.h /opt/local/include # DarwinPorts /opt/csw/include # Blastwave /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /usr/freeware/include ) @@ -33,9 +29,6 @@ FIND_LIBRARY(OPENVRML_LIBRARY PATHS $ENV{OPENVRML_DIR}/lib $ENV{OPENVRML_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -44,7 +37,6 @@ FIND_LIBRARY(OPENVRML_LIBRARY /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) @@ -53,9 +45,6 @@ FIND_LIBRARY(OPENVRML_LIBRARY_DEBUG PATHS $ENV{OPENVRML_DIR}/lib $ENV{OPENVRML_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -64,7 +53,6 @@ FIND_LIBRARY(OPENVRML_LIBRARY_DEBUG /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) diff --git a/CMakeModules/FindPerformer.cmake b/CMakeModules/FindPerformer.cmake index c960934ad..79a69e640 100644 --- a/CMakeModules/FindPerformer.cmake +++ b/CMakeModules/FindPerformer.cmake @@ -14,9 +14,6 @@ FIND_PATH(PERFORMER_INCLUDE_DIR Performer/pfdu.h $ENV{PFROOT} $ENV{PERFORMER_DIR}/include $ENV{PERFORMER_DIR} - $ENV{OSGDIR}/include - $ENV{OSGDIR} - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include @@ -25,7 +22,6 @@ FIND_PATH(PERFORMER_INCLUDE_DIR Performer/pfdu.h /opt/local/include # DarwinPorts /opt/csw/include # Blastwave /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /usr/freeware/include ) @@ -39,7 +35,6 @@ IF(MSVC) $ENV{PERFORMER_DIR} $ENV{OSGDIR}/lib $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -48,7 +43,6 @@ IF(MSVC) /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) ELSE(MSVC) @@ -59,9 +53,6 @@ ELSE(MSVC) $ENV{PFROOT} $ENV{PERFORMER_DIR}/lib $ENV{PERFORMER_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -70,7 +61,6 @@ ELSE(MSVC) /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) ENDIF(MSVC) diff --git a/CMakeModules/FindXUL.cmake b/CMakeModules/FindXUL.cmake index a5f675629..988a0662b 100644 --- a/CMakeModules/FindXUL.cmake +++ b/CMakeModules/FindXUL.cmake @@ -26,16 +26,6 @@ ENDIF(PKG_CONFIG_FOUND) # Added check to make sure that nsIBaseWindow.h is available, as it's not a standard part the of 1.8.x SDK FIND_PATH(NSIBASEWINDOW_INCLUDE_DIR widget/nsIBaseWindow.h PATHS ${XULRUNNER_XPCOM_INCLUDE_DIRS} - $ENV{OSG_DIR}/include/xulrunner - $ENV{OSG_DIR}/include - $ENV{OSG_DIR}/xulrunner - $ENV{OSG_DIR} - $ENV{OSGDIR}/include/xulrunner - $ENV{OSGDIR}/include - $ENV{OSGDIR}/xulrunner - $ENV{OSGDIR} - $ENV{OSG_ROOT}/include/xulrunner - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include/xulrunner @@ -50,24 +40,12 @@ FIND_PATH(NSIBASEWINDOW_INCLUDE_DIR widget/nsIBaseWindow.h /opt/csw/include # Blastwave /opt/include/xulrunner /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include/xulrunner - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /usr/freeware/include/xulrunner /usr/freeware/include ) FIND_PATH(XUL_INCLUDE_DIR nsEmbedAPI.h PATHS ${XULRUNNER_XPCOM_INCLUDE_DIRS} - $ENV{OSG_DIR}/include/xulrunner - $ENV{OSG_DIR}/include - $ENV{OSG_DIR}/xulrunner - $ENV{OSG_DIR} - $ENV{OSGDIR}/include/xulrunner - $ENV{OSGDIR}/include - $ENV{OSGDIR}/xulrunner - $ENV{OSGDIR} - $ENV{OSG_ROOT}/include/xulrunner - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include/xulrunner @@ -82,24 +60,12 @@ FIND_PATH(XUL_INCLUDE_DIR nsEmbedAPI.h /opt/csw/include # Blastwave /opt/include/xulrunner /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include/xulrunner - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /usr/freeware/include/xulrunner /usr/freeware/include ) FIND_PATH(NSPR_INCLUDE_DIR prtypes.h PATHS ${XULRUNNER_NSPR_INCLUDE_DIRS} - $ENV{OSG_DIR}/include/nspr - $ENV{OSG_DIR}/include - $ENV{OSG_DIR}/nspr - $ENV{OSG_DIR} - $ENV{OSGDIR}/include/nspr - $ENV{OSGDIR}/include - $ENV{OSGDIR}/nspr - $ENV{OSGDIR} - $ENV{OSG_ROOT}/include/nspr - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include/nspr @@ -114,24 +80,12 @@ FIND_PATH(NSPR_INCLUDE_DIR prtypes.h /opt/csw/include # Blastwave /opt/include/nspr /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include/nspr - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /usr/freeware/include/nspr /usr/freeware/include ) FIND_PATH(MOZJS_INCLUDE_DIR jsapi.h PATHS ${XULRUNNER_JS_INCLUDE_DIRS} - $ENV{OSG_DIR}/include/mozjs - $ENV{OSG_DIR}/include - $ENV{OSG_DIR}/mozjs - $ENV{OSG_DIR} - $ENV{OSGDIR}/include/mozjs - $ENV{OSGDIR}/include - $ENV{OSGDIR}/mozjs - $ENV{OSGDIR} - $ENV{OSG_ROOT}/include/mozjs - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include/mozjs @@ -146,8 +100,6 @@ FIND_PATH(MOZJS_INCLUDE_DIR jsapi.h /opt/csw/include # Blastwave /opt/include/mozjs /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include/mozjs - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /usr/freeware/include/mozjs /usr/freeware/include ) @@ -155,11 +107,6 @@ FIND_PATH(MOZJS_INCLUDE_DIR jsapi.h FIND_PATH(XUL_DIR NAMES components/appshell.xpt PATHS - $ENV{OSG_DIR}/lib - $ENV{OSG_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib/xulrunner @@ -174,7 +121,6 @@ FIND_PATH(XUL_DIR /opt/csw/lib /opt/lib/xulrunner /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64/xulrunner /usr/freeware/lib64 ) @@ -188,11 +134,6 @@ MACRO(FIND_XUL_LIBRARY MYLIBRARY MYLIBRARYNAME) PATHS ${XULRUNNER_NSS_LIBRARY_DIRS} NAMES ${MYLIBRARYNAME} PATHS - $ENV{OSG_DIR}/lib - $ENV{OSG_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib/xulrunner @@ -207,7 +148,6 @@ MACRO(FIND_XUL_LIBRARY MYLIBRARY MYLIBRARYNAME) /opt/csw/lib /opt/lib/xulrunner /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64/xulrunner /usr/freeware/lib64 ) diff --git a/CMakeModules/FindXine.cmake b/CMakeModules/FindXine.cmake index 5753f9563..04e1b6a58 100644 --- a/CMakeModules/FindXine.cmake +++ b/CMakeModules/FindXine.cmake @@ -12,9 +12,6 @@ FIND_PATH(XINE_INCLUDE_DIR xine.h $ENV{XINE_DIR}/include $ENV{XINE_DIR} - $ENV{OSGDIR}/include - $ENV{OSGDIR} - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include @@ -23,7 +20,6 @@ FIND_PATH(XINE_INCLUDE_DIR xine.h /opt/local/include # DarwinPorts /opt/csw/include # Blastwave /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /usr/freeware/include ) @@ -32,9 +28,6 @@ FIND_LIBRARY(XINE_LIBRARY PATHS $ENV{XINE_DIR}/lib $ENV{XINE_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -43,7 +36,6 @@ FIND_LIBRARY(XINE_LIBRARY /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 ) diff --git a/CMakeModules/FindZLIB.cmake b/CMakeModules/FindZLIB.cmake index 52f918a80..4b3da9193 100644 --- a/CMakeModules/FindZLIB.cmake +++ b/CMakeModules/FindZLIB.cmake @@ -13,9 +13,6 @@ FIND_PATH(ZLIB_INCLUDE_DIR zlib.h $ENV{ZLIB_DIR}/include $ENV{ZLIB_DIR} - $ENV{OSGDIR}/include - $ENV{OSGDIR} - $ENV{OSG_ROOT}/include ~/Library/Frameworks /Library/Frameworks /usr/local/include @@ -24,7 +21,6 @@ FIND_PATH(ZLIB_INCLUDE_DIR zlib.h /opt/local/include # DarwinPorts /opt/csw/include # Blastwave /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /usr/freeware/include ) @@ -33,9 +29,6 @@ FIND_LIBRARY(ZLIB_LIBRARY PATHS $ENV{ZLIB_DIR}/lib $ENV{ZLIB_DIR} - $ENV{OSGDIR}/lib - $ENV{OSGDIR} - $ENV{OSG_ROOT}/lib ~/Library/Frameworks /Library/Frameworks /usr/local/lib @@ -44,7 +37,6 @@ FIND_LIBRARY(ZLIB_LIBRARY /opt/local/lib /opt/csw/lib /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib /usr/freeware/lib64 )