Skip to content

Commit f902722

Browse files
author
wonder
committed
CMake changes:
- generate qgsconfig.h and qgssvnversion.h to binary dir, not source dir - removed QGIS_NO_SVNVERSION git-svn-id: http://svn.osgeo.org/qgis/trunk@6467 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 9f07002 commit f902722

File tree

3 files changed

+12
-22
lines changed

3 files changed

+12
-22
lines changed

CMakeLists.txt

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -167,40 +167,29 @@ ENDIF (WIN32)
167167
#############################################################
168168
# create qgsconfig.h
169169

170-
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/qgsconfig.h.in ${CMAKE_SOURCE_DIR}/qgsconfig.h)
170+
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/qgsconfig.h.in ${CMAKE_BINARY_DIR}/qgsconfig.h)
171171

172-
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
172+
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
173173

174174
#############################################################
175175
# create qgssvnversion.h
176176

177-
# this is useful variable for developers
178-
SET (QGIS_NO_SVNVERSION FALSE CACHE BOOL "Set to true if you don't want qgssvnversion.h to be regenerated every make")
179-
180-
IF (QGIS_NO_SVNVERSION)
181-
182-
ADD_CUSTOM_TARGET(svnversion
183-
echo '\#define QGSSVNVERSION \"\"' > qgssvnversion.h
184-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
177+
IF (WIN32)
178+
179+
# TODO: create qgssvnversion.h properly
180+
ADD_CUSTOM_TARGET(svnversion echo "#define QGSSVNVERSION \"svn\"" > qgssvnversion.h
181+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
185182

186-
ELSE (QGIS_NO_SVNVERSION)
183+
ELSE (WIN32)
187184

188-
IF (WIN32)
189-
# TODO: create qgssvnversion.h properly
190-
ADD_CUSTOM_TARGET(svnversion echo "#define QGSSVNVERSION \"svn\"" > qgssvnversion.h
191-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
192-
ELSE (WIN32)
193-
ADD_CUSTOM_TARGET(svnversion ALL
185+
ADD_CUSTOM_TARGET(svnversion ALL
194186
QGSSVNDEF='\#define QGSSVNVERSION \"'`svnversion .`'\"' &&
195187
if [ \"`grep QGSSVNVERSION qgssvnversion.h 2>/dev/null`\" != \"$$QGSSVNDEF\" ]; then
196188
echo $$QGSSVNDEF > qgssvnversion.h \; fi
197-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
198-
)
189+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
199190
200191
ENDIF (WIN32)
201192
202-
ENDIF (QGIS_NO_SVNVERSION)
203-
204193
#############################################################
205194
# process subdirs
206195

tools/mapserver_export/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ QT4_WRAP_CPP (MSEXPORT_MOC_SRCS ${MSEXPORT_MOC_HDRS} ${MSEXPORT_UIS_H})
2323
INCLUDE_DIRECTORIES (
2424
${CMAKE_CURRENT_BINARY_DIR}
2525
${PYTHON_INCLUDE_PATH}
26+
${CMAKE_SOURCE_DIR}/src/core
2627
)
2728

2829
ADD_EXECUTABLE (msexport MACOSX_BUNDLE ${MSEXPORT_SRCS} ${MSEXPORT_MOC_SRCS})

tools/mapserver_export/ms_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <QStringList>
55

66
#include "qgsmapserverexport.h"
7-
#include "src/core/qgsapplication.h"
7+
#include "qgsapplication.h"
88

99
#include <iostream>
1010

0 commit comments

Comments
 (0)