mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no calculator

Browse Source
This commit is contained in:
qPCR4vir 2016-03-02 17:18:46 +01:00
parent a5368a26cd
commit a97c326b17
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -71,7 +71,6 @@ before_script :
script: script:
- cmake -G"Unix Makefiles" .. -DNANA_CMAKE_ENABLE_JPEG=ON -DNANA_CMAKE_ENABLE_PNG=OFF -DNANA_CMAKE_BUILD_DEMOS=ON -DNANA_CMAKE_ENABLE_AUDIO=OFF -DNANA_CMAKE_FIND_BOOST_FILESYSTEM=ON -DNANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS=OFF -DNANA_CMAKE_AUTOMATIC_GUI_TESTING=ON -DNANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING=ON - cmake -G"Unix Makefiles" .. -DNANA_CMAKE_ENABLE_JPEG=ON -DNANA_CMAKE_ENABLE_PNG=OFF -DNANA_CMAKE_BUILD_DEMOS=ON -DNANA_CMAKE_ENABLE_AUDIO=OFF -DNANA_CMAKE_FIND_BOOST_FILESYSTEM=ON -DNANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS=OFF -DNANA_CMAKE_AUTOMATIC_GUI_TESTING=ON -DNANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING=ON
- make - make
- ls - ls

7
CMakeLists.txt
View File

@ -264,20 +264,21 @@ if (NANA_CMAKE_BUILD_DEMOS)
add_definitions(-DNANA_ADD_DEF_AUTOMATIC_GUI_TESTING) add_definitions(-DNANA_ADD_DEF_AUTOMATIC_GUI_TESTING)
endif(NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING) endif(NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING)
set (demos calculator helloworld_demo notepad ) set (demos helloworld_demo notepad )
foreach ( demo ${demos}) foreach ( demo ${demos})
add_executable(${demo} "../nana-demo/${demo}.cpp") add_executable(${demo} "../nana-demo/${demo}.cpp")
set_property( TARGET ${demo} PROPERTY CXX_STANDARD 14 ) set_property( TARGET ${demo} PROPERTY CXX_STANDARD 14 )
target_link_libraries(${demo} ${PROJECT_NAME}) target_link_libraries(${demo} ${PROJECT_NAME})
if(NANA_CMAKE_AUTOMATIC_GUI_TESTING) if(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
add_custom_command( TARGET ${demo} POST_BUILD COMMAND ${demo} ) #add_custom_command( TARGET ${demo} POST_BUILD COMMAND ${demo} )
add_custom_target(do_always_${demo} ALL COMMAND ${demo})
endif(NANA_CMAKE_AUTOMATIC_GUI_TESTING) endif(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
install(TARGETS ${demo} RUNTIME DESTINATION "../nana-demo/") install(TARGETS ${demo} RUNTIME DESTINATION "../nana-demo/")
message("... to build: ../nana-demo/${demo}.cpp" ) message("... to build: ../nana-demo/${demo}.cpp" )
endforeach( demo ${demos}) endforeach( demo ${demos})
set (demos widget_show widget_show2 ) set (demos calculator widget_show widget_show2 )
if (NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS) if (NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS)
list(APPEND demos file_explorer FreeMe) list(APPEND demos file_explorer FreeMe)