qgis_1.6.0_cmake.patch

Patch to add FORCE to SET commands for libraries if those libraries are currently NOTFOUND - sharpie -, 2010-12-30 03:11 PM

Download (1.23 KB)

View differences:

cmake/FindGDAL.cmake
135 135 
        ENDIF (GDAL_LIB_NAME_WITH_PREFIX)
136 136 

  		




  137
  137
  
    
        IF (APPLE)

  		




  138
  
  
    
          SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL)

  		




  
  138
  
    
          SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib

  		




  
  139
  
    
            CACHE FILEPATH "Path to GDAL library." FORCE)

  		




  139
  140
  
    
        ELSE (APPLE)

  		




  140
  141
  
    
          SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)

  		




  141
  142
  
    
        ENDIF (APPLE)

  		












  

    
      cmake/FindGEOS.cmake
    
  





  132
  132
  
    
        #MESSAGE("DBG  GEOS_LIB_NAME=${GEOS_LIB_NAME}")

  		




  133
  133
  
    

  		




  134
  134
  
    
        IF (APPLE)

  		




  135
  
  
    
          SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL)

  		




  
  135
  
    
          SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib

  		




  
  136
  
    
            CACHE FILEPATH "Path to GEOS library." FORCE)

  		




  136
  137
  
    
        ELSE (APPLE)

  		




  137
  138
  
    
          SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.so CACHE STRING INTERNAL)

  		




  138
  139
  
    
        ENDIF (APPLE)