Skip to content

Commit

Permalink
do not add gtkdatabox+goocanvas without GTK2, fixes robotology#237
Browse files Browse the repository at this point in the history
  • Loading branch information
paulfitz committed Sep 24, 2014
1 parent 628c8fd commit 71bc2a1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions extern/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if(YARP_USE_SQLITE AND NOT YARP_USE_SYSTEM_SQLITE)
set(SQLite_DEFINITIONS ${SQLite_DEFINITIONS} PARENT_SCOPE)
endif(YARP_USE_SQLITE AND NOT YARP_USE_SYSTEM_SQLITE)

if(CREATE_YARPSCOPE)
if(CREATE_YARPSCOPE AND YARP_HAS_GTK2)
# GtkDatabox
if(YARP_USE_GTKDATABOX AND NOT YARP_USE_SYSTEM_GTKDATABOX)
add_subdirectory(gtkdatabox)
Expand All @@ -41,9 +41,9 @@ if(CREATE_YARPSCOPE)
set(GtkDataboxMM_LIBRARIES ${GtkDataboxMM_LIBRARIES} PARENT_SCOPE)
set(GtkDataboxMM_DEFINITIONS ${GtkDataboxMM_DEFINITIONS} PARENT_SCOPE)
endif(YARP_USE_GTKDATABOXMM AND NOT YARP_USE_SYSTEM_GTKDATABOXMM)
endif(CREATE_YARPSCOPE)
endif()

if(CREATE_GYARPBUILDER)
if(CREATE_GYARPBUILDER AND YARP_HAS_GTK2)
# GooCanvas
if(YARP_USE_GOOCANVAS AND NOT YARP_USE_SYSTEM_GOOCANVAS)
add_subdirectory(goocanvas)
Expand All @@ -59,4 +59,4 @@ if(CREATE_GYARPBUILDER)
set(GooCanvasMM_LIBRARIES ${GooCanvasMM_LIBRARIES} PARENT_SCOPE)
set(GooCanvasMM_DEFINITIONS ${GooCanvasMM_DEFINITIONS} PARENT_SCOPE)
endif(YARP_USE_GOOCANVASMM AND NOT YARP_USE_SYSTEM_GOOCANVASMM)
endif(CREATE_GYARPBUILDER)
endif()

0 comments on commit 71bc2a1

Please sign in to comment.