1 files 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} \
+  "CC=${CMAKE_C_COMPILER} \
-                ${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN} \
+    ${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN} \
-                ${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET} \
+    ${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET} \
-                ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}"
+    ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}"
-        "LD=${CMAKE_LINKER}"
+  "LD=${CMAKE_LINKER}"
-        "AR=${CMAKE_AR}"
+  "AR=${CMAKE_AR}"
-        "RANLIB=${CMAKE_RANLIB}"
+  "RANLIB=${CMAKE_RANLIB}"
-        "CFLAGS=${CMAKE_C_FLAGS}"
+  "CFLAGS=${CMAKE_C_FLAGS}"
-        "LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}"
+  "LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}"
-        "--host=${CMAKE_C_COMPILER_TARGET}"
+  "--host=${CMAKE_C_COMPILER_TARGET}"
 )
-ExternalProject_Add(    lzo
+ExternalProject_Add(lzo
-        URL                                     http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz
+  URL               http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz
-        URL_HASH                        SHA1=4924676a9bae5db58ef129dc1cebce3baa3c4b5d
+  URL_HASH          SHA1=4924676a9bae5db58ef129dc1cebce3baa3c4b5d
-        CONFIGURE_COMMAND       <SOURCE_DIR>/configure ${xCONFIG} --disable-shared
+  CONFIGURE_COMMAND <SOURCE_DIR>/configure ${xCONFIG} --disable-shared
-        BUILD_COMMAND           make -j8
+  BUILD_COMMAND     make -j8
-        INSTALL_COMMAND         make install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
+  INSTALL_COMMAND   make install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
-                                                rm -r <BINARY_DIR>
+                    rm -r <BINARY_DIR>
 )
-ExternalProject_Add(    libressl
+ExternalProject_Add(libressl
-        URL                                     https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.6.4.tar.gz
+  URL               https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.6.4.tar.gz
-        URL_HASH                        SHA256=638a20c2f9e99ee283a841cd787ab4d846d1880e180c4e96904fc327d419d11f
+  URL_HASH          SHA256=638a20c2f9e99ee283a841cd787ab4d846d1880e180c4e96904fc327d419d11f
-        CONFIGURE_COMMAND       <SOURCE_DIR>/configure ${xCONFIG} --disable-shared
+  CONFIGURE_COMMAND <SOURCE_DIR>/configure ${xCONFIG} --disable-shared
-        BUILD_COMMAND           make -j8 -C crypto
+  BUILD_COMMAND     make -j8 -C crypto
-        INSTALL_COMMAND         make -C crypto install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
+  INSTALL_COMMAND   make -C crypto install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
-                                                make -C include install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
+                    make -C include install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
-                                                rm -r <BINARY_DIR>
+                    rm -r <BINARY_DIR>
 )
-ExternalProject_Add(    tinc
+ExternalProject_Add(tinc
-        DEPENDS                         lzo libressl
+  DEPENDS           lzo libressl
-        URL                                     https://tinc-vpn.org/packages/tinc-1.1pre15.tar.gz
+  URL               https://tinc-vpn.org/packages/tinc-1.1pre15.tar.gz
-        URL_HASH            SHA256=41dc3e40c5f8be497b779acd6f59ef4572e1430d0d0f0436f2de5cb21a59ef18
+  URL_HASH          SHA256=41dc3e40c5f8be497b779acd6f59ef4572e1430d0d0f0436f2de5cb21a59ef18
-        CONFIGURE_COMMAND       autoreconf -fsi <SOURCE_DIR> &&
+  CONFIGURE_COMMAND autoreconf -fsi <SOURCE_DIR> &&
-                                                <SOURCE_DIR>/configure ${xCONFIG}
+                    <SOURCE_DIR>/configure ${xCONFIG}
-                                                --with-openssl=${CMAKE_CURRENT_BINARY_DIR}/usr/local
+                      --with-openssl=${CMAKE_CURRENT_BINARY_DIR}/usr/local
-                                                --with-lzo=${CMAKE_CURRENT_BINARY_DIR}/usr/local
+                      --with-lzo=${CMAKE_CURRENT_BINARY_DIR}/usr/local
-                                                --disable-curses
+                      --disable-curses
-                                                --disable-readline
+                      --disable-readline
-        BUILD_COMMAND           make -j8 -C src
+  BUILD_COMMAND     make -j8 -C src
-        INSTALL_COMMAND         make -C src install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
+  INSTALL_COMMAND   make -C src install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
-                                                ${CMAKE_COMMAND} -E copy
+                    ${CMAKE_COMMAND} -E copy
-                                                        ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tinc ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtinc.so &&
+                      ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tinc ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtinc.so &&
-                                                ${CMAKE_COMMAND} -E copy
+                    ${CMAKE_COMMAND} -E copy
-                                                        ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tincd ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtincd.so &&
+                      ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tincd ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtincd.so &&
-                                                rm -r <BINARY_DIR>
+                    rm -r <BINARY_DIR>
 )
 add_library(exec SHARED src/main/c/exec.c)

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)
2	include(ExternalProject)	2	include(ExternalProject)
3		3
4	set(xCONFIG	4	set(xCONFIG
5	"CC=${CMAKE_C_COMPILER} \	5	"CC=${CMAKE_C_COMPILER} \
6	${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN} \	6	${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN} \
7	${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET} \	7	${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET} \
8	${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}"	8	${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}"
9	"LD=${CMAKE_LINKER}"	9	"LD=${CMAKE_LINKER}"
10	"AR=${CMAKE_AR}"	10	"AR=${CMAKE_AR}"
11	"RANLIB=${CMAKE_RANLIB}"	11	"RANLIB=${CMAKE_RANLIB}"
12	"CFLAGS=${CMAKE_C_FLAGS}"	12	"CFLAGS=${CMAKE_C_FLAGS}"
13	"LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}"	13	"LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}"
14	"--host=${CMAKE_C_COMPILER_TARGET}"	14	"--host=${CMAKE_C_COMPILER_TARGET}"
15	)	15	)
16		16
17	ExternalProject_Add( lzo	17	ExternalProject_Add(lzo
18	URL http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz	18	URL http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz
19	URL_HASH SHA1=4924676a9bae5db58ef129dc1cebce3baa3c4b5d	19	URL_HASH SHA1=4924676a9bae5db58ef129dc1cebce3baa3c4b5d
20	CONFIGURE_COMMAND <SOURCE_DIR>/configure ${xCONFIG} --disable-shared	20	CONFIGURE_COMMAND <SOURCE_DIR>/configure ${xCONFIG} --disable-shared
21	BUILD_COMMAND make -j8	21	BUILD_COMMAND make -j8
22	INSTALL_COMMAND make install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&	22	INSTALL_COMMAND make install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
23	rm -r <BINARY_DIR>	23	rm -r <BINARY_DIR>
24	)	24	)
25		25
26	ExternalProject_Add( libressl	26	ExternalProject_Add(libressl
27	URL https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.6.4.tar.gz	27	URL https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.6.4.tar.gz
28	URL_HASH SHA256=638a20c2f9e99ee283a841cd787ab4d846d1880e180c4e96904fc327d419d11f	28	URL_HASH SHA256=638a20c2f9e99ee283a841cd787ab4d846d1880e180c4e96904fc327d419d11f
29	CONFIGURE_COMMAND <SOURCE_DIR>/configure ${xCONFIG} --disable-shared	29	CONFIGURE_COMMAND <SOURCE_DIR>/configure ${xCONFIG} --disable-shared
30	BUILD_COMMAND make -j8 -C crypto	30	BUILD_COMMAND make -j8 -C crypto
31	INSTALL_COMMAND make -C crypto install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&	31	INSTALL_COMMAND make -C crypto install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
32	make -C include install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&	32	make -C include install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
33	rm -r <BINARY_DIR>	33	rm -r <BINARY_DIR>
34	)	34	)
35		35
36	ExternalProject_Add( tinc	36	ExternalProject_Add(tinc
37	DEPENDS lzo libressl	37	DEPENDS lzo libressl
38	URL https://tinc-vpn.org/packages/tinc-1.1pre15.tar.gz	38	URL https://tinc-vpn.org/packages/tinc-1.1pre15.tar.gz
39	URL_HASH SHA256=41dc3e40c5f8be497b779acd6f59ef4572e1430d0d0f0436f2de5cb21a59ef18	39	URL_HASH SHA256=41dc3e40c5f8be497b779acd6f59ef4572e1430d0d0f0436f2de5cb21a59ef18
40	CONFIGURE_COMMAND autoreconf -fsi <SOURCE_DIR> &&	40	CONFIGURE_COMMAND autoreconf -fsi <SOURCE_DIR> &&
41	<SOURCE_DIR>/configure ${xCONFIG}	41	<SOURCE_DIR>/configure ${xCONFIG}
42	--with-openssl=${CMAKE_CURRENT_BINARY_DIR}/usr/local	42	--with-openssl=${CMAKE_CURRENT_BINARY_DIR}/usr/local
43	--with-lzo=${CMAKE_CURRENT_BINARY_DIR}/usr/local	43	--with-lzo=${CMAKE_CURRENT_BINARY_DIR}/usr/local
44	--disable-curses	44	--disable-curses
45	--disable-readline	45	--disable-readline
46	BUILD_COMMAND make -j8 -C src	46	BUILD_COMMAND make -j8 -C src
47	INSTALL_COMMAND make -C src install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&	47	INSTALL_COMMAND make -C src install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
48	${CMAKE_COMMAND} -E copy	48	${CMAKE_COMMAND} -E copy
49	${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tinc ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtinc.so &&	49	${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tinc ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtinc.so &&
50	${CMAKE_COMMAND} -E copy	50	${CMAKE_COMMAND} -E copy
51	${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tincd ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtincd.so &&	51	${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tincd ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtincd.so &&
52	rm -r <BINARY_DIR>	52	rm -r <BINARY_DIR>
53	)	53	)
54		54
55	add_library(exec SHARED src/main/c/exec.c)	55	add_library(exec SHARED src/main/c/exec.c)