Thanks David, change now merged and submitted to svn/trunk.
On Tue, Dec 14, 2010 at 9:13 PM, David Fries <[email protected]> wrote: > Don't fail silently when GDAL was not found. > Currently there isn't any indication there is a problem and the cmake > output is identical to when GDAL is found, the only indication is make > immediately returning without doing anything. Instead warn and fail > if OSG or GDAL was not found, this also lets make invoke cmake and > give the warning again. > > > > make > /usr/bin/cmake -H/opt/src/VPB/VirtualPlanetBuilder -B/opt/src/VPB/release > --check-build-system CMakeFiles/Makefile.cmake 0 > CMake Error at CMakeLists.txt:324 (message): > GDAL was not found > > -- Configuring incomplete, errors occurred! > make: *** [cmake_check_build_system] Error 1 > --- > CMakeLists.txt | 11 ++++++++--- > 1 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/CMakeLists.txt b/CMakeLists.txt > index f77a497..b32011f 100644 > --- a/CMakeLists.txt > +++ b/CMakeLists.txt > @@ -317,10 +317,15 @@ ENDIF() > INCLUDE(VpbMacroUtils) > > # VPB Core > -IF( OSG_FOUND AND GDAL_FOUND) > - ADD_SUBDIRECTORY(src) > - ADD_SUBDIRECTORY(applications) > +IF(NOT OSG_FOUND) > + message(FATAL_ERROR "OSG was not found") > ENDIF() > +IF(NOT GDAL_FOUND) > + message(FATAL_ERROR "GDAL was not found") > +ENDIF() > + > +ADD_SUBDIRECTORY(src) > +ADD_SUBDIRECTORY(applications) > > > # Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4 > -- > 1.7.1 > > > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > > _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
