From e52a30524b84b4c4a7f320a9ce09b1e31a9810f0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 16 Jul 2016 23:17:20 +0200 Subject: [PATCH] Remove code for custom cppunit Using the old ABI is no longer required. --- passwordmanager/CMakeLists.txt | 11 +---------- tageditor/CMakeLists.txt | 9 --------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/passwordmanager/CMakeLists.txt b/passwordmanager/CMakeLists.txt index 6b0c8de..7f3ac75 100644 --- a/passwordmanager/CMakeLists.txt +++ b/passwordmanager/CMakeLists.txt @@ -6,15 +6,6 @@ set(SUBDIRS_PREFIX "../..") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true) include_directories(BEFORE SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRS_PREFIX}") -# use custom build of cppunit -#export CXXFLAGS="-std=c++11 -Wno-deprecated-declarations -D_GLIBCXX_USE_CXX11_ABI=0" -#../../src/cppunit/autogen.sh -#../../src/cppunit/configure --disable-static --prefix=/usr -#make -#make check -#make DESTDIR=/run/media/devel/build/miscinstall/ install -link_directories("/run/media/devel/build/miscinstall/usr/lib/") - add_subdirectory(${SUBDIRS_PREFIX}/c++utilities c++utilities) list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_SOURCE_DIR}/cmake/modules) @@ -22,4 +13,4 @@ add_subdirectory(${SUBDIRS_PREFIX}/qtutilities qtutilities) list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_SOURCE_DIR}/cmake/modules) add_subdirectory(${SUBDIRS_PREFIX}/passwordfile passwordfile) -add_subdirectory(${SUBDIRS_PREFIX}/passwordmanager tageditor) +add_subdirectory(${SUBDIRS_PREFIX}/passwordmanager passwordmanager) diff --git a/tageditor/CMakeLists.txt b/tageditor/CMakeLists.txt index 3bcfdb8..dce411e 100644 --- a/tageditor/CMakeLists.txt +++ b/tageditor/CMakeLists.txt @@ -6,15 +6,6 @@ set(SUBDIRS_PREFIX "../..") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true) include_directories(BEFORE SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRS_PREFIX}") -# use custom build of cppunit -#export CXXFLAGS="-std=c++11 -Wno-deprecated-declarations -D_GLIBCXX_USE_CXX11_ABI=0" -#../../src/cppunit/autogen.sh -#../../src/cppunit/configure --disable-static --prefix=/usr -#make -#make check -#make DESTDIR=/run/media/devel/build/miscinstall/ install -link_directories("/run/media/devel/build/miscinstall/usr/lib/") - add_subdirectory(${SUBDIRS_PREFIX}/c++utilities c++utilities) list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_SOURCE_DIR}/cmake/modules)