Paul Melis wrote: > Robert Osfield wrote: > >> Hi Paul, >> >> I've just reviewed your modified FindXUL.cmake and found it to be >> identical to the one in OSG-2.8/svn/trunk. Same problem as the mods >> for DCMTK... >> >> > I must have sent you the versions from trunk, not the 2.8 branch. > Here are the correct files. > Dang, my thunderbird (on a fairly fresh system) wasn't updated to not send attachements inline. Here's the two files again...
Paul
# - find DCMTK libraries # # DCMTK_INCLUDE_DIRS - Directories to include to use DCMTK # DCMTK_LIBRARIES - Files to link against to use DCMTK # DCMTK_FOUND - If false, don't try to use DCMTK # DCMTK_DIR - (optional) Source directory for DCMTK # # DCMTK_DIR can be used to make it simpler to find the various include # directories and compiled libraries if you've just compiled it in the # source tree. Just set it to the root of the tree where you extracted # the source. # # Written for VXL by Amitha Perera. # Modified by Robert Osfied to enable support for install placements of DCMTK 3.5.4 versions onwards FIND_PATH( DCMTK_ROOT_INCLUDE_DIR dcmtk/config/osconfig.h ${DCMTK_DIR}/config/include ${DCMTK_DIR}/include /usr/local/include/ /usr/include/ /usr/local/dicom/include/ ) FIND_PATH( DCMTK_config_INCLUDE_DIR osconfig.h ${DCMTK_ROOT_INCLUDE_DIR}/dcmtk/config ${DCMTK_DIR}/config/include ${DCMTK_DIR}/include /usr/local/include/dcmtk/config /usr/include/dcmtk/config /usr/local/dicom/include/dcmtk/config ) FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h ${DCMTK_ROOT_INCLUDE_DIR}/dcmtk/ofstd ${DCMTK_DIR}/ofstd/include ${DCMTK_DIR}/include/ofstd /usr/local/include/dcmtk/ofstd /usr/include/dcmtk/ofstd /usr/local/dicom/include/dcmtk/ofstd ) FIND_LIBRARY( DCMTK_ofstd_LIBRARY ofstd ${DCMTK_DIR}/ofstd/libsrc ${DCMTK_DIR}/ofstd/libsrc/Release ${DCMTK_DIR}/ofstd/libsrc/Debug ${DCMTK_DIR}/ofstd/Release ${DCMTK_DIR}/ofstd/Debug ${DCMTK_DIR}/lib /usr/local/lib64 /usr/lib64 /usr/local/lib /usr/lib /usr/local/dicom/lib ) FIND_PATH( DCMTK_dcmdata_INCLUDE_DIR dctypes.h ${DCMTK_ROOT_INCLUDE_DIR}/dcmtk/dcmdata ${DCMTK_DIR}/dcmdata/include ${DCMTK_DIR}/include/dcmdata /usr/local/include/dcmtk/dcmdata /usr/include/dcmtk/dcmdata /usr/local/dicom/include/dcmtk/dcmdata ) FIND_LIBRARY( DCMTK_dcmdata_LIBRARY dcmdata ${DCMTK_DIR}/dcmdata/libsrc ${DCMTK_DIR}/dcmdata/libsrc/Release ${DCMTK_DIR}/dcmdata/libsrc/Debug ${DCMTK_DIR}/dcmdata/Release ${DCMTK_DIR}/dcmdata/Debug ${DCMTK_DIR}/lib /usr/local/lib64 /usr/lib64 /usr/local/lib /usr/lib /usr/local/dicom/lib ) FIND_PATH( DCMTK_dcmimgle_INCLUDE_DIR dcmimage.h ${DCMTK_ROOT_INCLUDE_DIR}/dcmtk/dcmimgle ${DCMTK_DIR}/dcmimgle/include ${DCMTK_DIR}/include/dcmimgle /usr/local/include/dcmtk/dcmimgle /usr/include/dcmtk/dcmimgle /usr/local/dicom/include/dcmtk/dcmimgle ) FIND_LIBRARY( DCMTK_dcmimgle_LIBRARY dcmimgle ${DCMTK_DIR}/dcmimgle/libsrc ${DCMTK_DIR}/dcmimgle/libsrc/Release ${DCMTK_DIR}/dcmimgle/libsrc/Debug ${DCMTK_DIR}/dcmimgle/Release ${DCMTK_DIR}/dcmimgle/Debug ${DCMTK_DIR}/lib /usr/local/lib64 /usr/lib64 /usr/local/lib /usr/lib /usr/local/dicom/lib ) FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb ${DCMTK_DIR}/imagectn/libsrc/Release ${DCMTK_DIR}/imagectn/libsrc/ ${DCMTK_DIR}/imagectn/libsrc/Debug /usr/local/lib64 /usr/lib64 /usr/local/lib /usr/lib /usr/local/dicom/lib ) FIND_LIBRARY(DCMTK_dcmnet_LIBRARY dcmnet ${DCMTK_DIR}/dcmnet/libsrc/Release ${DCMTK_DIR}/dcmnet/libsrc/Debug ${DCMTK_DIR}/dcmnet/libsrc/ /usr/local/lib64 /usr/lib64 /usr/local/lib /usr/lib /usr/local/dicom/lib ) IF( DCMTK_config_INCLUDE_DIR AND DCMTK_ofstd_INCLUDE_DIR AND DCMTK_ofstd_LIBRARY AND DCMTK_dcmdata_INCLUDE_DIR AND DCMTK_dcmdata_LIBRARY AND DCMTK_dcmimgle_INCLUDE_DIR AND DCMTK_dcmimgle_LIBRARY ) SET( DCMTK_FOUND "YES" ) SET( DCMTK_INCLUDE_DIRS ${DCMTK_config_INCLUDE_DIR} ${DCMTK_ofstd_INCLUDE_DIR} ${DCMTK_dcmdata_INCLUDE_DIR} ${DCMTK_dcmimgle_INCLUDE_DIR} ) SET( DCMTK_LIBRARIES ${DCMTK_dcmimgle_LIBRARY} ${DCMTK_dcmdata_LIBRARY} ${DCMTK_ofstd_LIBRARY} ${DCMTK_config_LIBRARY} ) IF(DCMTK_imagedb_LIBRARY) SET( DCMTK_LIBRARIES ${DCMTK_LIBRARIES} ${DCMTK_imagedb_LIBRARY} ) ENDIF(DCMTK_imagedb_LIBRARY) IF(DCMTK_dcmnet_LIBRARY) SET( DCMTK_LIBRARIES ${DCMTK_LIBRARIES} ${DCMTK_dcmnet_LIBRARY} ) ENDIF(DCMTK_dcmnet_LIBRARY) IF( WIN32 ) SET( DCMTK_LIBRARIES ${DCMTK_LIBRARIES} netapi32 ) ENDIF( WIN32 ) ENDIF( DCMTK_config_INCLUDE_DIR AND DCMTK_ofstd_INCLUDE_DIR AND DCMTK_ofstd_LIBRARY AND DCMTK_dcmdata_INCLUDE_DIR AND DCMTK_dcmdata_LIBRARY AND DCMTK_dcmimgle_INCLUDE_DIR AND DCMTK_dcmimgle_LIBRARY ) IF( NOT DCMTK_FOUND ) SET( DCMTK_DIR "" CACHE PATH "Root of DCMTK source tree (optional)." ) MARK_AS_ADVANCED( DCMTK_DIR ) ENDIF( NOT DCMTK_FOUND )
# Locate XUL # This module defines # XUL_LIBRARIES # XUL_FOUND, if false, do not try to link to gdal # XUL_INCLUDE_DIR, where to find the headers # # $XUL_DIR is an environment variable that would # correspond to the ./configure --prefix=$XUL_DIR # # Created by Robert Osfield. include(FindPkgConfig) pkg_check_modules(XULRUNNER_XPCOM xulrunner-xpcom) pkg_check_modules(XULRUNNER_JS xulrunner-js) pkg_check_modules(XULRUNNER_NSPR xulrunner-nspr) pkg_check_modules(XULRUNNER_NSS xulrunner-nss) #MESSAGE("BLAH " ${XULRUNNER_DOH_INCLUDE_DIRS}) 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 /usr/local/include /usr/include/xulrunner /usr/include /sw/include/xulrunner # Fink /sw/include # Fink /opt/local/include/xulrunner # DarwinPorts /opt/local/include # DarwinPorts /opt/csw/include/xulrunner # Blastwave /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 /usr/local/include /usr/include/nspr /usr/include /sw/include/nspr # Fink /sw/include # Fink /opt/local/include/nspr # DarwinPorts /opt/local/include # DarwinPorts /opt/csw/include/nspr # Blastwave /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 /usr/local/include /usr/include/mozjs /usr/include /sw/include/mozjs # Fink /sw/include # Fink /opt/local/include/mozjs # DarwinPorts /opt/local/include # DarwinPorts /opt/csw/include/mozjs # Blastwave /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 ) 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 /usr/local/lib /usr/lib/xulrunner /usr/lib /sw/lib/xulrunner /sw/lib /opt/local/lib/xulrunner /opt/local/lib /opt/csw/lib/xulrunner /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 ) MACRO(FIND_XUL_LIBRARY MYLIBRARY MYLIBRARYNAME) FIND_LIBRARY(${MYLIBRARY} PATHS ${XULRUNNER_XPCOM_LIBRARY_DIRS} PATHS ${XULRUNNER_JS_LIBRARY_DIRS} PATHS ${XULRUNNER_NSPR_LIBRARY_DIRS} 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 /usr/local/lib /usr/lib/xulrunner /usr/lib /sw/lib/xulrunner /sw/lib /opt/local/lib/xulrunner /opt/local/lib /opt/csw/lib/xulrunner /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 ) ENDMACRO(FIND_XUL_LIBRARY LIBRARY LIBRARYNAME) FIND_XUL_LIBRARY(XUL_LIBRARY xul plds4 plc4 nspr4) FIND_XUL_LIBRARY(XUL_MOZJS_LIBRARY mozjs) FIND_XUL_LIBRARY(XUL_XPCOM_LIBRARY xpcom) FIND_XUL_LIBRARY(XUL_PLUGIN_LIBRARY plds4) FIND_XUL_LIBRARY(XUL_NSS_LIBRARY nss3) SET(XUL_FOUND "NO") IF(XUL_LIBRARY AND XUL_INCLUDE_DIR) SET(XUL_FOUND "YES") SET(XUL_LIBRARIES ${XUL_LIBRARY} ${XUL_MOZJS_LIBRARY} ${XUL_XPCOM_LIBRARY} ${XUL_PLUGIN_LIBRARY} ${XUL_NSS_LIBRARY}) SET(XUL_INCLUDE_DIRS ${XUL_INCLUDE_DIR} ${NSPR_INCLUDE_DIR} ${MOZJS_INCLUDE_DIR}) ENDIF(XUL_LIBRARY AND XUL_INCLUDE_DIR) # MESSAGE("XUL_INCLUDE_DIR " ${XUL_INCLUDE_DIR}) # MESSAGE("XUL_LIBRARIES " ${XUL_LIBRARIES})
_______________________________________________ osg-users mailing list osg-users@lists.openscenegraph.org http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org