Skip to content
Permalink
Browse files
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
  • Loading branch information
timlinux committed Jul 25, 2007
1 parent 9ffc7a5 commit 466a4a15a5c367edc5591aadf603072bf062ad63
@@ -193,7 +193,7 @@ ENDIF (WIN32)
#############################################################
# create qgsconfig.h

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/qgsconfig.h.in ${CMAKE_BINARY_DIR}/qgsconfig.h)
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/qgsconfig.h.in ${CMAKE_BINARY_DIR}/qgsconfig.h)
INSTALL(FILES ${CMAKE_BINARY_DIR}/qgsconfig.h DESTINATION ${QGIS_INCLUDE_DIR})

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

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

File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -13,5 +13,5 @@ ELSE (SVNVERSION)
ENDIF (SVNVERSION)

# Configure the qgssvnversion.h
CONFIGURE_FILE(@CMAKE_CURRENT_SOURCE_DIR@/qgssvnversion.h.in_cmake
@CMAKE_CURRENT_BINARY_DIR@/qgssvnversion.h)
CONFIGURE_FILE(@CMAKE_CURRENT_SOURCE_DIR@/cmake_templates/qgssvnversion.h.in_cmake
@CMAKE_CURRENT_BINARY_DIR@/qgssvnversion.h)
File renamed without changes.

0 comments on commit 466a4a1

Please sign in to comment.