Merge branch 'qPCR4vir-minor_change' into develop

This commit is contained in:
Jinhao 2019-12-14 06:02:02 +08:00
commit 0b94dc80ae
2 changed files with 2 additions and 52 deletions

View File

@ -69,63 +69,12 @@ services:
script: script:
- cmake -G"Unix Makefiles" ../nana-demo -DCMAKE_INSTALL_PREFIX=.. -DNANA_CMAKE_ENABLE_JPEG=ON -DNANA_CMAKE_FIND_BOOST_FILESYSTEM=OFF -DNANA_CMAKE_AUTOMATIC_GUI_TESTING=ON -DNANA_CMAKE_INSTALL=OFF - cmake -G"Unix Makefiles" ../nana-demo -DCMAKE_INSTALL_PREFIX=.. -DNANA_CMAKE_ENABLE_JPEG=ON -DNANA_CMAKE_FIND_BOOST_FILESYSTEM=OFF -DNANA_CMAKE_AUTOMATIC_GUI_TESTING=ON -DNANA_CMAKE_INSTALL=OFF
- make install - make install
- ctest --verbose # todo set correct working directory, and show output
# we have installed in 'user'/ ('user'/demo-build/..), and cmake created 'user'/nana-test/ # we have installed in 'user'/ ('user'/demo-build/..), and cmake created 'user'/nana-test/
# todo: separate resources from sources (a directory for images) # todo: separate resources from sources (a directory for images)
- ls - ls
# we were still in: 'user'/demo-build/ # we were still in: 'user'/demo-build/
- cd ../nana-test/bin - cd ../nana-test/bin
- ls -lh - ls -lh
- ./a_group_impl
- ./animate-bmp
- ./audio_player
- ./background-effects
- ./calculator # COOL !!! https://travis-ci.org/qPCR4vir/nana/builds/621103509#L924
- ./categ
- ./clicked
- ./decore
- ./dock
- ./drag-button
- ./draw
- ./file_explorer
- ./example_menu # OK ! https://travis-ci.org/qPCR4vir/nana/builds/621103509#L1022
- ./example_listbox
- ./example_combox # OK ! https://travis-ci.org/qPCR4vir/nana/builds/621103509#L1044
- ./example.button
# - ./filebox-txt # https://travis-ci.org/qPCR4vir/nana/builds/621103509#L1068
- ./folder_tree_nana # todo failed https://travis-ci.org/qPCR4vir/nana/builds/621116812#L1193
- ./folder_tree_std # todo failed https://travis-ci.org/qPCR4vir/nana/builds/621116812#L1200
- ./framework_design_1
- ./framework_design_2
- ./framework_design_3
- ./group
- ./HelloWord
- ./helloword_quit # ok
- ./inputbox # ok
- ./label_listener
- ./lambda_event.Cpp11
- ./listbox_inline_widget
- ./listbox_Resolver
- ./loader_1
- ./loader_2 # ok
- ./mbox
- ./main
- ./menu_debug
- ./modal_form # ok
- ./MontiHall # ok
- ./helloworld_demo # ok
- ./notepad # ok !!
- ./menu_popuper
- ./widget_show2 # ok !!
- ./widget_show # ok !!
- ./place_login
- ./png
- ./screen # ok
- ./stretch_image
- ./textbox_line_number
- ./threading # ok
- ./thread-pool # ok
- ./various_events
- ./window-dragger # ok
- ./windows-subclassing

View File

@ -161,6 +161,7 @@ else()
Set NANA_CMAKE_NANA_FILESYSTEM_FORCE to ON to avoid this warning.") Set NANA_CMAKE_NANA_FILESYSTEM_FORCE to ON to avoid this warning.")
target_compile_definitions(nana PUBLIC STD_FILESYSTEM_NOT_SUPPORTED) target_compile_definitions(nana PUBLIC STD_FILESYSTEM_NOT_SUPPORTED)
set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_ORIGINAL}) set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_ORIGINAL})
set (CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS_ORIGINAL}")
endif () endif ()
endif () endif ()
endif () endif ()