[Lldb-commits] [lldb] r213469 - build: fix cmake warning with newer CMake

[Saleem Abdulrasool]

Author: compnerd
Date: Sun Jul 20 00:28:55 2014
New Revision: 213469

URL: http://llvm.org/viewvc/llvm-project?rev=213469&view=rev
Log:
build: fix cmake warning with newer CMake

Hoist the compatibility macros out a level and re-use them when adding link
dependencies.  Silences a warning from CMake.

Modified:
    lldb/trunk/CMakeLists.txt
    lldb/trunk/source/CMakeLists.txt

Modified: lldb/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=213469&r1=213468&r2=213469&view=diff
==============================================================================
--- lldb/trunk/CMakeLists.txt (original)
+++ lldb/trunk/CMakeLists.txt Sun Jul 20 00:28:55 2014
@@ -197,6 +197,16 @@ string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[
   ${PACKAGE_VERSION})
 message(STATUS "LLDB version: ${LLDB_VERSION}")
 
+if (CMAKE_VERSION VERSION_LESS 2.8.12)
+  set(cmake_2_8_12_INTERFACE)
+  set(cmake_2_8_12_PRIVATE)
+  set(cmake_2_8_12_PUBLIC)
+else ()
+  set(cmake_2_8_12_INTERFACE INTERFACE)
+  set(cmake_2_8_12_PRIVATE PRIVATE)
+  set(cmake_2_8_12_PUBLIC PUBLIC)
+endif ()
+
 macro(add_lldb_library name)
   llvm_process_sources(srcs ${ARGN})
   if (MSVC_IDE OR XCODE)
@@ -222,16 +232,6 @@ macro(add_lldb_library name)
   ##add_dependencies(${name} ${LLVM_COMMON_DEPENDS})
   #endif()
 
-  if (CMAKE_VERSION VERSION_LESS 2.8.12)
-    set(cmake_2_8_12_INTERFACE)
-    set(cmake_2_8_12_PRIVATE)
-    set(cmake_2_8_12_PUBLIC)
-  else ()
-    set(cmake_2_8_12_INTERFACE INTERFACE)
-    set(cmake_2_8_12_PRIVATE PRIVATE)
-    set(cmake_2_8_12_PUBLIC PUBLIC)
-  endif ()
-
   if ("${libkind}" STREQUAL "STATIC")
     set(lldb_library_keyword ${cmake_2_8_12_INTERFACE})
   else ()

Modified: lldb/trunk/source/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/CMakeLists.txt?rev=213469&r1=213468&r2=213469&view=diff
==============================================================================
--- lldb/trunk/source/CMakeLists.txt (original)
+++ lldb/trunk/source/CMakeLists.txt Sun Jul 20 00:28:55 2014
@@ -300,7 +300,7 @@ if (LLDB_WRAP_PYTHON OR LLDB_VERS_GENERA
     ${LLDB_VERS_GENERATED_FILE}
     )
 endif()
-target_link_libraries(liblldb ${LLDB_SYSTEM_LIBS})
+target_link_libraries(liblldb ${cmake_2_8_12_PRIVATE} ${LLDB_SYSTEM_LIBS})
 
 # Determine LLDB revision and repository. GetSourceVersion and GetRepositoryPath are shell-scripts, and as
 # such will not work on Windows.