Permalink
Browse files

Fixed some conflicts against master.

  • Loading branch information...
sdlime committed Jan 28, 2018
1 parent e948ee5 commit 9ac714b532dd8f5d1966baf001c31206db0c9d9e
Showing with 55 additions and 143 deletions.
  1. +0 −4 .travis.yml
  2. +55 −134 CMakeLists.txt
  3. +0 −5 mapwms.c
@@ -56,11 +56,7 @@ before_install:
- sudo apt-get remove postgis libpq5 libpq-dev postgresql-9.1-postgis postgresql-9.1-postgis-2.2-scripts postgresql-9.2-postgis postgresql-9.3-postgis postgresql-9.1 postgresql-9.2 postgresql-9.3
- sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
- sudo apt-get update
<<<<<<< HEAD
- sudo apt-get install protobuf-c-compiler libprotobuf-c0-dev bison flex python-lxml libfribidi-dev swig cmake librsvg2-dev colordiff postgis postgresql-9.1 postgresql-9.1-postgis-2.1 postgresql-9.1-postgis-2.1-scripts libpq-dev libpng12-dev libjpeg-dev libgif-dev libgeos-dev libgd2-xpm-dev libfreetype6-dev libfcgi-dev libcurl4-gnutls-dev libcairo2-dev libgdal1-dev libproj-dev libxml2-dev python-dev php5-dev libexempi-dev lcov lftp
=======
- sudo apt-get install bison flex python-lxml libfribidi-dev swig cmake librsvg2-dev colordiff postgis postgresql-9.1 postgresql-9.1-postgis-2.1 postgresql-9.1-postgis-2.1-scripts libpq-dev libpng12-dev libjpeg-dev libgif-dev libgeos-dev libgd2-xpm-dev libfreetype6-dev libfcgi-dev libcurl4-gnutls-dev libcairo2-dev libgdal1-dev libproj-dev libxml2-dev python-dev php5-dev libexempi-dev lcov lftp libgdal-dev libgdal1h
>>>>>>> master
- sudo pip install git+git://github.com/tbonfort/cpp-coveralls.git@extensions
- cd msautotest
- ./create_postgis_test_data.sh
@@ -153,7 +153,7 @@ option(WITH_MSSQL2008 "include mssql 2008 database input support as plugin" OFF)
option(WITH_EXEMPI "include xmp output metadata support" OFF)
option(WITH_XMLMAPFILE "include native xml mapfile support (requires libxslt/libexslt)" OFF)
option(WITH_V8 "include javacript v8 scripting" OFF)
option(WITH_PIXMAN "use (experimental) support for pixman for layer compositing operations" OFF)
option(WITH_PIXMAN "use pixman for layer compositing operations" OFF)
option(BUILD_STATIC "Also build a static version of mapserver" OFF)
option(LINK_STATIC_LIBMAPSERVER "Link to static version of libmapserver (also for mapscripts)" OFF)
@@ -166,8 +166,8 @@ option(WITH_GENERIC_NINT "generic rounding" OFF)
# Add compiler flags for warnings
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror=format-security -Wdeclaration-after-statement")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror=format-security")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wdeclaration-after-statement")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
endif()
if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
@@ -262,12 +262,8 @@ mapogcfiltercommon.c maprendering.c mapwcs20.c mapogcsld.c mapmetadata.c
mapresample.c mapwfs.c mapgdal.c mapogcsos.c mapscale.c mapwfs11.c mapwfs20.c
mapgeomtransform.c mapogroutput.c mapwfslayer.c mapagg.cpp mapkml.cpp
mapgeomutil.cpp mapkmlrenderer.cpp fontcache.c textlayout.c maputfgrid.cpp
<<<<<<< HEAD
mapogr.cpp mapcontour.c mapsmoothing.c mapv8.cpp ${REGEX_SOURCES} kerneldensity.c mapmvt.c)
=======
mapogr.cpp mapcontour.c mapsmoothing.c mapv8.cpp ${REGEX_SOURCES} kerneldensity.c
mapcompositingfilter.c)
>>>>>>> master
mapogr.cpp mapcontour.c mapsmoothing.c mapv8.cpp ${REGEX_SOURCES} kerneldensity.c
mapcompositingfilter.c mapmvt.c)
set(mapserver_HEADERS
cgiutil.h dejavu-sans-condensed.h dxfcolor.h fontcache.h hittest.h mapagg.h
@@ -278,68 +274,6 @@ mappostgis.h mapprimitive.h mapproject.h mapraster.h mapregex.h mapresample.h
mapserver-api.h mapserver.h mapserv.h mapshape.h mapsymbol.h maptemplate.h
mapthread.h maptile.h maptime.h maptree.h maputfgrid.h mapwcs.h uthash.h)
<<<<<<< HEAD
=======
if(WIN32)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/version.rc.in
${CMAKE_CURRENT_BINARY_DIR}/version.rc
@ONLY)
set(mapserver_SOURCES ${mapserver_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
endif(WIN32)
if(BUILD_DYNAMIC)
add_library(mapserver SHARED ${mapserver_SOURCES} ${agg_SOURCES} ${v8_SOURCES})
set_target_properties( mapserver PROPERTIES
VERSION ${MapServer_VERSION_STRING}
SOVERSION 2
)
endif(BUILD_DYNAMIC)
if(BUILD_STATIC)
add_library(mapserver_static STATIC ${mapserver_SOURCES} ${agg_SOURCES} ${v8_SOURCES})
set_target_properties( mapserver_static PROPERTIES
VERSION ${MapServer_VERSION_STRING}
SOVERSION 2
)
endif(BUILD_STATIC)
#SOVERSION is not necessarily the same as the
#major version. The rule is that any breakage of the ABI must be
#indicated by incrementing the SOVERSION. So, adding e.g. functions is no
#problem, modifying argument lists or removing functions would required
#the SOVERSION to be incremented. Similar rules hold of course for
#non-opaque data-structures.
add_executable(mapserv mapserv.c)
target_link_libraries(mapserv ${MAPSERVER_LIBMAPSERVER})
add_executable(shp2img shp2img.c)
target_link_libraries(shp2img ${MAPSERVER_LIBMAPSERVER})
add_executable(shptree shptree.c)
target_link_libraries(shptree ${MAPSERVER_LIBMAPSERVER})
add_executable(shptreevis shptreevis.c)
target_link_libraries(shptreevis ${MAPSERVER_LIBMAPSERVER})
add_executable(sortshp sortshp.c)
target_link_libraries(sortshp ${MAPSERVER_LIBMAPSERVER})
add_executable(legend legend.c)
target_link_libraries(legend ${MAPSERVER_LIBMAPSERVER})
add_executable(scalebar scalebar.c)
target_link_libraries(scalebar ${MAPSERVER_LIBMAPSERVER})
add_executable(msencrypt msencrypt.c)
target_link_libraries(msencrypt ${MAPSERVER_LIBMAPSERVER})
add_executable(tile4ms tile4ms.c)
target_link_libraries(tile4ms ${MAPSERVER_LIBMAPSERVER})
add_executable(shptreetst shptreetst.c)
target_link_libraries(shptreetst ${MAPSERVER_LIBMAPSERVER})
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(USE_EXTENDED_DEBUG 1)
endif (CMAKE_BUILD_TYPE STREQUAL "Debug")
>>>>>>> master
find_package(PNG)
if(PNG_FOUND)
list(APPEND ALL_INCLUDE_DIRS ${PNG_INCLUDE_DIR})
@@ -362,7 +296,6 @@ if(NOT FREETYPE_FOUND)
endif(NOT FREETYPE_FOUND)
list(APPEND ALL_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR})
if(WITH_PROJ)
find_package(Proj)
if(NOT PROJ_FOUND)
@@ -443,7 +376,6 @@ if( USE_FRIBIDI AND NOT(USE_HARFBUZZ) )
report_dependency_error(FRIBIDI HARFBUZZ)
endif( USE_FRIBIDI AND NOT(USE_HARFBUZZ) )
if(WITH_ICONV)
find_package(ICONV)
if(ICONV_FOUND)
@@ -458,7 +390,6 @@ if(WITH_GENERIC_NINT)
set(USE_GENERIC_MS_NINT 1)
endif(WITH_GENERIC_NINT)
if(WITH_CAIRO)
find_package(Cairo)
if(CAIRO_FOUND)
@@ -944,7 +875,6 @@ if(USE_FASTCGI)
target_link_libraries(mapserv ${FCGI_LIBRARY})
endif()
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(USE_EXTENDED_DEBUG 1)
endif (CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -959,13 +889,11 @@ if(WITH_PYTHON)
set(USE_PYTHON_MAPSCRIPT 1)
endif(WITH_PYTHON)
if(WITH_APACHE_MODULE)
add_subdirectory("apache")
set(USE_APACHE_MODULE 1)
endif(WITH_APACHE_MODULE)
if(WITH_PERL)
add_subdirectory("mapscript/perl")
set(USE_PERL_MAPSCRIPT 1)
@@ -991,7 +919,7 @@ ms_link_libraries( ${CMAKE_DL_LIBS} m )
endif(UNIX)
if (WIN32)
ms_link_libraries( ${MS_EXTERNAL_LIBS} ws2_32.lib)
ms_link_libraries( ${MS_EXTERNAL_LIBS})
endif (WIN32)
configure_file (
@@ -1004,11 +932,9 @@ configure_file (
"${PROJECT_BINARY_DIR}/mapserver-version.h"
)
if(BUILD_DYNAMIC)
set_target_properties(mapserver PROPERTIES
PUBLIC_HEADER "${mapserver_HEADERS};${PROJECT_BINARY_DIR}/mapserver-config.h;${PROJECT_BINARY_DIR}/mapserver-version.h"
)
endif(BUILD_DYNAMIC)
set_target_properties(mapserver PROPERTIES
PUBLIC_HEADER "${mapserver_HEADERS};${PROJECT_BINARY_DIR}/mapserver-config.h;${PROJECT_BINARY_DIR}/mapserver-version.h"
)
macro(status_optional_component component enabled libpath)
if("${enabled}" EQUAL "1")
@@ -1089,15 +1015,13 @@ message(STATUS "")
message(STATUS "Will install files to ${CMAKE_INSTALL_PREFIX}")
message(STATUS "Will install libraries to ${INSTALL_LIB_DIR}")
include_directories("${PROJECT_BINARY_DIR}")
if(WIN32)
set(REGEX_MALLOC 1)
set(USE_GENERIC_MS_NINT 1)
endif(WIN32)
#INSTALL(FILES mapserver-api.h ${PROJECT_BINARY_DIR}/mapserver-version.h DESTINATION include)
if(USE_ORACLE_PLUGIN)
INSTALL(TARGETS msplugin_oracle DESTINATION ${INSTALL_LIB_DIR})
@@ -1107,60 +1031,57 @@ if(USE_MSSQL2008)
INSTALL(TARGETS msplugin_mssql2008 DESTINATION ${INSTALL_LIB_DIR})
endif(USE_MSSQL2008)
INSTALL(TARGETS sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv
RUNTIME DESTINATION ${INSTALL_BIN_DIR} COMPONENT bin
)
INSTALL(TARGETS mapserver
EXPORT mapserverTargets
LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR}/mapserver COMPONENT dev
)
if(BUILD_STATIC)
INSTALL(TARGETS mapserver_static
DESTINATION ${INSTALL_LIB_DIR} COMPONENT staticlib
)
INSTALL(TARGETS mapserver_static DESTINATION ${INSTALL_LIB_DIR})
endif(BUILD_STATIC)
if(BUILD_DYNAMIC)
INSTALL(TARGETS mapserver
EXPORT mapserverTargets
ARCHIVE DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR}/mapserver COMPONENT dev
)
# Add all targets to the build-tree export set
export(TARGETS mapserver
FILE "${PROJECT_BINARY_DIR}/mapserverTargets.cmake"
)
# Export the package for use from the build-tree
# (this registers the build-tree with a global CMake-registry)
export(PACKAGE mapserver)
list(APPEND ALL_INCLUDE_DIRS ${INSTALL_INCLUDE_DIR})
list(APPEND ALL_INCLUDE_DIRS ${INSTALL_INCLUDE_DIR}/mapserver)
list(REMOVE_DUPLICATES ALL_INCLUDE_DIRS)
# Create the mapserver-config.cmake and mapserver-config-version files
file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${ALL_INCLUDE_DIRS}")
# ... for the build tree
set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
configure_file(mapserver-config.cmake.in "${PROJECT_BINARY_DIR}/mapserver-config.cmake" @ONLY)
# ... for the install tree
set(CONF_INCLUDE_DIRS "\${MAPSERVER_CMAKE_DIR}/${REL_INCLUDE_DIR}")
configure_file(mapserver-config.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/mapserver-config.cmake" @ONLY)
# ... for both
configure_file(mapserver-config-version.cmake.in "${PROJECT_BINARY_DIR}/mapserver-config-version.cmake" @ONLY)
# Install the mapserver-config.cmake and mapserver-config-version.cmake
install(FILES "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/mapserver-config.cmake"
"${PROJECT_BINARY_DIR}/mapserver-config-version.cmake"
DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev
)
# Install the export set for use with the install-tree
install(EXPORT mapserverTargets
DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev
)
INSTALL(TARGETS mapserver DESTINATION ${INSTALL_LIB_DIR})
endif(BUILD_DYNAMIC)
# Add all targets to the build-tree export set
export(TARGETS mapserver
FILE "${PROJECT_BINARY_DIR}/mapserverTargets.cmake"
)
# Export the package for use from the build-tree
# (this registers the build-tree with a global CMake-registry)
export(PACKAGE mapserver)
list(APPEND ALL_INCLUDE_DIRS ${INSTALL_INCLUDE_DIR})
list(APPEND ALL_INCLUDE_DIRS ${INSTALL_INCLUDE_DIR}/mapserver)
list(REMOVE_DUPLICATES ALL_INCLUDE_DIRS)
# Create the mapserver-config.cmake and mapserver-config-version files
file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${ALL_INCLUDE_DIRS}")
# ... for the build tree
set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
configure_file(mapserver-config.cmake.in "${PROJECT_BINARY_DIR}/mapserver-config.cmake" @ONLY)
# ... for the install tree
set(CONF_INCLUDE_DIRS "\${MAPSERVER_CMAKE_DIR}/${REL_INCLUDE_DIR}")
configure_file(mapserver-config.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/mapserver-config.cmake" @ONLY)
# ... for both
configure_file(mapserver-config-version.cmake.in "${PROJECT_BINARY_DIR}/mapserver-config-version.cmake" @ONLY)
# Install the mapserver-config.cmake and mapserver-config-version.cmake
install(FILES "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/mapserver-config.cmake"
"${PROJECT_BINARY_DIR}/mapserver-config-version.cmake"
DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev
)
# Install the export set for use with the install-tree
install(EXPORT mapserverTargets
DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev
)
@@ -3885,7 +3885,6 @@ int msWMSGetMap(mapObj *map, int nVersion, char **names, char **values, int nume
msDrawLayer(map, GET_LAYER(map, i), img);
}
<<<<<<< HEAD
} else {
/* intercept requests for Mapbox vector tiles */
@@ -3898,10 +3897,6 @@ int msWMSGetMap(mapObj *map, int nVersion, char **names, char **values, int nume
img = msDrawMap(map, MS_FALSE);
}
=======
} else
img = msDrawMap(map, drawquerymap);
>>>>>>> master
if (img == NULL)
return msWMSException(map, nVersion, NULL, wms_exception_format);

0 comments on commit 9ac714b

Please sign in to comment.