You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by pe...@apache.org on 2017/08/03 18:09:24 UTC
svn commit: r1804029 - /tcl/rivet/branches/cmake/cmake/CMakeLists.txt
Author: petasis
Date: Thu Aug 3 18:09:24 2017
New Revision: 1804029
URL: http://svn.apache.org/viewvc?rev=1804029&view=rev
Log:
CMake: More checks for rivet_config.h
Modified:
tcl/rivet/branches/cmake/cmake/CMakeLists.txt
Modified: tcl/rivet/branches/cmake/cmake/CMakeLists.txt
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/cmake/cmake/CMakeLists.txt?rev=1804029&r1=1804028&r2=1804029&view=diff
==============================================================================
--- tcl/rivet/branches/cmake/cmake/CMakeLists.txt (original)
+++ tcl/rivet/branches/cmake/cmake/CMakeLists.txt Thu Aug 3 18:09:24 2017
@@ -124,18 +124,15 @@ add_library(rivet::lazy_mpm ALIAS r
# Definitions...
# ===========================================================================
-target_compile_definitions (rivetparser PRIVATE
- TCL_THREADS=1 HAVE_CONFIG_H=1 USE_TCL_STUBS=1 )
-target_compile_definitions (rivetlib PRIVATE
- TCL_THREADS=1 HAVE_CONFIG_H=1 USE_TCL_STUBS=1 )
-target_compile_definitions (rivet_worker_mpm PRIVATE
- TCL_THREADS=1 HAVE_CONFIG_H=1 )
-target_compile_definitions (rivet_prefork_mpm PRIVATE
- TCL_THREADS=1 HAVE_CONFIG_H=1 )
-target_compile_definitions (rivet_lazy_mpm PRIVATE
- TCL_THREADS=1 HAVE_CONFIG_H=1 )
-target_compile_definitions (mod_rivet PRIVATE
- TCL_THREADS=1 HAVE_CONFIG_H=1 )
+target_compile_definitions (rivetparser PRIVATE
+ HAVE_CONFIG_H=1 USE_TCL_STUBS=1 START_TAG="<?" END_TAG="?>" )
+target_compile_definitions (rivetlib PRIVATE
+ HAVE_CONFIG_H=1 USE_TCL_STUBS=1 START_TAG="<?" END_TAG="?>" )
+target_compile_definitions (rivet_worker_mpm PRIVATE HAVE_CONFIG_H=1 )
+target_compile_definitions (rivet_prefork_mpm PRIVATE HAVE_CONFIG_H=1 )
+target_compile_definitions (rivet_lazy_mpm PRIVATE HAVE_CONFIG_H=1 )
+target_compile_definitions (mod_rivet PRIVATE
+ HAVE_CONFIG_H=1 START_TAG="<?" END_TAG="?>" )
# ===========================================================================
# Locate needed packages...
@@ -278,6 +275,26 @@ if(TCL_THREADS)
endif(NOT WIN32)
endif(TCL_THREADS)
+# Definitions...
+# ===========================================================================
+if(_REENTRANT)
+ target_compile_definitions(rivetparser PRIVATE _REENTRANT=1)
+ target_compile_definitions(rivetlib PRIVATE _REENTRANT=1)
+ target_compile_definitions(rivet_worker_mpm PRIVATE _REENTRANT=1)
+ target_compile_definitions(rivet_prefork_mpm PRIVATE _REENTRANT=1)
+ target_compile_definitions(rivet_lazy_mpm PRIVATE _REENTRANT=1)
+ target_compile_definitions(mod_rivet PRIVATE _REENTRANT=1)
+endif(_REENTRANT)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ target_compile_definitions(rivetparser PRIVATE LINUX=1)
+ target_compile_definitions(rivetlib PRIVATE LINUX=1)
+ target_compile_definitions(rivet_worker_mpm PRIVATE LINUX=1)
+ target_compile_definitions(rivet_prefork_mpm PRIVATE LINUX=1)
+ target_compile_definitions(rivet_lazy_mpm PRIVATE LINUX=1)
+ target_compile_definitions(mod_rivet PRIVATE LINUX=1)
+endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+
# Set variables for generating config files...
# ===========================================================================
set(RIVET_AC_APPLE_UNIVERSAL_BUILD ${AC_APPLE_UNIVERSAL_BUILD})
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org