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

Link to libjpeg and libpng when appropriate

Browse Source
This commit is contained in:
nabijaczleweli-vm 2016-02-11 18:20:50 +01:00 committed by qPCR4vir
parent 48a9edc61d
commit ea4bac6e9c
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CMakeLists.txt
View File

@ -74,6 +74,7 @@ endif(UNIX)
#Find PNG #Find PNG
if(ENABLE_PNG) if(ENABLE_PNG)
add_definitions(-DNANA_ENABLE_PNG) add_definitions(-DNANA_ENABLE_PNG)
set(NANA_PNG_LIB "png")
if(LIBPNG_FROM_OS) if(LIBPNG_FROM_OS)
find_package(PNG) find_package(PNG)
if (PNG_FOUND) if (PNG_FOUND)
@ -81,11 +82,14 @@ if(ENABLE_PNG)
add_definitions(-DUSE_LIBPNG_FROM_OS) add_definitions(-DUSE_LIBPNG_FROM_OS)
endif(PNG_FOUND) endif(PNG_FOUND)
endif(LIBPNG_FROM_OS) endif(LIBPNG_FROM_OS)
else(ENABLE_PNG)
set(NANA_PNG_LIB "")
endif(ENABLE_PNG) endif(ENABLE_PNG)
#Find JPEG #Find JPEG
if(ENABLE_JPEG) if(ENABLE_JPEG)
add_definitions(-DNANA_ENABLE_JPEG) add_definitions(-DNANA_ENABLE_JPEG)
set(NANA_JPEG_LIB "jpeg")
if(LIBJPEG_FROM_OS) if(LIBJPEG_FROM_OS)
find_package(JPEG) find_package(JPEG)
if (JPEG_FOUND) if (JPEG_FOUND)
@ -93,6 +97,8 @@ if(ENABLE_JPEG)
add_definitions(-DUSE_LIBJPEG_FROM_OS) add_definitions(-DUSE_LIBJPEG_FROM_OS)
endif(JPEG_FOUND) endif(JPEG_FOUND)
endif(LIBJPEG_FROM_OS) endif(LIBJPEG_FROM_OS)
else(ENABLE_JPEG)
set(NANA_JPEG_LIB "")
endif(ENABLE_JPEG) endif(ENABLE_JPEG)
if(ENABLE_AUDIO) if(ENABLE_AUDIO)
@ -189,52 +195,52 @@ 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) 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)
set_property( TARGET calculator PROPERTY CXX_STANDARD 14 ) set_property( TARGET calculator PROPERTY CXX_STANDARD 14 )
target_link_libraries(calculator ${PROJECT_NAME} X11 Xft) target_link_libraries(calculator ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
install(TARGETS calculator RUNTIME DESTINATION &{DEMO_BIN}) install(TARGETS calculator RUNTIME DESTINATION &{DEMO_BIN})
if (BUILD_FreeMe) if (BUILD_FreeMe)
add_executable(FreeMe ../nana-demo/FreeMe.cpp) add_executable(FreeMe ../nana-demo/FreeMe.cpp)
set_property( TARGET FreeMe PROPERTY CXX_STANDARD 14 ) set_property( TARGET FreeMe PROPERTY CXX_STANDARD 14 )
target_link_libraries(FreeMe ${PROJECT_NAME} X11 Xft) target_link_libraries(FreeMe ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
install(TARGETS FreeMe RUNTIME DESTINATION &{DEMO_BIN}) install(TARGETS FreeMe RUNTIME DESTINATION &{DEMO_BIN})
endif (BUILD_FreeMe) endif (BUILD_FreeMe)
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) 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) 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) 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) 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) target_link_libraries(animate-bmp ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
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) target_link_libraries(audio_player ${PROJECT_NAME} X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
#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) #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/)
@ -245,7 +251,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) # 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)