lib64-suffix-0.9.0.patch

Patch to 0.9.0 for using LIB_SUFFIX to install/use different libdir - silfreed-silfreed-net -, 2007-09-27 11:35 AM

Download (3.45 KB)

View differences:

qgis-0.9.0/CMakeLists.txt 2007-09-27 13:04:41.000000000 -0400
158 158 
  # common for MAC and UNIX
159 159 
  SET (QGIS_BIN_DIR    ${CMAKE_INSTALL_PREFIX}/bin)
160 160 
  SET (QGIS_DATA_DIR   ${CMAKE_INSTALL_PREFIX}/share/qgis)
161 
  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/qgis)
161 
  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qgis)
162 162 
  SET(QGIS_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/qgis")
163 163 
  SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
164 164 

  		




  165
  165
  
    

  		




  166
  166
  
    
  IF (UNIX AND NOT APPLE)


  		




  
  167
  
    
    ADD_DEFINITIONS(-DLIB_SUFFIX=\\"${LIB_SUFFIX}\\")


  		




  167
  168
  
    
    ADD_DEFINITIONS(-DPREFIX=\\"${CMAKE_INSTALL_PREFIX}\\")


  		




  168
  169
  
    
    ADD_DEFINITIONS(-DPLUGINPATH=\\"${QGIS_PLUGIN_DIR}\\")


  		




  169
  170
  
    
    ADD_DEFINITIONS(-DPKGDATAPATH=\\"${QGIS_DATA_DIR}\\")


  		












  

    
      qgis-0.9.0/src/app/CMakeLists.txt	2007-09-27 12:31:03.000000000 -0400
    
  





  225
  225
  
    
)


  		




  226
  226
  
    

  		




  227
  227
  
    
SET_TARGET_PROPERTIES(qgis PROPERTIES


  		




  228
  
  
    
  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib


  		




  
  228
  
    
  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}


  		




  229
  229
  
    
  INSTALL_RPATH_USE_LINK_PATH true


  		




  230
  230
  
    
)


  		




  231
  231
  
    

  		












  

    
      qgis-0.9.0/src/core/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
    
  





  167
  167
  
    

  		




  168
  168
  
    
INSTALL(TARGETS qgis_core


  		




  169
  169
  
    
  RUNTIME DESTINATION ${QGIS_BIN_DIR}


  		




  170
  
  
    
  LIBRARY DESTINATION lib)


  		




  
  170
  
    
  LIBRARY DESTINATION lib${LIB_SUFFIX})


  		




  171
  171
  
    

  		




  172
  172
  
    

  		




  173
  173
  
    
# Added by Tim to install headers


  		












  

    
      qgis-0.9.0/src/core/qgsapplication.cpp	2007-09-27 10:35:06.000000000 -0400
    
  





  29
  29
  
    
#include <netinet/in.h>

  		




  30
  30
  
    
#endif

  		




  31
  31
  
    

  		




  
  32
  
    
#ifndef LIB_SUFFIX

  		




  
  33
  
    
#define LIB_SUFFIX ""

  		




  
  34
  
    
#endif

  		




  
  35
  
    

  		




  32
  36
  
    
QString QgsApplication::mPrefixPath;

  		




  33
  37
  
    
QString QgsApplication::mPluginPath;

  		




  34
  38
  
    
QString QgsApplication::mPkgDataPath;

  		




  ......




  69
  73
  
    
	setPluginPath(mPrefixPath + QString("/plugins"));

  		




  70
  74
  
    
	setPkgDataPath(mPrefixPath);

  		




  71
  75
  
    
#else

  		




  72
  
  
    
    setPluginPath(mPrefixPath + QString("/lib/qgis"));

  		




  
  76
  
    
    setPluginPath(mPrefixPath + QString("/lib") + LIB_SUFFIX + QString("/qgis"));

  		




  73
  77
  
    
    setPkgDataPath(mPrefixPath + QString("/share/qgis"));

  		




  74
  78
  
    
#endif

  		




  75
  79
  
    
  }

  		












  

    
      qgis-0.9.0/src/gui/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
    
  





  79
  79
  
    

  		




  80
  80
  
    
INSTALL(TARGETS qgis_gui


  		




  81
  81
  
    
  RUNTIME DESTINATION ${QGIS_BIN_DIR}


  		




  82
  
  
    
  LIBRARY DESTINATION lib)


  		




  
  82
  
    
  LIBRARY DESTINATION lib${LIB_SUFFIX})


  		




  83
  83
  
    

  		




  84
  84
  
    
# for installing headers


  		




  85
  85
  
    

  		












  

    
      qgis-0.9.0/src/providers/grass/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
    
  





  49
  49
  
    

  		




  50
  50
  
    
INSTALL(TARGETS qgisgrass

  		




  51
  51
  
    
  RUNTIME DESTINATION ${QGIS_BIN_DIR}

  		




  52
  
  
    
  LIBRARY DESTINATION lib)

  		




  
  52
  
    
  LIBRARY DESTINATION lib${LIB_SUFFIX})

  		




  53
  53
  
    
       

  		




  54
  54
  
    
INSTALL(TARGETS grassprovider

  		




  55
  55
  
    
  RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}