diff options
-rw-r--r-- | sccomp/CppunitTest_sccomp_lpsolver.mk | 47 | ||||
-rw-r--r-- | sccomp/CppunitTest_sccomp_solver.mk | 47 | ||||
-rw-r--r-- | sccomp/Module_sccomp.mk | 2 | ||||
-rw-r--r-- | sccomp/qa/unit/solver.cxx (renamed from sccomp/qa/unit/lpsolver.cxx) | 0 |
4 files changed, 48 insertions, 48 deletions
diff --git a/sccomp/CppunitTest_sccomp_lpsolver.mk b/sccomp/CppunitTest_sccomp_lpsolver.mk deleted file mode 100644 index 4b664d15bf18..000000000000 --- a/sccomp/CppunitTest_sccomp_lpsolver.mk +++ /dev/null @@ -1,47 +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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sccomp_lpsolver)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sccomp_lpsolver,\ - sccomp/qa/unit/lpsolver \ -)) - -$(eval $(call gb_CppunitTest_use_externals,sccomp_lpsolver,\ - boost_headers \ -)) - -$(eval $(call gb_CppunitTest_add_defs,sccomp_lpsolver,\ - $(if $(ENABLE_COINMP), -DENABLE_COINMP) \ - $(if $(ENABLE_LPSOLVE), -DENABLE_LPSOLVE) \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sccomp_lpsolver,\ - cppu \ - sal \ - test \ - unotest \ -)) - -$(eval $(call gb_CppunitTest_set_include,sccomp_lpsolver,\ - -I$(SRCDIR)/sc/inc \ - $$(INCLUDE) \ -)) - - -$(eval $(call gb_CppunitTest_use_sdk_api,sccomp_lpsolver)) - -$(eval $(call gb_CppunitTest_use_ure,sccomp_lpsolver)) -$(eval $(call gb_CppunitTest_use_vcl,sccomp_lpsolver)) - -$(eval $(call gb_CppunitTest_use_rdb,sccomp_lpsolver,services)) - -$(eval $(call gb_CppunitTest_use_configuration,sccomp_lpsolver)) - -# vim: set noet sw=4 ts=4: diff --git a/sccomp/CppunitTest_sccomp_solver.mk b/sccomp/CppunitTest_sccomp_solver.mk new file mode 100644 index 000000000000..d634fb7d93fc --- /dev/null +++ b/sccomp/CppunitTest_sccomp_solver.mk @@ -0,0 +1,47 @@ +# -*- 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/. +# + +$(eval $(call gb_CppunitTest_CppunitTest,sccomp_solver)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sccomp_solver,\ + sccomp/qa/unit/solver \ +)) + +$(eval $(call gb_CppunitTest_use_externals,sccomp_solver,\ + boost_headers \ +)) + +$(eval $(call gb_CppunitTest_add_defs,sccomp_solver,\ + $(if $(ENABLE_COINMP), -DENABLE_COINMP) \ + $(if $(ENABLE_LPSOLVE), -DENABLE_LPSOLVE) \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sccomp_solver,\ + cppu \ + sal \ + test \ + unotest \ +)) + +$(eval $(call gb_CppunitTest_set_include,sccomp_solver,\ + -I$(SRCDIR)/sc/inc \ + $$(INCLUDE) \ +)) + + +$(eval $(call gb_CppunitTest_use_sdk_api,sccomp_solver)) + +$(eval $(call gb_CppunitTest_use_ure,sccomp_solver)) +$(eval $(call gb_CppunitTest_use_vcl,sccomp_solver)) + +$(eval $(call gb_CppunitTest_use_rdb,sccomp_solver,services)) + +$(eval $(call gb_CppunitTest_use_configuration,sccomp_solver)) + +# vim: set noet sw=4 ts=4: diff --git a/sccomp/Module_sccomp.mk b/sccomp/Module_sccomp.mk index 9ff09e8d70bd..318e9d69f484 100644 --- a/sccomp/Module_sccomp.mk +++ b/sccomp/Module_sccomp.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Module_add_l10n_targets,sccomp,\ )) $(eval $(call gb_Module_add_check_targets,sccomp,\ - CppunitTest_sccomp_lpsolver \ + CppunitTest_sccomp_solver \ )) # vim: set noet sw=4 ts=4: diff --git a/sccomp/qa/unit/lpsolver.cxx b/sccomp/qa/unit/solver.cxx index 2ecc3282b17f..2ecc3282b17f 100644 --- a/sccomp/qa/unit/lpsolver.cxx +++ b/sccomp/qa/unit/solver.cxx |