Skip to content

Commit 7e9dc20

Browse files
author
jef
committedApr 26, 2011
rollback r15636, partly r15792 and r15795
git-svn-id: http://svn.osgeo.org/qgis/trunk@15823 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent de04d8f commit 7e9dc20

File tree

5 files changed

+16
-261
lines changed

5 files changed

+16
-261
lines changed
 

‎INSTALL

Lines changed: 13 additions & 255 deletions
Large diffs are not rendered by default.

‎doc/msvc.t2t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ created.
117117
Adjust the path to bison and flex so that the shortened ``C:/Progra~1`` is used
118118
rather than ``C:/Program Files``.
119119

120-
Untick the 'BINDINGS_GLOBAL_INSTALL' option so that python bindings are placed
121-
into the output directory when you run the INSTALL target.
120+
Verify that the 'BINDINGS_GLOBAL_INSTALL' option is not checked, so that python
121+
bindings are placed into the output directory when you run the INSTALL target.
122122

123123
Hit ``Configure`` to start the configuration and select ``Visual Studio 9 2008``
124124
and keep ``native compilers`` and click ``Finish``.

‎ms-windows/osgeo4w/package-nightly.cmd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ cmake -G "Visual Studio 9 2008" ^
9191
-D WITH_SPATIALITE=TRUE ^
9292
-D WITH_MAPSERVER=TRUE ^
9393
-D WITH_INTERNAL_SPATIALITE=TRUE ^
94-
-D BINDINGS_GLOBAL_INSTALL=FALSE ^
9594
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
9695
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
9796
-D GEOS_LIBRARY=%OSGEO4W_ROOT%/lib/geos_c_i.lib ^

‎ms-windows/osgeo4w/package.cmd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ cmake -G "Visual Studio 9 2008" ^
9191
-D WITH_SPATIALITE=TRUE ^
9292
-D WITH_MAPSERVER=TRUE ^
9393
-D WITH_INTERNAL_SPATIALITE=TRUE ^
94-
-D BINDINGS_GLOBAL_INSTALL=FALSE ^
9594
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
9695
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
9796
-D GEOS_LIBRARY=%OSGEO4W_ROOT%/lib/geos_c_i.lib ^

‎src/astyle/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
SET(ASTYLE_SRCS astyle_main.cpp ASBeautifier.cpp ASFormatter.cpp ASEnhancer.cpp ASResource.cpp)
22
ADD_EXECUTABLE(astyle ${ASTYLE_SRCS})
3-
#SET_TARGET_PROPERTIES(astyle PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/scripts)
4-
INSTALL(TARGETS astyle DESTINATION ${CMAKE_SOURCE_DIR}/scripts)
3+
SET_TARGET_PROPERTIES(astyle PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/scripts)

0 commit comments

Comments
 (0)
Please sign in to comment.