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

fix

Browse Source
This commit is contained in:
qPCR4vir 2016-02-12 02:54:40 +01:00
parent 568feb16c6
commit 5aec3d4b74
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -69,6 +69,6 @@ before_script :
- cd bld - cd bld
script: script:
- cmake -G"Unix Makefiles" .. -DENABLE_JPEG=ON -DENABLE_PNG=OFF -DBUILD_NANA_DEMOS=ON - cmake -G"Unix Makefiles" .. -DENABLE_JPEG=ON -DENABLE_PNG=OFF -DBUILD_NANA_DEMOS=ON -DENABLE_AUDIO=OFF
#-DENABLE_JPEG=ON -DENABLE_PNG=ON
- make - make

25
CMakeLists.txt
View File

@ -114,7 +114,7 @@ endif(ENABLE_JPEG)
if(ENABLE_AUDIO) if(ENABLE_AUDIO)
add_definitions(-DNANA_ENABLE_AUDIO) add_definitions(-DNANA_ENABLE_AUDIO)
if(UNIX) if(UNIX)
find_package(asound) find_package(ASOUND)
if (ASOUND_FOUND) if (ASOUND_FOUND)
include_directories( ${ASOUND_INCLUDE_DIRS}) include_directories( ${ASOUND_INCLUDE_DIRS})
list(APPEND NANA_LINKS -lasound ) list(APPEND NANA_LINKS -lasound )
@ -207,7 +207,8 @@ if (BUILD_NANA_DEMOS)
set(CMAKE_INSTALL_PREFIX ) set(CMAKE_INSTALL_PREFIX )
add_executable(file_explorer ../nana-demo/file_explorer.cpp) add_executable(file_explorer ../nana-demo/file_explorer.cpp)
set_property( TARGET file_explorer PROPERTY CXX_STANDARD 14 ) set_property( TARGET file_explorer PROPERTY CXX_STANDARD 14 )
target_link_libraries(file_explorer ${PROJECT_NAME} ) #X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB} target_link_libraries(file_explorer ${PROJECT_NAME} )
#X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB}
install(TARGETS file_explorer RUNTIME DESTINATION &{DEMO_BIN}) install(TARGETS file_explorer RUNTIME DESTINATION &{DEMO_BIN})
add_executable(calculator ../nana-demo/calculator.cpp) add_executable(calculator ../nana-demo/calculator.cpp)
@ -224,35 +225,36 @@ if (BUILD_NANA_DEMOS)
add_executable(notepad ../nana-demo/notepad.cpp) add_executable(notepad ../nana-demo/notepad.cpp)
set_property( TARGET notepad PROPERTY CXX_STANDARD 14 ) set_property( TARGET notepad PROPERTY CXX_STANDARD 14 )
target_link_libraries(notepad ${PROJECT_NAME} #) X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB}) target_link_libraries(notepad ${PROJECT_NAME} )# X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
install(TARGETS notepad RUNTIME DESTINATION &{DEMO_BIN}) install(TARGETS notepad RUNTIME DESTINATION &{DEMO_BIN})
add_executable(widget_show ../nana-demo/widget_show.cpp) add_executable(widget_show ../nana-demo/widget_show.cpp)
set_property( TARGET widget_show PROPERTY CXX_STANDARD 14 ) set_property( TARGET widget_show PROPERTY CXX_STANDARD 14 )
target_link_libraries(widget_show ${PROJECT_NAME}#) X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB}) target_link_libraries(widget_show ${PROJECT_NAME})# X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
install(TARGETS widget_show RUNTIME DESTINATION &{DEMO_BIN}) install(TARGETS widget_show RUNTIME DESTINATION &{DEMO_BIN})
add_executable(widget_show2 ../nana-demo/widget_show2.cpp) add_executable(widget_show2 ../nana-demo/widget_show2.cpp)
set_property( TARGET widget_show2 PROPERTY CXX_STANDARD 14 ) set_property( TARGET widget_show2 PROPERTY CXX_STANDARD 14 )
target_link_libraries(widget_show2 ${PROJECT_NAME}#) X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB}) target_link_libraries(widget_show2 ${PROJECT_NAME})# X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
install(TARGETS widget_show2 RUNTIME DESTINATION &{DEMO_BIN}) install(TARGETS widget_show2 RUNTIME DESTINATION &{DEMO_BIN})
add_executable(a_group_impl ../nana-demo/Examples/a_group_impl.cpp) add_executable(a_group_impl ../nana-demo/Examples/a_group_impl.cpp)
set_property( TARGET a_group_impl PROPERTY CXX_STANDARD 14 ) set_property( TARGET a_group_impl PROPERTY CXX_STANDARD 14 )
target_link_libraries(a_group_impl ${PROJECT_NAME}#) X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB}) target_link_libraries(a_group_impl ${PROJECT_NAME})# X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
add_executable(animate-bmp ../nana-demo/Examples/animate-bmp.cpp) add_executable(animate-bmp ../nana-demo/Examples/animate-bmp.cpp)
set_property( TARGET animate-bmp PROPERTY CXX_STANDARD 14 ) set_property( TARGET animate-bmp PROPERTY CXX_STANDARD 14 )
target_link_libraries(animate-bmp ${PROJECT_NAME}#) X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB}) target_link_libraries(animate-bmp ${PROJECT_NAME})# X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
if (ENABLE_AUDIO)
add_executable(audio_player ../nana-demo/Examples/audio_player.cpp) add_executable(audio_player ../nana-demo/Examples/audio_player.cpp)
set_property( TARGET audio_player PROPERTY CXX_STANDARD 14 ) set_property( TARGET audio_player PROPERTY CXX_STANDARD 14 )
target_link_libraries(audio_player ${PROJECT_NAME} #) X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB}) target_link_libraries(audio_player ${PROJECT_NAME} )
endif(ENABLE_AUDIO)
#add_executable(nana_test test.cpp) #add_executable(nana_test test.cpp)
#set_property( TARGET nana_test PROPERTY CXX_STANDARD 14 ) #set_property( TARGET nana_test PROPERTY CXX_STANDARD 14 )
#target_link_libraries(nana_test ${PROJECT_NAME}#) X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB}) #target_link_libraries(nana_test ${PROJECT_NAME})# X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
#set(NANA_DEMOS_DIR ${CMAKE_SOURCE_DIR}/../nana-demo) #set(NANA_DEMOS_DIR ${CMAKE_SOURCE_DIR}/../nana-demo)
#set(NANA_EXAMPLES_DIR ${CMAKE_SOURCE_DIR}/../Examples/nana-demo/) #set(NANA_EXAMPLES_DIR ${CMAKE_SOURCE_DIR}/../Examples/nana-demo/)
@ -263,7 +265,7 @@ if (BUILD_NANA_DEMOS)
# string( REPLACE ".cpp" "" demoname ${demofile} ) # string( REPLACE ".cpp" "" demoname ${demofile} )
# add_executable( ${demoname} ${demofile} ) # add_executable( ${demoname} ${demofile} )
# set_property( TARGET ${demoname} PROPERTY CXX_STANDARD 14 ) # set_property( TARGET ${demoname} PROPERTY CXX_STANDARD 14 )
# target_link_libraries(${demoname} ${PROJECT_NAME} #) X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB}) # target_link_libraries(${demoname} ${PROJECT_NAME} )# X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
#endforeach( demofile ${DEMO_SOURCES} ) #endforeach( demofile ${DEMO_SOURCES} )
endif(BUILD_NANA_DEMOS) endif(BUILD_NANA_DEMOS)
@ -295,3 +297,4 @@ message ( "CMAKE_CXX_FLAGS= " ${CMAKE_CXX_FLAGS})
message ( "CMAKE_COMPILER_IS_GNUCXX= " ${CMAKE_COMPILER_IS_GNUCXX}) message ( "CMAKE_COMPILER_IS_GNUCXX= " ${CMAKE_COMPILER_IS_GNUCXX})
message ( "CMAKE_EXE_LINKER_FLAGS = " ${CMAKE_EXE_LINKER_FLAGS}) message ( "CMAKE_EXE_LINKER_FLAGS = " ${CMAKE_EXE_LINKER_FLAGS})
message ( "NANA_LINKS = " ${NANA_LINKS}) message ( "NANA_LINKS = " ${NANA_LINKS})
message ( "ENABLE_AUDIO = " ${ENABLE_AUDIO})