Cleanup

xubingyue · Nov 11, 2014 · 01e9724 · 01e9724
1 parent cf88d0b
commit 01e9724
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -5,7 +5,7 @@
 # Do not build extern stuff with experimental warnings
 if(YARP_EXPERIMENTAL_WARNINGS)
     string(REPLACE "${EXPERIMENTAL_WARNING_FLAGS} " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-endif(YARP_EXPERIMENTAL_WARNINGS)
+endif()
 
 if(CREATE_YARPSCOPE OR CREATE_GYARPMANAGER OR CREATE_YMANAGER)
     # TinyXML
@@ -14,16 +14,16 @@ if(CREATE_YARPSCOPE OR CREATE_GYARPMANAGER OR CREATE_YMANAGER)
         set(TinyXML_INCLUDE_DIRS ${TinyXML_INCLUDE_DIRS} PARENT_SCOPE)
         set(TinyXML_LIBRARIES ${TinyXML_LIBRARIES} PARENT_SCOPE)
         set(TinyXML_DEFINITIONS ${TinyXML_DEFINITIONS} PARENT_SCOPE)
-    endif(YARP_USE_TINYXML AND NOT YARP_USE_SYSTEM_TINYXML)
-endif(CREATE_YARPSCOPE OR CREATE_GYARPMANAGER OR CREATE_YMANAGER)
+    endif()
+endif()
 
 # SQLite
 if(YARP_USE_SQLITE AND NOT YARP_USE_SYSTEM_SQLITE)
     add_subdirectory(sqlite)
     set(SQLite_INCLUDE_DIRS ${SQLite_INCLUDE_DIRS} PARENT_SCOPE)
     set(SQLite_LIBRARIES ${SQLite_LIBRARIES} PARENT_SCOPE)
     set(SQLite_DEFINITIONS ${SQLite_DEFINITIONS} PARENT_SCOPE)
-endif(YARP_USE_SQLITE AND NOT YARP_USE_SYSTEM_SQLITE)
+endif()
 
 if(CREATE_YARPSCOPE AND YARP_HAS_GTK2)
     # GtkDatabox
@@ -32,31 +32,31 @@ if(CREATE_YARPSCOPE AND YARP_HAS_GTK2)
         set(GtkDatabox_INCLUDE_DIRS ${GtkDatabox_INCLUDE_DIRS} PARENT_SCOPE)
         set(GtkDatabox_LIBRARIES ${GtkDatabox_LIBRARIES} PARENT_SCOPE)
         set(GtkDatabox_DEFINITIONS ${GtkDatabox_DEFINITIONS} PARENT_SCOPE)
-    endif(YARP_USE_GTKDATABOX AND NOT YARP_USE_SYSTEM_GTKDATABOX)
+    endif()
 
     # GtkDataboxMM
     if(YARP_USE_GTKDATABOXMM AND NOT YARP_USE_SYSTEM_GTKDATABOXMM)
         add_subdirectory(gtkdataboxmm)
         set(GtkDataboxMM_INCLUDE_DIRS ${GtkDataboxMM_INCLUDE_DIRS} PARENT_SCOPE)
         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()
 endif()
 
-if(CREATE_GYARPBUILDER AND YARP_HAS_GTK2)
+if(CREATE_YARPBUILDER AND YARP_HAS_GTK2)
     # GooCanvas
     if(YARP_USE_GOOCANVAS AND NOT YARP_USE_SYSTEM_GOOCANVAS)
         add_subdirectory(goocanvas)
         set(GooCanvas_INCLUDE_DIRS ${GooCanvas_INCLUDE_DIRS} PARENT_SCOPE)
         set(GooCanvas_LIBRARIES ${GooCanvas_LIBRARIES} PARENT_SCOPE)
         set(GooCanvas_DEFINITIONS ${GooCanvas_DEFINITIONS} PARENT_SCOPE)
-    endif(YARP_USE_GOOCANVAS AND NOT YARP_USE_SYSTEM_GOOCANVAS)
+    endif()
 
     # GooCanvasMM
     if(YARP_USE_GOOCANVASMM AND NOT YARP_USE_SYSTEM_GOOCANVASMM)
         add_subdirectory(goocanvasmm)
         set(GooCanvasMM_INCLUDE_DIRS ${GooCanvasMM_INCLUDE_DIRS} PARENT_SCOPE)
         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()
 endif()