Skip to content

Commit 466a4a1

Browse files
author
timlinux
committed
Tidy up cmake stuff so all .in files now live under cmake_templates
Move more utility scripts into scripts dir git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7097 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 9ffc7a5 commit 466a4a1

File tree

6 files changed

+5
-5
lines changed

6 files changed

+5
-5
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ ENDIF (WIN32)
193193
#############################################################
194194
# create qgsconfig.h
195195

196-
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/qgsconfig.h.in ${CMAKE_BINARY_DIR}/qgsconfig.h)
196+
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/qgsconfig.h.in ${CMAKE_BINARY_DIR}/qgsconfig.h)
197197
INSTALL(FILES ${CMAKE_BINARY_DIR}/qgsconfig.h DESTINATION ${QGIS_INCLUDE_DIR})
198198

199199
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
@@ -208,7 +208,7 @@ IF (NOT SVN_MARKER)
208208
ENDIF (NOT SVN_MARKER)
209209
# Add a custom command to drive the svn script whenever the svn entries
210210
# file changes.
211-
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/svnscript.cmake.in_cmake
211+
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake_templates/svnscript.cmake.in_cmake
212212
${CMAKE_CURRENT_BINARY_DIR}/svnscript.cmake
213213
@ONLY)
214214

@@ -247,7 +247,7 @@ INSTALL (FILES qgis.man
247247
#############################################################
248248
# Uninstall stuff see: http://www.vtk.org/Wiki/CMake_FAQ
249249
CONFIGURE_FILE(
250-
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
250+
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_templates/cmake_uninstall.cmake.in"
251251
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
252252
IMMEDIATE @ONLY)
253253

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ ELSE (SVNVERSION)
1313
ENDIF (SVNVERSION)
1414

1515
# Configure the qgssvnversion.h
16-
CONFIGURE_FILE(@CMAKE_CURRENT_SOURCE_DIR@/qgssvnversion.h.in_cmake
17-
@CMAKE_CURRENT_BINARY_DIR@/qgssvnversion.h)
16+
CONFIGURE_FILE(@CMAKE_CURRENT_SOURCE_DIR@/cmake_templates/qgssvnversion.h.in_cmake
17+
@CMAKE_CURRENT_BINARY_DIR@/qgssvnversion.h)

0 commit comments

Comments
 (0)