diff --git a/CMakeLists.txt b/CMakeLists.txt index f740dae9..977ce873 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,13 +19,8 @@ option(CMAKE_VERBOSE_PREPROCESSOR "Show annoying debug messages during compilati option(CMAKE_STOP_VERBOSE_PREPROCESSOR "Stop compilation after showing the annoying debug messages." ON) option(BUILD_NANA_DEMOS "Build all the demos form the nana_demo repository." OFF) -message(" ---> Running cmake .... ") - message ( "CMAKE_CXX_COMPILER_ID= " ${CMAKE_CXX_COMPILER_ID}) - message ( "COMPILER_IS_CLANG= " ${COMPILER_IS_CLANG}) - message ( "CMAKE_CXX_FLAGS= " ${CMAKE_CXX_FLAGS}) - + set(NANA_LINKS) -set(NANA_SOURCES) project(nana) cmake_minimum_required(VERSION 2.8) @@ -63,6 +58,7 @@ if(APPLE) add_definitions(-DAPPLE) include_directories(/opt/X11/include/) list(APPEND NANA_LINKS -L/opt/X11/lib/ -liconv) + set(ENABLE_AUDIO OFF) elseif(UNIX) add_definitions(-Dlinux) message("added -D linux") @@ -133,10 +129,6 @@ include_directories(${NANA_INCLUDE_DIR}) aux_source_directory(${NANA_SOURCE_DIR} NANA_SOURCE) aux_source_directory(${NANA_SOURCE_DIR}/detail NANA_DETAIL_SOURCE) aux_source_directory(${NANA_SOURCE_DIR}/filesystem NANA_FILESYSTEM_SOURCE) -if(NOT APPLE) -aux_source_directory(${NANA_SOURCE_DIR}/audio NANA_AUDIO_SOURCE) -aux_source_directory(${NANA_SOURCE_DIR}/audio/detail NANA_AUDIO_DETAIL_SOURCE) -endif() aux_source_directory(${NANA_SOURCE_DIR}/gui NANA_GUI_SOURCE) aux_source_directory(${NANA_SOURCE_DIR}/gui/detail NANA_GUI_DETAIL_SOURCE) aux_source_directory(${NANA_SOURCE_DIR}/gui/widgets NANA_GUI_WIDGETS_SOURCE) @@ -145,11 +137,14 @@ aux_source_directory(${NANA_SOURCE_DIR}/paint NANA_PAINT_SOURCE) aux_source_directory(${NANA_SOURCE_DIR}/paint/detail NANA_PAINT_DETAIL_SOURCE) aux_source_directory(${NANA_SOURCE_DIR}/system NANA_SYSTEM_SOURCE) aux_source_directory(${NANA_SOURCE_DIR}/threads NANA_THREADS_SOURCE) +if(ENABLE_AUDIO) + aux_source_directory(${NANA_SOURCE_DIR}/audio NANA_AUDIO_SOURCE) + aux_source_directory(${NANA_SOURCE_DIR}/audio/detail NANA_AUDIO_DETAIL_SOURCE) +endif() #To show .h files in Visual Studio, add them to the list of sources in add_executable / add_library #and Use SOURCE_GROUP if all your sources are in the same directory -if(NOT APPLE) add_library(${PROJECT_NAME} ${NANA_SOURCE} ${NANA_DETAIL_SOURCE} ${NANA_FILESYSTEM_SOURCE} @@ -163,25 +158,7 @@ add_library(${PROJECT_NAME} ${NANA_SOURCE} ${NANA_PAINT_DETAIL_SOURCE} ${NANA_SYSTEM_SOURCE} ${NANA_THREADS_SOURCE}) -endif (NOT APPLE) - -if(APPLE) -add_library(${PROJECT_NAME} ${NANA_SOURCE} - ${NANA_DETAIL_SOURCE} - ${NANA_FILESYSTEM_SOURCE} - ${NANA_AUDIO_SOURCE} - ${NANA_AUDIO_DETAIL_SOURCE} - ${NANA_GUI_SOURCE} - ${NANA_GUI_DETAIL_SOURCE} - ${NANA_GUI_WIDGETS_SOURCE} - ${NANA_GUI_WIDGETS_SKELETONS_SOURCE} - ${NANA_PAINT_SOURCE} - ${NANA_PAINT_DETAIL_SOURCE} - ${NANA_SYSTEM_SOURCE} - ${NANA_THREADS_SOURCE}) -endif(APPLE) - #Headers: use INCLUDE_DIRECTORIES # Libraries: use FIND_LIBRARY and link with the result of it (try to avoid LINK_DIRECTORIES target_link_libraries(${PROJECT_NAME} ${NANA_LINKS}) @@ -196,19 +173,13 @@ install(DIRECTORY ${NANA_INCLUDE_DIR}/nana DESTINATION include) set_property( TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14 ) +# TODO: move this nana-demo section to the nana demo repository, and here only include that cmake file if (BUILD_NANA_DEMOS) set (CMAKE_INSTALL_PREFIX ${DEMO_BIN}) set(DEMO_BIN ${NANA_SOURCE_DIR}../nana-demo/bin) set(CMAKE_INSTALL_PREFIX ) - if (OFF) - add_executable(file_explorer ../nana-demo/file_explorer.cpp) - set_property( TARGET file_explorer PROPERTY CXX_STANDARD 14 ) - target_link_libraries(file_explorer ${PROJECT_NAME} ) - install(TARGETS file_explorer RUNTIME DESTINATION &{DEMO_BIN}) - endif(OFF) - add_executable(calculator ../nana-demo/calculator.cpp) set_property( TARGET calculator PROPERTY CXX_STANDARD 14 ) target_link_libraries(calculator ${PROJECT_NAME} ) @@ -226,7 +197,8 @@ if (BUILD_NANA_DEMOS) target_link_libraries(notepad ${PROJECT_NAME} ) install(TARGETS notepad RUNTIME DESTINATION &{DEMO_BIN}) - if (OFF) + if (OFF) # temporal: we need to adapt the use of filesystem to nana v1.03 (no file iterator) + add_executable(widget_show ../nana-demo/widget_show.cpp) set_property( TARGET widget_show PROPERTY CXX_STANDARD 14 ) target_link_libraries(widget_show ${PROJECT_NAME}) @@ -236,6 +208,12 @@ if (BUILD_NANA_DEMOS) set_property( TARGET widget_show2 PROPERTY CXX_STANDARD 14 ) target_link_libraries(widget_show2 ${PROJECT_NAME}) install(TARGETS widget_show2 RUNTIME DESTINATION &{DEMO_BIN}) + + add_executable(file_explorer ../nana-demo/file_explorer.cpp) + set_property( TARGET file_explorer PROPERTY CXX_STANDARD 14 ) + target_link_libraries(file_explorer ${PROJECT_NAME} ) + install(TARGETS file_explorer RUNTIME DESTINATION &{DEMO_BIN}) + endif(OFF) add_executable(a_group_impl ../nana-demo/Examples/a_group_impl.cpp) @@ -246,16 +224,33 @@ if (BUILD_NANA_DEMOS) set_property( TARGET animate-bmp PROPERTY CXX_STANDARD 14 ) target_link_libraries(animate-bmp ${PROJECT_NAME}) - if (ENABLE_AUDIO) + add_executable(background-effects ../nana-demo/Examples/background-effects.cpp) + set_property( TARGET background-effects PROPERTY CXX_STANDARD 14 ) + target_link_libraries(background-effects ${PROJECT_NAME}) + + add_executable(categ ../nana-demo/Examples/categ.cpp) + set_property( TARGET categ PROPERTY CXX_STANDARD 14 ) + target_link_libraries(categ ${PROJECT_NAME}) + + add_executable(clicked ../nana-demo/Examples/clicked.cpp) + set_property( TARGET clicked PROPERTY CXX_STANDARD 14 ) + target_link_libraries(clicked ${PROJECT_NAME}) + + add_executable(decore ../nana-demo/Examples/decore.cpp) + set_property( TARGET decore PROPERTY CXX_STANDARD 14 ) + target_link_libraries(decore ${PROJECT_NAME}) + + add_executable(dock ../nana-demo/Examples/dock.cpp) + set_property( TARGET dock PROPERTY CXX_STANDARD 14 ) + target_link_libraries(dock ${PROJECT_NAME}) + + if (ENABLE_AUDIO) add_executable(audio_player ../nana-demo/Examples/audio_player.cpp) set_property( TARGET audio_player PROPERTY CXX_STANDARD 14 ) target_link_libraries(audio_player ${PROJECT_NAME} ) endif(ENABLE_AUDIO) - #add_executable(nana_test test.cpp) - #set_property( TARGET nana_test PROPERTY CXX_STANDARD 14 ) - #target_link_libraries(nana_test ${PROJECT_NAME}) - + # TODO: make it automatic to select each demo and example and build each. #set(NANA_DEMOS_DIR ${CMAKE_SOURCE_DIR}/../nana-demo) #set(NANA_EXAMPLES_DIR ${CMAKE_SOURCE_DIR}/../Examples/nana-demo/) # https://cmake.org/cmake/help/v3.3/command/file.html?highlight=glob#file @@ -265,8 +260,9 @@ if (BUILD_NANA_DEMOS) # string( REPLACE ".cpp" "" demoname ${demofile} ) # add_executable( ${demoname} ${demofile} ) # set_property( TARGET ${demoname} PROPERTY CXX_STANDARD 14 ) - # target_link_libraries(${demoname} ${PROJECT_NAME} ) + # target_link_libraries(${demoname} ${PROJECT_NAME} )# X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB}) #endforeach( demofile ${DEMO_SOURCES} ) + endif(BUILD_NANA_DEMOS)