r199902 - [CMake] Parameterize MODULE and SHARED in add_clang_library().

[NAKAMURA Takumi]

Author: chapuni
Date: Thu Jan 23 09:33:44 2014
New Revision: 199902

URL: http://llvm.org/viewvc/llvm-project?rev=199902&view=rev
Log:
[CMake] Parameterize MODULE and SHARED in add_clang_library().

Modified:
    cfe/trunk/CMakeLists.txt
    cfe/trunk/examples/PrintFunctionNames/CMakeLists.txt
    cfe/trunk/examples/analyzer-plugin/CMakeLists.txt
    cfe/trunk/tools/libclang/CMakeLists.txt

Modified: cfe/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=199902&r1=199901&r2=199902&view=diff
==============================================================================
--- cfe/trunk/CMakeLists.txt (original)
+++ cfe/trunk/CMakeLists.txt Thu Jan 23 09:33:44 2014
@@ -275,7 +275,8 @@ function(clang_tablegen)
 endfunction(clang_tablegen)
 
 macro(add_clang_library name)
-  llvm_process_sources(srcs ${ARGN})
+  cmake_parse_arguments(ARG "MODULE;SHARED;STATIC" "" "" ${ARGN})
+  llvm_process_sources(srcs ${ARG_UNPARSED_ARGUMENTS})
   if(MSVC_IDE OR XCODE)
     # Add public headers
     file(RELATIVE_PATH lib_path
@@ -298,9 +299,9 @@ macro(add_clang_library name)
       set(srcs ${srcs} ${headers} ${tds})
     endif()
   endif(MSVC_IDE OR XCODE)
-  if (MODULE)
+  if (ARG_MODULE)
     set(libkind MODULE)
-  elseif (SHARED_LIBRARY)
+  elseif (ARG_SHARED)
     set(libkind SHARED)
   else()
     set(libkind)
@@ -316,7 +317,7 @@ macro(add_clang_library name)
   target_link_libraries( ${name} ${LLVM_COMMON_LIBS} )
   link_system_libs( ${name} )
   
-  if ((SHARED_LIBRARY OR MODULE) AND LLVM_EXPORTED_SYMBOL_FILE)
+  if ((ARG_SHARED OR ARG_MODULE) AND LLVM_EXPORTED_SYMBOL_FILE)
     add_llvm_symbol_exports( ${name} ${LLVM_EXPORTED_SYMBOL_FILE} )
   endif()
 

Modified: cfe/trunk/examples/PrintFunctionNames/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/examples/PrintFunctionNames/CMakeLists.txt?rev=199902&r1=199901&r2=199902&view=diff
==============================================================================
--- cfe/trunk/examples/PrintFunctionNames/CMakeLists.txt (original)
+++ cfe/trunk/examples/PrintFunctionNames/CMakeLists.txt Thu Jan 23 09:33:44 2014
@@ -1,5 +1,3 @@
-set(MODULE TRUE)
-
 set( LLVM_LINK_COMPONENTS
   Support
   )
@@ -15,7 +13,7 @@ if( NOT WIN32 ) # Win32 mangles symbols
   endif()
 endif()
 
-add_clang_library(PrintFunctionNames PrintFunctionNames.cpp)
+add_clang_library(PrintFunctionNames MODULE PrintFunctionNames.cpp)
 
 add_dependencies(PrintFunctionNames
   ClangAttrClasses

Modified: cfe/trunk/examples/analyzer-plugin/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/examples/analyzer-plugin/CMakeLists.txt?rev=199902&r1=199901&r2=199902&view=diff
==============================================================================
--- cfe/trunk/examples/analyzer-plugin/CMakeLists.txt (original)
+++ cfe/trunk/examples/analyzer-plugin/CMakeLists.txt Thu Jan 23 09:33:44 2014
@@ -1,10 +1,8 @@
-set(MODULE TRUE)
-
 set(LLVM_LINK_COMPONENTS
   Support
   )
 
-add_clang_library(SampleAnalyzerPlugin MainCallChecker.cpp)
+add_clang_library(SampleAnalyzerPlugin MODULE MainCallChecker.cpp)
 
 add_dependencies(SampleAnalyzerPlugin
   ClangAttrClasses

Modified: cfe/trunk/tools/libclang/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CMakeLists.txt?rev=199902&r1=199901&r2=199902&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/CMakeLists.txt (original)
+++ cfe/trunk/tools/libclang/CMakeLists.txt Thu Jan 23 09:33:44 2014
@@ -73,8 +73,7 @@ if(MSVC)
 endif()
 
 if( LLVM_ENABLE_PIC )
-  set(SHARED_LIBRARY TRUE)
-  add_clang_library(libclang ${SOURCES})
+  add_clang_library(libclang SHARED ${SOURCES})
   target_link_libraries(libclang ${LIBRARIES})
   add_dependencies(libclang ${GENERATED_HEADERS} clang-headers)