From 503d704622fc99d853b51e7e5fe294290a2c138b Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 26 Jul 2016 17:34:18 +0200 Subject: [PATCH] Move CMakeLists.txt for android support and android cpu features to cmake-builder. --- submodules/cmake-builder | 2 +- .../build/cpufeatures/CMakeLists.txt | 36 --------------- .../externals/build/support/CMakeLists.txt | 46 ------------------- 3 files changed, 1 insertion(+), 83 deletions(-) delete mode 100644 submodules/externals/build/cpufeatures/CMakeLists.txt delete mode 100644 submodules/externals/build/support/CMakeLists.txt diff --git a/submodules/cmake-builder b/submodules/cmake-builder index c8bf23f40..6d4281181 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit c8bf23f40cedc7a36868bd189c868bafeb759177 +Subproject commit 6d4281181addb913e851622e6d9b04d093c869d4 diff --git a/submodules/externals/build/cpufeatures/CMakeLists.txt b/submodules/externals/build/cpufeatures/CMakeLists.txt deleted file mode 100644 index 8ba144dd5..000000000 --- a/submodules/externals/build/cpufeatures/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################ -# CMakeLists.txt -# Copyright (C) 2016 Belledonne Communications, Grenoble France -# -############################################################################ -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -############################################################################ - -cmake_minimum_required(VERSION 3.0) -project(androidcpufeatures LANGUAGES C) - -include(GNUInstallDirs) - - -add_library(cpufeatures STATIC "${ANDROID_CPU_FEATURES_INCLUDE_DIRS}/cpu-features.c") - -install(TARGETS cpufeatures - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -) diff --git a/submodules/externals/build/support/CMakeLists.txt b/submodules/externals/build/support/CMakeLists.txt deleted file mode 100644 index 2592558d3..000000000 --- a/submodules/externals/build/support/CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -############################################################################ -# CMakeLists.txt -# Copyright (C) 2016 Belledonne Communications, Grenoble France -# -############################################################################ -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -############################################################################ - -cmake_minimum_required(VERSION 3.0) -project(androidsupport LANGUAGES C) - -include(GNUInstallDirs) - - -set(SUPPORT_SOURCES - "${ANDROID_SUPPORT}/src/musl-locale/iconv.c" - "${ANDROID_SUPPORT}/src/musl-locale/langinfo.c" - "${ANDROID_SUPPORT}/src/musl-locale/nl_langinfo_l.c" - "${ANDROID_SUPPORT}/src/musl-multibyte/wctomb.c" -) - -add_library(support STATIC ${SUPPORT_SOURCES}) -if(CMAKE_C_COMPILER_ID STREQUAL "GNU") - target_compile_options(support PRIVATE "-std=c99") -endif() - -install(TARGETS support - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -)