Changeset 6352
- Timestamp:
- 03/13/07 13:25:30
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
OpenSceneGraph/trunk/CMakeModules/FindFreeType.cmake
r6306 r6352 35 35 /opt/csw/include 36 36 /opt/include 37 /usr/freeware/include/freetype2 37 38 ) 38 39 … … 47 48 /opt/csw/include/freetype2 48 49 /opt/include/freetype2 50 /usr/freeware/include/freetype2 49 51 ) 50 52 … … 62 64 /opt/csw/lib 63 65 /opt/lib 66 /usr/freeware/lib64 64 67 ) 65 68 OpenSceneGraph/trunk/CMakeModules/FindGIFLIB.cmake
r6306 r6352 26 26 /opt/include 27 27 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include 28 /usr/freeware/include 28 29 ) 29 30 … … 45 46 /opt/lib 46 47 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib 48 /usr/freeware/lib64 47 49 ) 48 50 OpenSceneGraph/trunk/src/osgPlugins/jpeg/CMakeLists.txt
r6320 r6352 3 3 ENDIF(MSVC) 4 4 INCLUDE_DIRECTORIES( ${JPEG_INCLUDE_DIR} ) 5 LINK_DIRECTORIES( ${JPEG_DIR}/lib )5 #LINK_DIRECTORIES( ${JPEG_DIR}/lib ) 6 6 ADD_OSG_PLUGIN(jpeg ${JPEG_LIBRARY}) 7 7 OpenSceneGraph/trunk/src/osgPlugins/tiff/CMakeLists.txt
r6320 r6352 1 1 IF(NOT MINGW) 2 2 INCLUDE_DIRECTORIES( ${TIFF_INCLUDE_DIR} ) 3 LINK_DIRECTORIES( ${TIFF_DIR}/lib )3 #LINK_DIRECTORIES( ${TIFF_DIR}/lib ) 4 4 ADD_OSG_PLUGIN(tiff ${TIFF_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY}) 5 5 IF(MSVC)
