Permalink
Browse files

rename cmake WITH_THREADS to WITH_THREAD_SAFETY

  • Loading branch information...
1 parent d231a75 commit 8ca7e157758468a1e057742ac436243c656e8051 @tbonfort tbonfort committed Aug 29, 2013
Showing with 4 additions and 4 deletions.
  1. +3 −3 CMakeLists.txt
  2. +1 −1 Makefile
View
@@ -111,7 +111,7 @@ option(WITH_CURL "Enable Curl HTTP support (required for wms/wfs client, and rem
option(WITH_WFS "Enable WFS Server support (requires PROJ and OGR support)" ON)
option(WITH_WCS "Enable WCS Server support (requires PROJ and GDAL support)" ON)
option(WITH_LIBXML2 "Choose if libxml2 support should be built in (used for sos, wcs 1.1,2.0 and wfs 1.1)" ON)
-option(WITH_THREADS "Choose if a thread-safe version of libmapserver should be built (only recommended for some mapscripts)" OFF)
+option(WITH_THREAD_SAFETY "Choose if a thread-safe version of libmapserver should be built (only recommended for some mapscripts)" OFF)
option(WITH_GIF "Enable GIF support (for PIXMAP loading)" ON)
option(WITH_PYTHON "Enable Python mapscript support" OFF)
option(WITH_PHP "Enable Python mapscript support" OFF)
@@ -665,14 +665,14 @@ if(WITH_KML)
endif(USE_LIBXML2)
endif(WITH_KML)
-if(WITH_THREADS)
+if(WITH_THREAD_SAFETY)
set( CMAKE_THREAD_PREFER_PTHREAD 1 )
find_package(Threads)
if (THREADS_FOUND)
ms_link_libraries( ${CMAKE_THREAD_LIBS_INIT})
set(USE_THREAD 1)
endif (THREADS_FOUND)
-endif(WITH_THREADS)
+endif(WITH_THREAD_SAFETY)
if(WITH_XMLMAPFILE)
if(NOT USE_LIBXML2)
View
@@ -8,7 +8,7 @@ YACC=yacc
CMAKEFLAGS=-DCMAKE_C_FLAGS="--coverage" -DCMAKE_CXX_FLAGS="--coverage" \
-DCMAKE_SHARED_LINKER_FLAGS="-lgcov" -DWITH_GD=1 -DWITH_CLIENT_WMS=1 \
-DWITH_CLIENT_WFS=1 -DWITH_KML=1 -DWITH_SOS=1 -DWITH_PHP=1 \
- -DWITH_PYTHON=1 -DWITH_JAVA=1 -DWITH_THREADS=1 -DWITH_FRIBIDI=0 -DWITH_FCGI=0 -DWITH_EXEMPI=1 \
+ -DWITH_PYTHON=1 -DWITH_JAVA=1 -DWITH_THREAD_SAFETY=1 -DWITH_FRIBIDI=0 -DWITH_FCGI=0 -DWITH_EXEMPI=1 \
-DCMAKE_BUILD_TYPE=Release -DWITH_RSVG=1 -DWITH_CURL=1
all: cmakebuild

0 comments on commit 8ca7e15

Please sign in to comment.