Skip to content

Commit 6e5f96e

Browse files
committed
build: move client and server examples to one examples dir
1 parent c050b16 commit 6e5f96e

30 files changed

Lines changed: 4 additions & 4 deletions

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ set(PROJECT_BUGREPORT_PATH "https://github.com/LibVNC/libvncserver/issues")
1919
set(LIBVNCSERVER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libvncserver)
2020
set(COMMON_DIR ${CMAKE_CURRENT_SOURCE_DIR}/common)
2121
set(LIBVNCCLIENT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libvncclient)
22-
set(LIBVNCSRVEXAMPLE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/examples)
23-
set(LIBVNCCLIEXAMPLE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/client_examples)
22+
set(LIBVNCSRVEXAMPLE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/examples/server)
23+
set(LIBVNCCLIEXAMPLE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/examples/client)
2424
set(TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test)
2525
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
2626
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
@@ -629,14 +629,14 @@ if(WITH_EXAMPLES)
629629
foreach(e ${LIBVNCSERVER_EXAMPLES})
630630
add_executable(examples_${e} ${LIBVNCSRVEXAMPLE_DIR}/${e}.c)
631631
set_target_properties(examples_${e} PROPERTIES OUTPUT_NAME ${e})
632-
set_target_properties(examples_${e} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/examples)
632+
set_target_properties(examples_${e} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/examples/server)
633633
target_link_libraries(examples_${e} vncserver ${CMAKE_THREAD_LIBS_INIT} ${CARBON_LIBRARY} ${IOKIT_LIBRARY} ${IOSURFACE_LIBRARY})
634634
endforeach(e ${LIBVNCSERVER_EXAMPLES})
635635

636636
foreach(e ${LIBVNCCLIENT_EXAMPLES})
637637
add_executable(client_examples_${e} ${LIBVNCCLIEXAMPLE_DIR}/${e}.c ${LIBVNCCLIEXAMPLE_DIR}/${${e}_EXTRA_SOURCES} )
638638
set_target_properties(client_examples_${e} PROPERTIES OUTPUT_NAME ${e})
639-
set_target_properties(client_examples_${e} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/client_examples)
639+
set_target_properties(client_examples_${e} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/examples/client)
640640
target_link_libraries(client_examples_${e} vncclient ${CMAKE_THREAD_LIBS_INIT} ${SDL2_LIBRARY} ${GTK2_LIBRARIES} ${FFMPEG_LIBRARIES} ${LIBSSH2_LIBRARY})
641641
endforeach(e ${LIBVNCCLIENT_EXAMPLES})
642642
endif(WITH_EXAMPLES)

0 commit comments

Comments
 (0)