diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-19 10:39:56 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:31 +0200 |
| commit | 70f834827b141daa24cf2149d3792ebaa6b7c0eb (patch) | |
| tree | fc906bec7e74d91198f23599b7e0ae9dd7b11694 /sal | |
| parent | 5e300e9030d8d0730223b1eea1627953524cb58c (diff) | |
sal: rename "cppunit/cppunittester" executable
... and put it in OOO layer since it's used by the smoketest instset.
It was in subdirectory for hysteric reasons, to pick up libraries from
module local output directories in the dmake build system.
Change-Id: I73b66672b17ede52c03071eb2ddee1a23c059ea9
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/Executable_cppunittester.mk | 10 | ||||
| -rw-r--r-- | sal/qa/cppunit_local.mk | 18 |
2 files changed, 5 insertions, 23 deletions
diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk index e29ab2fe7dae..7d26ac6a5d70 100644 --- a/sal/Executable_cppunittester.mk +++ b/sal/Executable_cppunittester.mk @@ -8,24 +8,24 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Executable_Executable,cppunit/cppunittester)) +$(eval $(call gb_Executable_Executable,cppunittester)) -$(eval $(call gb_Executable_set_include,cppunit/cppunittester,\ +$(eval $(call gb_Executable_set_include,cppunittester,\ $$(INCLUDE) \ -I$(SRCDIR)/sal/inc \ )) -$(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\ +$(eval $(call gb_Executable_use_libraries,cppunittester,\ sal \ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_use_externals,cppunit/cppunittester,\ +$(eval $(call gb_Executable_use_externals,cppunittester,\ boost_headers \ cppunit \ )) -$(eval $(call gb_Executable_add_exception_objects,cppunit/cppunittester,\ +$(eval $(call gb_Executable_add_exception_objects,cppunittester,\ sal/cppunittester/cppunittester \ )) diff --git a/sal/qa/cppunit_local.mk b/sal/qa/cppunit_local.mk deleted file mode 100644 index 5fb3c52aac8d..000000000000 --- a/sal/qa/cppunit_local.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -# cppunittester is built in this module; cannot use delivered version -# this should be kept in sync with the definition in solenv/inc/settings.mk -.IF "$(CROSS_COMPILING)"=="YES" -CPPUNITTESTER=\# -.ELSE -CPPUNITTESTER = $(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(BIN)/cppunittester -.ENDIF - -.INCLUDE : _cppunit.mk |