Commit Graph

25 Commits

Author SHA1 Message Date
Jan Vidar Krey b9d43c784c Merge branch 'master' of github.com:janvidar/uhub
Conflicts:
	CMakeLists.txt
2012-10-17 19:59:02 +02:00
Jan Vidar Krey 3a8c91004e fixup! Add possibility to specify UHUB_REVISION manually. 2012-10-15 20:27:43 +02:00
Boris Pek deaadd053b Add possibility to specify UHUB_REVISION manually. 2012-10-15 20:24:42 +02:00
Jan Vidar Krey 8b06a75d8e Revert "Add possibility to specify UHUB_REVISION manually."
This reverts commit dcfcf3110d.
2012-10-15 00:24:59 +02:00
Jan Vidar Krey 7fae42aa4d Merge pull request #12 from tehnick/fix-version
Add possibility to specify UHUB_REVISION manually.
2012-10-13 10:34:39 -07:00
Jan Vidar Krey ba59e1a00e Merge pull request #13 from tehnick/cmake-up
Simplify CMakeLists.txt
2012-10-13 10:34:23 -07:00
Boris Pek 63171b0ce2 Simplify CMakeLists.txt 2012-10-13 20:13:15 +03:00
Boris Pek dcfcf3110d Add possibility to specify UHUB_REVISION manually. 2012-10-13 19:46:44 +03:00
Boris Pek 53a5f5a243 Use directory /usr/lib/uhub/ instead of /var/lib/uhub/
in according with FHS (Filesystem Hierarchy Standard).
2012-10-13 18:48:24 +03:00
Jan Vidar Krey f3922bb3e0 Work on splitting out OpenSSL cleanly. 2012-10-12 14:24:03 +02:00
Jan Vidar Krey af083efb0c fixup! Don't compile the utils files multiple times. 2012-10-09 22:14:38 +02:00
Jan Vidar Krey e7aa63f3bd Don't compile the utils files multiple times. 2012-10-09 22:09:25 +02:00
Jan Vidar Krey 279c932b67 fixup! Add install make rule. 2012-10-09 19:31:54 +02:00
Jan Vidar Krey 69603ff70f Add install make rule. 2012-10-09 14:36:14 +02:00
Jan Vidar Krey f20c42d05f Wrapped everything OpenSSL related in a SSL_USE_OPENSSL check macro. 2012-10-02 23:59:11 +02:00
Jan Vidar Krey 2e8c99b7ec Refurbished the ADC hub stress-tester tool; adcrush 2012-10-02 23:59:11 +02:00
Jan Vidar Krey 07da142e65 Only enable the C compiler (no C++ compiler required). 2012-10-05 09:09:54 +02:00
Jan Vidar Krey aa21556600 Use correct source directory for building outside of source. 2012-10-04 22:00:30 +00:00
Jan Vidar Krey f0b11dadf1 Refurbished adcrush (hub stress tester). 2012-10-03 13:51:07 +02:00
Jan Vidar Krey 20a847e1b4 Moved the ipcalc code to the network directory. 2012-10-03 12:59:05 +02:00
Jan Vidar Krey a90807fccb Fix version auto generation. 2012-10-03 12:02:35 +02:00
Jan Vidar Krey 25c82076da Cmake fixes, build adc client and link uhub with pthread if sqlite3 is used. 2012-10-03 11:45:21 +02:00
Jan Vidar Krey 564f09ad65 Update the CMake minimum version to 2.8.3 2012-10-02 20:16:30 +00:00
Jan Vidar Krey ab9dda1c61 Some fixes for CMake on Windows.
Tested successfully with NMake.
2012-10-02 21:38:45 +02:00
Jan Vidar Krey 37e78eada1 Replaced the GNU makefiles with CMake. 2012-10-02 15:49:27 +02:00