rollback r15636, partly r15792 and r15795

git-svn-id: http://svn.osgeo.org/qgis/trunk@15823 c8812cc2-4d05-0410-92ff-de0c093fc19c

doc/msvc.t2t

@@ -117,8 +117,8 @@ created.
 Adjust the path to bison and flex so that the shortened ``C:/Progra~1`` is used 
 rather than ``C:/Program Files``.
 
-Untick the 'BINDINGS_GLOBAL_INSTALL' option so that python bindings are placed 
-into the output directory when you run the INSTALL target.
+Verify that the 'BINDINGS_GLOBAL_INSTALL' option is not checked, so that python
+bindings are placed into the output directory when you run the INSTALL target.
 
 Hit ``Configure`` to start the configuration and select ``Visual Studio 9 2008``
 and keep ``native compilers`` and click ``Finish``.

ms-windows/osgeo4w/package-nightly.cmd

@@ -91,7 +91,6 @@ cmake -G "Visual Studio 9 2008" ^
 	-D WITH_SPATIALITE=TRUE ^
 	-D WITH_MAPSERVER=TRUE ^
 	-D WITH_INTERNAL_SPATIALITE=TRUE ^
-	-D BINDINGS_GLOBAL_INSTALL=FALSE ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
 	-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
 	-D GEOS_LIBRARY=%OSGEO4W_ROOT%/lib/geos_c_i.lib ^

ms-windows/osgeo4w/package.cmd

@@ -91,7 +91,6 @@ cmake -G "Visual Studio 9 2008" ^
 	-D WITH_SPATIALITE=TRUE ^
 	-D WITH_MAPSERVER=TRUE ^
 	-D WITH_INTERNAL_SPATIALITE=TRUE ^
-	-D BINDINGS_GLOBAL_INSTALL=FALSE ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
 	-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
 	-D GEOS_LIBRARY=%OSGEO4W_ROOT%/lib/geos_c_i.lib ^

src/astyle/CMakeLists.txt

@@ -1,4 +1,3 @@
 SET(ASTYLE_SRCS astyle_main.cpp ASBeautifier.cpp ASFormatter.cpp ASEnhancer.cpp ASResource.cpp)
 ADD_EXECUTABLE(astyle ${ASTYLE_SRCS})
-#SET_TARGET_PROPERTIES(astyle PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/scripts)
-INSTALL(TARGETS astyle DESTINATION ${CMAKE_SOURCE_DIR}/scripts)
+SET_TARGET_PROPERTIES(astyle PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/scripts)