Commit Graph

106 Commits

Author SHA1 Message Date
qPCR4vir
ca96a9d3ca Fix merge
# Conflicts:
#	include/nana/gui/widgets/treebox.hpp
#	source/gui/place.cpp
2019-05-05 22:15:41 +02:00
qPCR4vir
d6088e5d7d nana dev point to nana-demo cmake-dev. No Boost, print CMAKE_CXX_FLAGS_RELEASE. 2019-05-05 21:53:05 +02:00
qPCR4vir
db0812fdab nana hotfix point to nana-demo hotfix. 2019-03-20 17:26:38 +01:00
Vina Rodriguez
83eab4ba63 use gcc 8 to have weakly_canonical in travis ? 2019-03-19 20:26:42 +01:00
Jinhao
88294ed9fb Merge branch 'hotfix-1.6.2' into develop-1.7 2018-12-29 07:18:03 +08:00
qPCR4vir
ab789837a0 cmake-3.12 in travis 2018-11-07 19:37:05 +01:00
Jinhao
ff9b90a766 add libXcursor-dev 2018-10-23 03:40:54 +08:00
Jinhao
95ccc3cb7e fix bug that incorrect work path of test programs 2018-10-03 08:05:38 +08:00
qPCR4vir
1821f3018e travis calls nana-demo directly 2018-09-10 14:44:42 +02:00
qPCR4vir
8e7985e0e3 fixing travis 2018-09-09 02:06:06 +02:00
qPCR4vir
4f11de3d60 fixing travis 2018-09-09 01:55:21 +02:00
qPCR4vir
ba530b8377 fixing travis 2018-09-09 01:37:21 +02:00
qPCR4vir
6fab0f5354 simplify cmake usage by nana-demo including nana 2018-09-06 13:12:46 +02:00
qPCR4vir
f789d808be revise 2018-08-19 20:49:17 +02:00
qPCR4vir
3dbbd175fa git clone nana-demo branch=cmake-dev 2018-08-16 20:37:16 +02:00
qPCR4vir
95b386051c travis cmake 3.12 update ubuntu install 2018-08-16 20:35:03 +02:00
qPCR4vir
1f53aa3344 nana hotfix point to nana-demo hotfix 2018-07-14 02:06:10 +02:00
Jinhao
3871715779 Merge branch 'develop' of https://github.com/Unitrunker/nana into Unitrunker-develop 2018-02-11 15:58:45 +08:00
unitrunker
9127942a5a if someone wants this, they can put it back - fixed. 2018-01-24 20:53:35 -06:00
qPCR4vir
d5d1ba3c9e Merge remote-tracking branch 'cnjinhao/develop' into develop
# Conflicts:
#	build/vc2017/nana.vcxproj.filters
2017-12-03 00:55:27 +01:00
Jinhao
2086f0c258 Merge branch 'boostfix' of https://github.com/pavelxdd/nana into pavelxdd-boostfix 2017-12-01 22:18:13 +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
qPCR4vir
263776812e git clone branch=hotfix-1.5/nana-demo in hotfix-1.5.4/nana travis 2017-09-05 15:53:43 +02:00
qPCR4vir
18264f1974 Manually-specified variables were not used by the project
Forgot to clean this in:
Commit: a68155c7d7 [a68155c7]
Parents: 11bd0bcf88
Author: qPCR4vir <arielvina@yahoo.es>
Date: Montag, 27. Juni 2016 01:25:48
Build build demos separately.
2017-09-05 15:51:52 +02:00
Jinhao
d36a7e684a fix travis for new update 2017-09-02 21:25:30 +08:00
qPCR4vir
a632ab0a12 clone branch=develop qPCR4vir/nana-demo 2017-05-02 12:14:17 +02:00
qPCR4vir
06e1b7a712 test with nana-demo/hotfix 2016-11-15 03:36:01 +01:00
qPCR4vir
ddc88e0af0 travis test with nana-demo/develop branch 2016-06-30 17:54:51 +02:00
qPCR4vir
b5706bab17 make install only (in travis) 2016-06-30 16:05:47 +02:00
qPCR4vir
1a0761c59b - cd ../bin 2016-06-27 17:00:36 +02:00
qPCR4vir
a6e8d88ae8 install -DCMAKE_INSTALL_PREFIX=.. 2016-06-27 16:59:26 +02:00
qPCR4vir
98ed89c097 - cp -v ../nana-demo/Examples ../ 2016-06-27 16:35:23 +02:00
qPCR4vir
fffa89ea5c - cp -v nana-demo/Examples 2016-06-27 16:17:24 +02:00
qPCR4vir
5b74b38b13 - mv -v nana-demo/Examples . 2016-06-27 16:08:00 +02:00
qPCR4vir
b5822df1ec set the same options !? 2016-06-27 15:24:28 +02:00
qPCR4vir
72f950282a make ../nana-demo 2016-06-27 14:15:29 +02:00
qPCR4vir
1a1e86fc92 build ../nana-demo 2016-06-27 13:16:07 +02:00
qPCR4vir
4886dcd840 build ../nana_demo 2016-06-27 13:10:43 +02:00
qPCR4vir
26a2b5ac63 put in ../nana_lib the lib and the includes 2016-06-27 13:00:44 +02:00
qPCR4vir
234c94aaf4 Merge remote-tracking branch 'origin/tests' into tests 2016-06-27 01:55:18 +02:00
qPCR4vir
6328ae0cfd no cd ../lib 2016-06-27 01:55:05 +02:00
Ariel Vina-Rodriguez
11bfe65044 no tabs 2016-06-27 01:46:05 +02:00
qPCR4vir
37205f0aa9 relative dir 2016-06-27 01:37:09 +02:00
qPCR4vir
a68155c7d7 Build build demos separately. 2016-06-27 01:25:48 +02:00
qPCR4vir
5d094e2864 20 of 55 failed, why sometimes- threading and thread-pool too 2016-06-25 20:35:51 +02:00
qPCR4vir
e134f34930 18 of 55 failed, sometimes- threading and thread-pool too 2016-06-25 20:27:05 +02:00
qPCR4vir
3dd9c7738e 3 more. 16 of 55 failed, 2 sometimes- threading and thread-pool 2016-06-25 20:16:52 +02:00
qPCR4vir
8596da0587 16 of 52 don't pass 2016-06-25 19:52:59 +02:00
qPCR4vir
cb33acf2c3 13 of 52 don't pass 2016-06-25 19:34:59 +02:00
qPCR4vir
c747ebed47 test all 2016-06-25 18:37:41 +02:00