浏览代码

Merge topic 'MinorFixForEcos'

1ab4b3e guard eCos.cmake against multiple inclusion (#12987)
David Cole 13 年之前
父节点
当前提交
a407291c5d
共有 1 个文件被更改,包括 8 次插入1 次删除
  1. 8 1
      Modules/Platform/eCos.cmake

+ 8 - 1
Modules/Platform/eCos.cmake

@@ -1,5 +1,12 @@
 # support for eCos http://ecos.sourceware.org
-SET(CMAKE_SHARED_LIBRARY_C_FLAGS "")            # -pic 
+
+# Guard against multiple inclusion, which e.g. leads to multiple calls to add_definition() #12987
+IF(__ECOS_CMAKE_INCLUDED)
+  RETURN()
+ENDIF()
+SET(__ECOS_CMAKE_INCLUDED TRUE)
+
+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "")            # -pic
 SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "")       # -shared
 SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")         # +s, flag for exe link to use shared lib
 SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "")       # -rpath