mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,190 Commits 1 Branch 0 Tags
Commit Graph

187 Commits

Author SHA1 Message Date
qPCR4vir
25353e4325 reorganize priorities 2019-11-05 19:23:50 +01:00
qPCR4vir
76d5138f55 nana cmake version 1.7.1 2019-06-12 12:44:52 +02:00
Jinhao
162889d553 Merge branch 'patch-1' of https://github.com/Xeverous/nana into Xeverous-patch-1 2019-06-10 23:46:55 +08:00
Xeverous
b0ae6425ca
add alias nana::nana in CMakeLists.txt 
This commit adds the alias to allow the use of nana::nana in other projects as per guideline https://gist.github.com/mbinna/c61dbb39bca0e4fb7d1f73b0d66a4fd1#using-a-library-defined-in-the-same-cmake-tree-should-look-the-same-as-using-an-external-library.

This change should not break anything, it only adds an alternative name
 2019-05-30 10:59:45 +02:00
qPCR4vir
fbffbcd75d target_compile_options(nana PUBLIC -static -static-libstdc++) for MINGW too 2019-05-15 13:05:19 +02:00
Jinhao
4e4fbbde46 fix compiling error 2018-12-15 10:53:33 +08:00
qPCR4vir
9792b1ed2f verbose.cmake # Just for information 2018-10-06 20:31:58 +02:00
qPCR4vir
3c672c4a53 fix to full path ? CLion ? CMake ? me ? have problem with relative path? 2018-10-05 12:06:06 +02:00
qPCR4vir
5213c2e8b9 reuse NANA_CMAKE_VERBOSE_PREPROCESSOR 2018-10-04 10:14:58 +02:00
qPCR4vir
2e6a85bf89 reorganize cmake in small scripts with some fix from https://github.com/cnjinhao/nana/pull/278 2018-10-02 18:47:04 +02:00
qPCR4vir
dc666a893f Merge remote-tracking branch 'KingDuckZ/develop' into merge-KingDuckZ 
# Conflicts:
#	CMakeLists.txt
 2018-10-02 09:31:14 +02:00
qPCR4vir
df1059d297 cmake_print_variables (NANA_CMAKE_INSTALL) 2018-09-11 16:32:24 +02:00
qPCR4vir
8c6b0d4653 simplify CMakeList with cmake scripts 2018-09-10 14:27:56 +02:00
qPCR4vir
8057bf95e1 use NANA_CMAKE_INSTALL 2018-09-09 11:49:30 +02:00
qPCR4vir
88b0206016 target_include_directories INTERFACE ${CMAKE_INSTALL_PREFIX}/include)? 2018-09-09 01:25:43 +02:00
qPCR4vir
6fab0f5354 simplify cmake usage by nana-demo including nana 2018-09-06 13:12:46 +02:00
qPCR4vir
de2ec3928d modernize CMakeList and make it posible to just include nana 2018-09-06 10:49:54 +02:00
qPCR4vir
0309e79701 FIX using newer Boost 
TODO use std::filesystem not experimental
 2018-08-30 15:05:40 +02:00
qPCR4vir
d27bb0a7b3 try to add headers to projects 2018-08-23 15:17:51 +02:00
qPCR4vir
f24e60425b use CMakePrintHelpers, move installs 2018-08-21 16:54:56 +02:00
qPCR4vir
ff2444b3cb use BUILD_SHARED_LIBS and target_sources() 2018-08-21 16:52:30 +02:00
qPCR4vir
6767549042 target centric cmake 2018-08-21 16:44:54 +02:00
qPCR4vir
05e6e1f92e Merge remote-tracking branch 'cnjinhao/hotfix-1.6.1' into CMake 
# Conflicts:
#	CMakeLists.txt
 2018-08-19 20:58:32 +02:00
qPCR4vir
f789d808be revise 2018-08-19 20:49:17 +02:00
Jinhao
0a7223b37c Add missing changes after branch merged(#319) 2018-08-19 15:41:08 +08:00
qPCR4vir
7a2b97813a CLion install works now 2018-08-16 08:49:55 +02:00
qPCR4vir
74cc3ce475 VERSION 2018-08-16 08:48:32 +02:00
Yuchen Deng
342a6a7ac0 Add missing changes after branch merged 2018-06-24 17:21:54 +08:00
Jinhao
216cb786e7 various fixes 
fixed compiler warnings
fixed bad overridings
fixed FreeBSD support
 2018-05-22 14:22:58 +08:00
Jinhao
14c60945ca fix CMakeLists error which is caused by merging 2018-05-08 05:05:39 +08:00
Jinhao
c72d8e25b4 Merge branch 'feature-freebsd-posix' into develop 2018-05-08 04:52:13 +08:00
Yuchen Deng
f03c09303d Remove the duplicaties compilation options 2018-04-08 21:22:47 +08:00
Yuchen Deng
596aecc24a Better static linker flags again 
Don't know why it missing in the previous commit
 2018-04-08 20:27:11 +08:00
Yuchen Deng
8aad0ced38 We should do not need POLICY CMP0004 anymore 2018-04-08 20:20:04 +08:00
Yuchen Deng
a85df931d2 Fix linker error on Debian 9 2018-04-07 11:42:15 +08:00
Yuchen Deng
83ce5e9142 Refactoring the main CMakeLists.txt 2018-03-30 23:31:30 +08:00
unitrunker
2e360da217 play with list APPEND 2018-01-24 20:37:55 -06:00
unitrunker
a716d4837a Whats up with compiler version? 2018-01-24 19:56:34 -06:00
buck-yeh
69616bae40
Make more Linux distros happy 
Specifically, Fefora 27 will complain about missing <ft2build.h>, so will Solus.
 2018-01-24 15:12:36 +08:00
unitrunker
37882efb1a Attempt fix for gcc 4.9 2018-01-23 19:34:16 -06:00
Jinhao
81018c21fd add contribution info 2017-12-03 13:13:12 +08:00
Jinhao
2086f0c258 Merge branch 'boostfix' of https://github.com/pavelxdd/nana into pavelxdd-boostfix 2017-12-01 22:18:13 +08:00
Jinhao
7369b5437c Merge branch 'hotfix-1.5.5' into develop 2017-12-01 17:56:06 +08:00
pavelxdd
7e68068c25 fix compilation with boost::filesystem 
CMakeLists.txt:
---------------------------
Until now build with boost::filesystem was completely broken,
since cmake exported definitions with wrong name prefixes, and
nana always defaulted to internal filesystem implementation.

After fixing the boost definitions, a number of errors came up
due to incompatibility of boost::filesystem with nana and std
filesystems. This commit tries to fix them all.

filesystem.cpp, filesystem.hpp, filebox.cpp:
--------------------------------------------
boost::filesystem doesn't have a file_time_type, so declared
it in the filesystem.hpp header.

boost::filesystem::last_write_time has a return type std::time_t
unlike the other two implementations of this function in nana
and std, so added ifdef to convert the result to file_time_type.

fixed build on gcc-4.9, since it doesn't have a std::put_time
function, included <nana/stdc++.hpp> in that case.

boost::filesystem::file_type types have different names than
std::experimental::filesystem::file_type types, fixed it by
creating an enum class file_type with the same type names as
in std::experimental::filesystem::file_type. This fix
requires static_cast from functions results to internal file_type,
since boost file_type and std file_type a different enum classes.

changed switch to if, bacause old gcc fails on converting
enum class members to int.

stdc++.hpp:
-----------
added ifndef guards to prevent errors on multiple includes of this header.

wvl.cpp:
--------
added boost/chrono.hpp include for the cases when std::thread is not
available.

travis:
-------
added boost system, thread, chrono libs to install, they are needed
for the nana-demo to compile.
 2017-11-28 06:22:17 +03:00
King_DuckZ
b713b01dbe Fix missing closing brace. 2017-11-10 00:49:46 +00:00
King_DuckZ
97297ae511 Fix cmake warning. 2017-11-10 00:46:08 +00:00
King_DuckZ
b9946f2624 Fix up some wrong parts I missed to conform with the rest of my changes. 2017-11-10 00:29:07 +00:00
King_DuckZ
32e6ee532c Fix build after rebase. 2017-11-10 00:16:50 +00:00
King_DuckZ
309a95d321 Maybe not needed anymore? 2017-11-10 00:10:11 +00:00
King_DuckZ
d3f5577625 These need be set *before* find_package, or it will be too late. 2017-11-10 00:10:11 +00:00