Menu
▾
▴
[Opensync-commits] r5742 - in trunk: . docs/examples/applications docs/examples/applications/src
|
From: <svn...@op...> - 2009-09-04 20:46:08
|
Author: dgollub Date: Fri Sep 4 22:45:50 2009 New Revision: 5742 URL: http://www.opensync.org/changeset/5742 Log: Introduce cmake option OPENSYNC_API_EXAMPLE, to enable API example builds. By default this is turned off. Added: trunk/docs/examples/applications/src/ trunk/docs/examples/applications/src/CMakeLists.txt - copied, changed from r5741, trunk/docs/examples/applications/CMakeLists.txt trunk/docs/examples/applications/src/list_all_formats.c - copied unchanged from r5741, trunk/docs/examples/applications/list_all_formats.c trunk/docs/examples/applications/src/list_all_groups.c - copied unchanged from r5741, trunk/docs/examples/applications/list_all_groups.c trunk/docs/examples/applications/src/list_all_plugins.c - copied unchanged from r5741, trunk/docs/examples/applications/list_all_plugins.c Deleted: trunk/docs/examples/applications/list_all_formats.c trunk/docs/examples/applications/list_all_groups.c trunk/docs/examples/applications/list_all_plugins.c Modified: trunk/CMakeLists.txt trunk/docs/examples/applications/CMakeLists.txt Modified: trunk/CMakeLists.txt ============================================================================== --- trunk/CMakeLists.txt Fri Sep 4 22:17:46 2009 (r5741) +++ trunk/CMakeLists.txt Fri Sep 4 22:45:50 2009 (r5742) @@ -54,6 +54,7 @@ INCLUDE( Documentation ) INCLUDE( OpenSyncDefaults ) INCLUDE( OpenSyncPackaging ) +INCLUDE( OpenSyncPlugin ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/opensync" ${CMAKE_CURRENT_SOURCE_DIR} ) @@ -91,7 +92,12 @@ ADD_SUBDIRECTORY( misc ) ADD_SUBDIRECTORY( cmake ) -#ADD_SUBDIRECTORY( docs/example-plugin/src/ ) +OPTION( OPENSYNC_API_EXAMPLE "enable build of OpenSync API examples" OFF ) +IF ( OPENSYNC_API_EXAMPLE ) + SET( OPENSYNC_LIBRARIES opensync ) + ADD_SUBDIRECTORY( docs/examples/plugins/src/ ) + ADD_SUBDIRECTORY( docs/examples/applications/src/ ) +ENDIF ( OPENSYNC_API_EXAMPLE ) OPTION( ENABLE_WRAPPER "enable wrapper" OFF ) IF ( SWIG_FOUND ) Modified: trunk/docs/examples/applications/CMakeLists.txt ============================================================================== --- trunk/docs/examples/applications/CMakeLists.txt Fri Sep 4 22:17:46 2009 (r5741) +++ trunk/docs/examples/applications/CMakeLists.txt Fri Sep 4 22:45:50 2009 (r5742) @@ -7,21 +7,5 @@ FIND_PACKAGE( OpenSync REQUIRED ) #INCLUDE( OpenSyncInternal ) -LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ) -INCLUDE_DIRECTORIES( ${OPENSYNC_INCLUDE_DIRS} ) +ADD_SUBDIRECTORY( src ) -# create executables -SET( appl_SRCS list_all_groups.c ) -SET( appl_NAME list_all_groups ) -ADD_EXECUTABLE( ${appl_NAME} ${appl_SRCS} ) -TARGET_LINK_LIBRARIES( ${appl_NAME} ${OPENSYNC_LIBRARIES} ) - -SET( appl_SRCS list_all_plugins.c ) -SET( appl_NAME list_all_plugins ) -ADD_EXECUTABLE( ${appl_NAME} ${appl_SRCS} ) -TARGET_LINK_LIBRARIES( ${appl_NAME} ${OPENSYNC_LIBRARIES} ) - -SET( appl_SRCS list_all_formats.c ) -SET( appl_NAME list_all_formats ) -ADD_EXECUTABLE( ${appl_NAME} ${appl_SRCS} ) -TARGET_LINK_LIBRARIES( ${appl_NAME} ${OPENSYNC_LIBRARIES} ) \ No newline at end of file Copied and modified: trunk/docs/examples/applications/src/CMakeLists.txt (from r5741, trunk/docs/examples/applications/CMakeLists.txt) ============================================================================== --- trunk/docs/examples/applications/CMakeLists.txt Fri Sep 4 22:17:46 2009 (r5741, copy source) +++ trunk/docs/examples/applications/src/CMakeLists.txt Fri Sep 4 22:45:50 2009 (r5742) @@ -1,12 +1,3 @@ -PROJECT( opensync-example-applications C ) - -cmake_minimum_required(VERSION 2.4.4) - -SET( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules" ) - -FIND_PACKAGE( OpenSync REQUIRED ) -#INCLUDE( OpenSyncInternal ) - LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ) INCLUDE_DIRECTORIES( ${OPENSYNC_INCLUDE_DIRS} ) @@ -24,4 +15,4 @@ SET( appl_SRCS list_all_formats.c ) SET( appl_NAME list_all_formats ) ADD_EXECUTABLE( ${appl_NAME} ${appl_SRCS} ) -TARGET_LINK_LIBRARIES( ${appl_NAME} ${OPENSYNC_LIBRARIES} ) \ No newline at end of file +TARGET_LINK_LIBRARIES( ${appl_NAME} ${OPENSYNC_LIBRARIES} ) |
