135 Commits

Author SHA1 Message Date
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
Ac
b486823177 add cmake option for dynamic linking 2017-10-05 09:59:32 +09:00
qPCR4vir
c13b665594 CLion cmake workaround 2017-09-07 12:36:02 +02:00
Jinhao
3cefaa3506 Merge branch 'hotfix-1.5.1' into develop 2017-06-08 21:40:32 +08:00
Yuchen Deng
a5660773cb Add '_d' suffix for debug library
example for use:
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
    target_link_libraries(${PROJECT_NAME} LINK_PRIVATE debug nana_d optimized nana)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    target_link_libraries(${PROJECT_NAME} LINK_PRIVATE nana)
endif()
2017-05-24 21:49:08 +08:00
codicodi
d85383e0f8 CMake: fix NANA_LINKS for MSVC 2017-05-14 15:16:14 +02:00
Yuchen Deng
b4e66b95be CMake for MSVC: Add option to use static runtime on default 2017-04-28 18:51:40 +08:00
agito
e21629f3d7 Use target_include_directories to propagate includes 2017-01-19 13:08:46 +01:00
qPCR4vir
bb79dcbefc return optional librarirs first in cmake 2016-06-30 16:35:11 +02:00
qPCR4vir
87d8f692c5 cleaning 2016-06-30 15:57:41 +02:00
qPCR4vir
26a2b5ac63 put in ../nana_lib the lib and the includes 2016-06-27 13:00:44 +02:00
qPCR4vir
a68155c7d7 Build build demos separately. 2016-06-27 01:25:48 +02:00
qPCR4vir
88c29e7ac1 Add a new example; textbox_line_number 2016-06-25 18:34:36 +02:00
qPCR4vir
55360a40e3 foreach ( test ${${files}}) 2016-06-25 18:19:31 +02:00
qPCR4vir
c99759ca67 endfunction 2016-06-25 18:11:42 +02:00
qPCR4vir
502171cc4f function(set_nana_test dir files) 2016-06-25 14:50:25 +02:00
qPCR4vir
91da8d1772 foreach 2016-06-25 13:59:10 +02:00
qPCR4vir
a417b17e30 reorganize tests 2016-06-25 13:55:38 +02:00
Jinhao
1365e1f4e0 restore travis and CMakeLists 2016-06-25 06:05:59 +08:00
Jinhao
5294b4662d debug travis 2016-06-24 12:30:33 +08:00
Jinhao
208626a27f debug a crash for travis 2016-06-24 12:02:38 +08:00
Jinhao
2f86b26075 update CMakeLists.txt 2016-06-24 03:17:33 +08:00
Jinhao
12678e47c5 Merge branch 'hotfix-1.3' into develop 2016-06-24 03:06:23 +08:00
qPCR4vir
9975984d91 set POLICY CMP0004 OLD # ignore leading space 2016-06-23 16:01:39 +02:00
qPCR4vir
1626e8193b reorganize 2016-06-23 15:43:09 +02:00
qPCR4vir
e918fa604e leading space ? 2016-06-23 15:05:22 +02:00
qPCR4vir
8fed40f334 leding space is an error 2016-06-23 14:52:53 +02:00
qPCR4vir
9a85b5315a trailing space is an error 2016-06-23 14:44:15 +02:00
qPCR4vir
972ecc97ac improve NANA_LINKS ? 2016-06-23 14:36:24 +02:00
Ariel Vina-Rodriguez
dfdf122ee2 NANA_LINKS " -lstdc++fs 2016-06-22 18:10:35 +02:00
Ariel Vina-Rodriguez
f59dfb9949 # set (CMAKE_STATIC_LINKER_FLAGS 2016-06-22 17:52:16 +02:00
Ariel Vina-Rodriguez
f22cb91557 return to using NANA_LINKS only 2016-06-22 16:44:50 +02:00
Ariel Vina-Rodriguez
fe90da19a2 CMAKE_STATIC_LINKER_FLAGS append? 2016-06-22 16:04:14 +02:00
Ariel Vina-Rodriguez
179750630c CMAKE_STATIC_LINKER_FLAGS ? 2016-06-22 15:48:56 +02:00
Jinhao
0cd9be4641 remove test widget_show2 2016-06-22 12:08:46 +08:00
Ariel Vina-Rodriguez
7c44842350 forgot ${CMAKE_EXE_LINKER_FLAGS} -L/opt/X11/lib/ 2016-06-22 00:56:53 +02:00
Ariel Vina-Rodriguez
4e536eeff9 fixing linking 2016-06-21 23:24:52 +02:00
qPCR4vir
477ea05ced FIX linking with CMake - CLion - gcc 5.1 2016-06-21 20:46:09 +02:00
qPCR4vir
067eeff3dd improve verbose_preprocessor 2016-06-21 20:43:36 +02:00
Jinhao
9201ca5d79 remove test widget_show 2016-06-22 01:46:02 +08:00
Jinhao
e462eb8f74 remove test folder_tree_std 2016-06-21 23:39:27 +08:00
Jinhao
05fd4f797d remove test file_explorer 2016-06-21 23:28:39 +08:00
qPCR4vir
b3e9e2d979 FIX ? add link flag -lstdc++fs to use fs in gcc >= 5.3 2016-06-20 17:14:35 +02:00
qPCR4vir
a46991673b avoid duplicate listing of source dir 2016-06-20 17:13:22 +02:00
qPCR4vir
8d2d240d62 comments in cmake list file 2016-06-20 17:10:18 +02:00
Pr0curo
bb53c4c1ec correct workaround for missing thread support
the Workaround from MeganZ (I suppose you refere to this one: https://github.com/meganz/mingw-std-threads) hast some flaws: <thread> is not available, <phread.h> is not available and EPROTO is already defined (but with 53 instead of 71)
2016-03-16 09:16:55 +01:00
qPCR4vir
2c04ba7bf3 all demos added because exec() don't need main form to exit_all 2016-03-05 03:17:49 +01:00