Improved build system

author: Maxim Biro <nurupo.contributions@gmail.com> 2013-07-17 18:06:05 -0400
committer: Maxim Biro <nurupo.contributions@gmail.com> 2013-07-17 18:18:27 -0400
commit: ef0efd72b51a44d30272dccffdc365165d385291 (patch)
tree: fd408b402da7a983ea71a1ea4b466f335cd853c0
parent: 817ad50d9640b8ccce3636a00f732245ff09d38c (diff)
13 files changed, 125 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore
index 263cdb90..0b178e8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,9 @@
 //nacl build
 nacl/build/
 build
+CMakeCache.txt
+CMakeFiles
+Makefile
+cmake_install.cmake
+install_manifest.txt
diff --git a/.travis.yml b/.travis.yml
index a304a0a4..fe62910d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,9 @@ before_script:
 script:
  - cmake CMakeLists.txt
-  - make -j3
+  - make DHT_bootstrap -j3
+  - make Messenger_test -j3
+  - make nTox -j3
 notifications:
  email: false
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec474ffb..db417a2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 2.6.0)
-project(TOX C)
-set(exe_name toxMessengerTest)
+if(WIN32)
+        include_directories(${CMAKE_HOME_DIRECTORY}/sodium/include/)
+endif()
 set(core_sources
        core/DHT.c
@@ -9,29 +10,29 @@ set(core_sources
        core/Lossless_UDP.c
        core/net_crypto.c
        core/Messenger.c)
-if(WIN32)
-    set(test_sources
-            testing/Messenger_test.c)
-else()
-    set(test_sources
-            testing/nTox.c)
-        #testing/Messenger_test.c)
-endif()
-add_executable(${exe_name}
+add_library(core ${core_sources})
-        ${core_sources}
-        ${test_sources})
-if(WIN32)
+macro(linkCoreLibraries exe_name)
-        include_directories(${TOX_SOURCE_DIR}/sodium/include/)
+        if(WIN32)
-        target_link_libraries(${exe_name} ws2_32 
+                target_link_libraries(${exe_name} core
-                ${CMAKE_SOURCE_DIR}/sodium/lib/libsodium.a)
+                        ${CMAKE_SOURCE_DIR}/sodium/lib/libsodium.a
-else()
+                        ws2_32)
-        target_link_libraries(${exe_name} sodium)
+        else()
-        target_link_libraries(${exe_name} ncurses)
+                target_link_libraries(${exe_name} core
-endif()
+                        sodium)
+        endif()
+endmacro()
-if(CMAKE_COMPILER_IS_GNUCC)
-        message(STATUS "==== GCC detected - Adding compiler flags ====")
+macro(addCompilerFlags)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
+        if(NOT WIN32)
-endif()
+                if(("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang"))
+                        message(STATUS "==== ${CMAKE_C_COMPILER_ID} detected - Adding compiler flags ====")
+                        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
+                endif()
+        endif()
+endmacro()
+ADD_SUBDIRECTORY(testing)
+ADD_SUBDIRECTORY(other)
+\ No newline at end of file
diff --git a/other/CMakeLists.txt b/other/CMakeLists.txt
new file mode 100644
index 00000000..22dc8e25
--- /dev/null
+++ b/other/CMakeLists.txt
@@ -0,0 +1 @@
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_bootstrap.cmake)
diff --git a/other/cmake/DHT_bootstrap.cmake b/other/cmake/DHT_bootstrap.cmake
new file mode 100644
index 00000000..f978baa4
--- /dev/null
+++ b/other/cmake/DHT_bootstrap.cmake
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.6.0)
+project(DHT_bootstrap C)
+set(exe_name DHT_bootstrap)
+add_executable(${exe_name}
+        DHT_bootstrap.c)
+linkCoreLibraries(${exe_name})
+addCompilerFlags()
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
new file mode 100644
index 00000000..bb599b86
--- /dev/null
+++ b/testing/CMakeLists.txt
@@ -0,0 +1,7 @@
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_cryptosendfiletest.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_sendfiletest.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_test.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testclient.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testserver.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake)
+\ No newline at end of file
diff --git a/testing/cmake/DHT_cryptosendfiletest.cmake b/testing/cmake/DHT_cryptosendfiletest.cmake
new file mode 100644
index 00000000..9396d91a
--- /dev/null
+++ b/testing/cmake/DHT_cryptosendfiletest.cmake
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.6.0)
+project(DHT_cryptosendfiletest C)
+set(exe_name DHT_cryptosendfiletest)
+add_executable(${exe_name}
+        DHT_cryptosendfiletest.c)
+linkCoreLibraries(${exe_name})
+addCompilerFlags()
diff --git a/testing/cmake/DHT_sendfiletest.cmake b/testing/cmake/DHT_sendfiletest.cmake
new file mode 100644
index 00000000..c7595224
--- /dev/null
+++ b/testing/cmake/DHT_sendfiletest.cmake
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.6.0)
+project(DHT_sendfiletest C)
+set(exe_name DHT_sendfiletest)
+add_executable(${exe_name}
+        DHT_sendfiletest.c)
+linkCoreLibraries(${exe_name})
+addCompilerFlags()
diff --git a/testing/cmake/DHT_test.cmake b/testing/cmake/DHT_test.cmake
new file mode 100644
index 00000000..e5c18c03
--- /dev/null
+++ b/testing/cmake/DHT_test.cmake
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.6.0)
+project(DHT_test C)
+set(exe_name DHT_test)
+add_executable(${exe_name}
+        DHT_test.c)
+linkCoreLibraries(${exe_name})
+addCompilerFlags()
diff --git a/testing/cmake/Lossless_UDP_testclient.cmake b/testing/cmake/Lossless_UDP_testclient.cmake
new file mode 100644
index 00000000..375bb733
--- /dev/null
+++ b/testing/cmake/Lossless_UDP_testclient.cmake
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.6.0)
+project(Lossless_UDP_testclient C)
+set(exe_name Lossless_UDP_testclient)
+add_executable(${exe_name}
+        Lossless_UDP_testclient.c)
+linkCoreLibraries(${exe_name})
+addCompilerFlags()
diff --git a/testing/cmake/Lossless_UDP_testserver.cmake b/testing/cmake/Lossless_UDP_testserver.cmake
new file mode 100644
index 00000000..fe16e937
--- /dev/null
+++ b/testing/cmake/Lossless_UDP_testserver.cmake
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.6.0)
+project(Lossless_UDP_testserver C)
+set(exe_name Lossless_UDP_testserver)
+add_executable(${exe_name}
+        Lossless_UDP_testserver.c)
+linkCoreLibraries(${exe_name})
+addCompilerFlags()
diff --git a/testing/cmake/Messenger_test.cmake b/testing/cmake/Messenger_test.cmake
new file mode 100644
index 00000000..2848818b
--- /dev/null
+++ b/testing/cmake/Messenger_test.cmake
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.6.0)
+project(Messenger_test C)
+set(exe_name Messenger_test)
+add_executable(${exe_name}
+        Messenger_test.c)
+linkCoreLibraries(${exe_name})
+addCompilerFlags()
diff --git a/testing/cmake/nTox.cmake b/testing/cmake/nTox.cmake
new file mode 100644
index 00000000..814b1427
--- /dev/null
+++ b/testing/cmake/nTox.cmake
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 2.6.0)
+project(nTox C)
+set(exe_name nTox)
+add_executable(${exe_name}
+        nTox.c)
+        
+target_link_libraries(${exe_name} ncurses)
+linkCoreLibraries(${exe_name})
+addCompilerFlags()
author	Maxim Biro <nurupo.contributions@gmail.com>	2013-07-17 18:06:05 -0400
committer	Maxim Biro <nurupo.contributions@gmail.com>	2013-07-17 18:18:27 -0400
commit	ef0efd72b51a44d30272dccffdc365165d385291 (patch)
tree	fd408b402da7a983ea71a1ea4b466f335cd853c0
parent	817ad50d9640b8ccce3636a00f732245ff09d38c (diff)

diff --git a/.gitignore b/.gitignore index 263cdb90..0b178e8e 100644 --- a/.gitignore +++ b/.gitignore
@@ -3,3 +3,9 @@
3	//nacl build	3	//nacl build
4	nacl/build/	4	nacl/build/
5	build	5	build
		6
		7	CMakeCache.txt
		8	CMakeFiles
		9	Makefile
		10	cmake_install.cmake
		11	install_manifest.txt


diff --git a/.travis.yml b/.travis.yml index a304a0a4..fe62910d 100644 --- a/.travis.yml +++ b/.travis.yml
@@ -14,7 +14,9 @@ before_script:
14		14
15	script:	15	script:
16	- cmake CMakeLists.txt	16	- cmake CMakeLists.txt
17	- make -j3	17	- make DHT_bootstrap -j3
		18	- make Messenger_test -j3
		19	- make nTox -j3
18		20
19	notifications:	21	notifications:
20	email: false	22	email: false


diff --git a/CMakeLists.txt b/CMakeLists.txt index ec474ffb..db417a2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -1,7 +1,8 @@
1	cmake_minimum_required(VERSION 2.6.0)	1	cmake_minimum_required(VERSION 2.6.0)
2	project(TOX C)
3		2
4	set(exe_name toxMessengerTest)	3	if(WIN32)
		4	include_directories(${CMAKE_HOME_DIRECTORY}/sodium/include/)
		5	endif()
5		6
6	set(core_sources	7	set(core_sources
7	core/DHT.c	8	core/DHT.c
@@ -9,29 +10,29 @@ set(core_sources
9	core/Lossless_UDP.c	10	core/Lossless_UDP.c
10	core/net_crypto.c	11	core/net_crypto.c
11	core/Messenger.c)	12	core/Messenger.c)
12	if(WIN32)
13	set(test_sources
14	testing/Messenger_test.c)
15	else()
16	set(test_sources
17	testing/nTox.c)
18	#testing/Messenger_test.c)
19	endif()
20		13
21	add_executable(${exe_name}	14	add_library(core ${core_sources})
22	${core_sources}
23	${test_sources})
24		15
25	if(WIN32)	16	macro(linkCoreLibraries exe_name)
26	include_directories(${TOX_SOURCE_DIR}/sodium/include/)	17	if(WIN32)
27	target_link_libraries(${exe_name} ws2_32	18	target_link_libraries(${exe_name} core
28	${CMAKE_SOURCE_DIR}/sodium/lib/libsodium.a)	19	${CMAKE_SOURCE_DIR}/sodium/lib/libsodium.a
29	else()	20	ws2_32)
30	target_link_libraries(${exe_name} sodium)	21	else()
31	target_link_libraries(${exe_name} ncurses)	22	target_link_libraries(${exe_name} core
32	endif()	23	sodium)
		24	endif()
		25	endmacro()
33		26
34	if(CMAKE_COMPILER_IS_GNUCC)	27
35	message(STATUS "==== GCC detected - Adding compiler flags ====")	28	macro(addCompilerFlags)
36	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")	29	if(NOT WIN32)
37	endif()	30	if(("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang"))
		31	message(STATUS "==== ${CMAKE_C_COMPILER_ID} detected - Adding compiler flags ====")
		32	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
		33	endif()
		34	endif()
		35	endmacro()
		36
		37	ADD_SUBDIRECTORY(testing)
		38	ADD_SUBDIRECTORY(other) \ No newline at end of file


diff --git a/other/CMakeLists.txt b/other/CMakeLists.txt new file mode 100644 index 00000000..22dc8e25 --- /dev/null +++ b/other/CMakeLists.txt
@@ -0,0 +1 @@
			include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_bootstrap.cmake)


diff --git a/other/cmake/DHT_bootstrap.cmake b/other/cmake/DHT_bootstrap.cmake new file mode 100644 index 00000000..f978baa4 --- /dev/null +++ b/other/cmake/DHT_bootstrap.cmake
@@ -0,0 +1,10 @@
		1	cmake_minimum_required(VERSION 2.6.0)
		2	project(DHT_bootstrap C)
		3
		4	set(exe_name DHT_bootstrap)
		5
		6	add_executable(${exe_name}
		7	DHT_bootstrap.c)
		8
		9	linkCoreLibraries(${exe_name})
		10	addCompilerFlags()


diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt new file mode 100644 index 00000000..bb599b86 --- /dev/null +++ b/testing/CMakeLists.txt
@@ -0,0 +1,7 @@
		1	include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_cryptosendfiletest.cmake)
		2	include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_sendfiletest.cmake)
		3	include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_test.cmake)
		4	include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testclient.cmake)
		5	include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testserver.cmake)
		6	include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake)
		7	include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake) \ No newline at end of file


diff --git a/testing/cmake/DHT_cryptosendfiletest.cmake b/testing/cmake/DHT_cryptosendfiletest.cmake new file mode 100644 index 00000000..9396d91a --- /dev/null +++ b/testing/cmake/DHT_cryptosendfiletest.cmake
@@ -0,0 +1,10 @@
		1	cmake_minimum_required(VERSION 2.6.0)
		2	project(DHT_cryptosendfiletest C)
		3
		4	set(exe_name DHT_cryptosendfiletest)
		5
		6	add_executable(${exe_name}
		7	DHT_cryptosendfiletest.c)
		8
		9	linkCoreLibraries(${exe_name})
		10	addCompilerFlags()


diff --git a/testing/cmake/DHT_sendfiletest.cmake b/testing/cmake/DHT_sendfiletest.cmake new file mode 100644 index 00000000..c7595224 --- /dev/null +++ b/testing/cmake/DHT_sendfiletest.cmake
@@ -0,0 +1,10 @@
		1	cmake_minimum_required(VERSION 2.6.0)
		2	project(DHT_sendfiletest C)
		3
		4	set(exe_name DHT_sendfiletest)
		5
		6	add_executable(${exe_name}
		7	DHT_sendfiletest.c)
		8
		9	linkCoreLibraries(${exe_name})
		10	addCompilerFlags()


diff --git a/testing/cmake/DHT_test.cmake b/testing/cmake/DHT_test.cmake new file mode 100644 index 00000000..e5c18c03 --- /dev/null +++ b/testing/cmake/DHT_test.cmake
@@ -0,0 +1,10 @@
		1	cmake_minimum_required(VERSION 2.6.0)
		2	project(DHT_test C)
		3
		4	set(exe_name DHT_test)
		5
		6	add_executable(${exe_name}
		7	DHT_test.c)
		8
		9	linkCoreLibraries(${exe_name})
		10	addCompilerFlags()


diff --git a/testing/cmake/Lossless_UDP_testclient.cmake b/testing/cmake/Lossless_UDP_testclient.cmake new file mode 100644 index 00000000..375bb733 --- /dev/null +++ b/testing/cmake/Lossless_UDP_testclient.cmake
@@ -0,0 +1,10 @@
		1	cmake_minimum_required(VERSION 2.6.0)
		2	project(Lossless_UDP_testclient C)
		3
		4	set(exe_name Lossless_UDP_testclient)
		5
		6	add_executable(${exe_name}
		7	Lossless_UDP_testclient.c)
		8
		9	linkCoreLibraries(${exe_name})
		10	addCompilerFlags()


diff --git a/testing/cmake/Lossless_UDP_testserver.cmake b/testing/cmake/Lossless_UDP_testserver.cmake new file mode 100644 index 00000000..fe16e937 --- /dev/null +++ b/testing/cmake/Lossless_UDP_testserver.cmake
@@ -0,0 +1,10 @@
		1	cmake_minimum_required(VERSION 2.6.0)
		2	project(Lossless_UDP_testserver C)
		3
		4	set(exe_name Lossless_UDP_testserver)
		5
		6	add_executable(${exe_name}
		7	Lossless_UDP_testserver.c)
		8
		9	linkCoreLibraries(${exe_name})
		10	addCompilerFlags()


diff --git a/testing/cmake/Messenger_test.cmake b/testing/cmake/Messenger_test.cmake new file mode 100644 index 00000000..2848818b --- /dev/null +++ b/testing/cmake/Messenger_test.cmake
@@ -0,0 +1,10 @@
		1	cmake_minimum_required(VERSION 2.6.0)
		2	project(Messenger_test C)
		3
		4	set(exe_name Messenger_test)
		5
		6	add_executable(${exe_name}
		7	Messenger_test.c)
		8
		9	linkCoreLibraries(${exe_name})
		10	addCompilerFlags()


diff --git a/testing/cmake/nTox.cmake b/testing/cmake/nTox.cmake new file mode 100644 index 00000000..814b1427 --- /dev/null +++ b/testing/cmake/nTox.cmake
@@ -0,0 +1,12 @@
		1	cmake_minimum_required(VERSION 2.6.0)
		2	project(nTox C)
		3
		4	set(exe_name nTox)
		5
		6	add_executable(${exe_name}
		7	nTox.c)
		8
		9	target_link_libraries(${exe_name} ncurses)
		10
		11	linkCoreLibraries(${exe_name})
		12	addCompilerFlags()