diff options
| author | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2019-06-26 11:51:46 +0000 |
|---|---|---|
| committer | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2019-06-26 12:06:17 +0000 |
| commit | d07578b50acf524c668998443001805800c23580 (patch) | |
| tree | 7cc5b3518bda04fee4f8eda493ab97ff32296fd5 | |
| parent | 4b3b9f5d2dc616d69e0dbba999595ffc558251a9 (diff) | |
Remove CppUnit dependency from Vespa spec
| -rw-r--r-- | build_settings.cmake | 2 | ||||
| -rw-r--r-- | dist/vespa.spec | 1 | ||||
| -rw-r--r-- | vespabase/desc.vespa_base_dev | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index 59c5a66fcd3..7d8ba11f8a1 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -117,6 +117,6 @@ else() set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined") -# Enable cppunit tests in shared libraries +# Enable GTest unit tests in shared libraries set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed") endif() diff --git a/dist/vespa.spec b/dist/vespa.spec index 99b24c2ff8e..3426eff459d 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -70,7 +70,6 @@ BuildRequires: java-11-openjdk-devel BuildRequires: openssl-devel BuildRequires: rpm-build BuildRequires: make -BuildRequires: vespa-cppunit-devel >= 1.12.1-6 BuildRequires: systemd BuildRequires: flex >= 2.5.0 BuildRequires: bison >= 3.0.0 diff --git a/vespabase/desc.vespa_base_dev b/vespabase/desc.vespa_base_dev index de19051806b..1f05be94257 100644 --- a/vespabase/desc.vespa_base_dev +++ b/vespabase/desc.vespa_base_dev @@ -33,5 +33,3 @@ Development tools and 3rd party libraries: * vespa_boost_dev: Boost headers, prepared for use with the Vespa compiler. - * vespa_cppunit_dev: Headers and libraries prepared with the - Vespa compiler. |