From 2be958c3d6a7f07dfdff28c9b4bbc9bb697f3bb2 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 10 Feb 2018 15:19:40 +0100 Subject: Reformat CMakeLists --- app/CMakeLists.txt | 84 +++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index d46b88b..7347b85 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -2,54 +2,54 @@ cmake_minimum_required(VERSION 3.4.1) include(ExternalProject) set(xCONFIG - "CC=${CMAKE_C_COMPILER} \ - ${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN} \ - ${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET} \ - ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}" - "LD=${CMAKE_LINKER}" - "AR=${CMAKE_AR}" - "RANLIB=${CMAKE_RANLIB}" - "CFLAGS=${CMAKE_C_FLAGS}" - "LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}" - "--host=${CMAKE_C_COMPILER_TARGET}" + "CC=${CMAKE_C_COMPILER} \ + ${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN} \ + ${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET} \ + ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}" + "LD=${CMAKE_LINKER}" + "AR=${CMAKE_AR}" + "RANLIB=${CMAKE_RANLIB}" + "CFLAGS=${CMAKE_C_FLAGS}" + "LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}" + "--host=${CMAKE_C_COMPILER_TARGET}" ) -ExternalProject_Add( lzo - URL http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz - URL_HASH SHA1=4924676a9bae5db58ef129dc1cebce3baa3c4b5d - CONFIGURE_COMMAND /configure ${xCONFIG} --disable-shared - BUILD_COMMAND make -j8 - INSTALL_COMMAND make install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} && - rm -r +ExternalProject_Add(lzo + URL http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz + URL_HASH SHA1=4924676a9bae5db58ef129dc1cebce3baa3c4b5d + CONFIGURE_COMMAND /configure ${xCONFIG} --disable-shared + BUILD_COMMAND make -j8 + INSTALL_COMMAND make install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} && + rm -r ) -ExternalProject_Add( libressl - URL https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.6.4.tar.gz - URL_HASH SHA256=638a20c2f9e99ee283a841cd787ab4d846d1880e180c4e96904fc327d419d11f - CONFIGURE_COMMAND /configure ${xCONFIG} --disable-shared - BUILD_COMMAND make -j8 -C crypto - INSTALL_COMMAND make -C crypto install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} && - make -C include install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} && - rm -r +ExternalProject_Add(libressl + URL https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.6.4.tar.gz + URL_HASH SHA256=638a20c2f9e99ee283a841cd787ab4d846d1880e180c4e96904fc327d419d11f + CONFIGURE_COMMAND /configure ${xCONFIG} --disable-shared + BUILD_COMMAND make -j8 -C crypto + INSTALL_COMMAND make -C crypto install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} && + make -C include install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} && + rm -r ) -ExternalProject_Add( tinc - DEPENDS lzo libressl - URL https://tinc-vpn.org/packages/tinc-1.1pre15.tar.gz - URL_HASH SHA256=41dc3e40c5f8be497b779acd6f59ef4572e1430d0d0f0436f2de5cb21a59ef18 - CONFIGURE_COMMAND autoreconf -fsi && - /configure ${xCONFIG} - --with-openssl=${CMAKE_CURRENT_BINARY_DIR}/usr/local - --with-lzo=${CMAKE_CURRENT_BINARY_DIR}/usr/local - --disable-curses - --disable-readline - BUILD_COMMAND make -j8 -C src - INSTALL_COMMAND make -C src install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} && - ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tinc ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtinc.so && - ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tincd ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtincd.so && - rm -r +ExternalProject_Add(tinc + DEPENDS lzo libressl + URL https://tinc-vpn.org/packages/tinc-1.1pre15.tar.gz + URL_HASH SHA256=41dc3e40c5f8be497b779acd6f59ef4572e1430d0d0f0436f2de5cb21a59ef18 + CONFIGURE_COMMAND autoreconf -fsi && + /configure ${xCONFIG} + --with-openssl=${CMAKE_CURRENT_BINARY_DIR}/usr/local + --with-lzo=${CMAKE_CURRENT_BINARY_DIR}/usr/local + --disable-curses + --disable-readline + BUILD_COMMAND make -j8 -C src + INSTALL_COMMAND make -C src install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} && + ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tinc ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtinc.so && + ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tincd ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtincd.so && + rm -r ) add_library(exec SHARED src/main/c/exec.c) -- cgit v1.2.3