axis-c-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billblo...@apache.org
Subject svn commit: r1830482 - in /axis/axis2/c/core/trunk/neethi: Makefile.am configure.ac
Date Sat, 28 Apr 2018 23:27:28 GMT
Author: billblough
Date: Sat Apr 28 23:27:28 2018
New Revision: 1830482

URL: http://svn.apache.org/viewvc?rev=1830482&view=rev
Log:
Add gtest support to neethi build

Modified:
    axis/axis2/c/core/trunk/neethi/Makefile.am
    axis/axis2/c/core/trunk/neethi/configure.ac

Modified: axis/axis2/c/core/trunk/neethi/Makefile.am
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/neethi/Makefile.am?rev=1830482&r1=1830481&r2=1830482&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/neethi/Makefile.am (original)
+++ axis/axis2/c/core/trunk/neethi/Makefile.am Sat Apr 28 23:27:28 2018
@@ -12,6 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-SUBDIRS = src $(TESTDIR)
+SUBDIRS = src $(GTEST) $(TESTDIR)
 includedir=$(prefix)/include/axis2-${PACKAGE_VERSION}
 include_HEADERS=$(top_builddir)/include/*.h

Modified: axis/axis2/c/core/trunk/neethi/configure.ac
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/neethi/configure.ac?rev=1830482&r1=1830481&r2=1830482&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/neethi/configure.ac (original)
+++ axis/axis2/c/core/trunk/neethi/configure.ac Sat Apr 28 23:27:28 2018
@@ -27,6 +27,7 @@ AC_PREFIX_DEFAULT(/usr/local/neethi)
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
+AC_PROG_CXX
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -129,6 +130,25 @@ AC_ARG_ENABLE(coverage, [  --enable-cove
   CPPFLAGS="$CPPFLAGS"]
 )
 
+AC_MSG_CHECKING(whether to use the Google test framework)
+AC_ARG_WITH(gtest,
+            [  --with-gtest[=PATH]      Find the gtest source files in 'PATH'.],
+[ case "$withval" in
+  no)
+    AC_MSG_RESULT(no)
+    USE_GTEST=""
+    GTEST_DIR=""
+    GTEST=""
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+    GTEST_DIR="$withval"
+    GTEST="gtest"
+    CXXFLAGS="$CXXFLAGS -g -Wall -Wextra -pthread"
+    ;;
+  esac ],
+  AC_MSG_RESULT(no)
+)
 
 AC_MSG_CHECKING(whether to build tests)
 AC_ARG_ENABLE(tests, [  --enable-tests    build tests. default=no],
@@ -172,6 +192,8 @@ VERSION_NO="7:0:7"
 
 AC_SUBST(VERSION_NO)
 AC_SUBST(WRAPPER_DIR)
+AC_SUBST(GTEST_DIR)
+AC_SUBST(GTEST)
 AC_SUBST(TESTDIR)
 
 export WRAPPER_DIR
@@ -182,7 +204,8 @@ AC_CONFIG_FILES([Makefile \
     src/secpolicy/model/Makefile \
     src/secpolicy/builder/Makefile \
     src/rmpolicy/Makefile \
+    gtest/Makefile \
     test/Makefile
     ])
-    
+
 AC_OUTPUT



Mime
View raw message