[Lldb-commits] [lldb] r237283 - Fix line endings.
Zachary Turner
zturner at google.com
Wed May 13 12:45:06 PDT 2015
Author: zturner
Date: Wed May 13 14:45:06 2015
New Revision: 237283
URL: http://llvm.org/viewvc/llvm-project?rev=237283&view=rev
Log:
Fix line endings.
I must have committed these with windows line endings a few months
ago when I did this work.
Modified:
lldb/trunk/cmake/modules/LLDBConfig.cmake
Modified: lldb/trunk/cmake/modules/LLDBConfig.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBConfig.cmake?rev=237283&r1=237282&r2=237283&view=diff
==============================================================================
--- lldb/trunk/cmake/modules/LLDBConfig.cmake (original)
+++ lldb/trunk/cmake/modules/LLDBConfig.cmake Wed May 13 14:45:06 2015
@@ -1,192 +1,192 @@
-set(LLDB_PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
-set(LLDB_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/source")
-set(LLDB_INCLUDE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/include")
-
-if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
- set(LLDB_DEFAULT_DISABLE_PYTHON 0)
- set(LLDB_DEFAULT_DISABLE_CURSES 1)
-else()
- if ( __ANDROID_NDK__ )
- set(LLDB_DEFAULT_DISABLE_PYTHON 1)
- set(LLDB_DEFAULT_DISABLE_CURSES 1)
- else()
- set(LLDB_DEFAULT_DISABLE_PYTHON 0)
- set(LLDB_DEFAULT_DISABLE_CURSES 0)
- endif()
-endif()
-
-set(LLDB_DISABLE_PYTHON ${LLDB_DEFAULT_DISABLE_PYTHON} CACHE BOOL
- "Disables the Python scripting integration.")
-set(LLDB_DISABLE_CURSES ${LLDB_DEFAULT_DISABLE_CURSES} CACHE BOOL
- "Disables the Curses integration.")
-
-set(LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION 1 CACHE BOOL
- "Enables using new Python scripts for SWIG API generation .")
-set(LLDB_RELOCATABLE_PYTHON 0 CACHE BOOL
- "Causes LLDB to use the PYTHONHOME environment variable to locate Python.")
-
-if ((NOT MSVC) OR MSVC12)
- add_definitions( -DHAVE_ROUND )
-endif()
-
-if (LLDB_DISABLE_CURSES)
- add_definitions( -DLLDB_DISABLE_CURSES )
-endif()
-
-if (NOT LLDB_DISABLE_PYTHON)
- if(UNIX)
- # This is necessary for crosscompile on Ubuntu 14.04 64bit. Need a proper fix.
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(CMAKE_LIBRARY_ARCHITECTURE "x86_64-linux-gnu")
- endif()
- endif()
-
- if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
- if (NOT "${PYTHON_HOME}" STREQUAL "")
- file(TO_CMAKE_PATH "${PYTHON_HOME}" PYTHON_HOME)
- if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
- file(TO_CMAKE_PATH "${PYTHON_HOME}/python_d.exe" PYTHON_EXECUTABLE)
- file(TO_CMAKE_PATH "${PYTHON_HOME}/libs/python27_d.lib" PYTHON_LIBRARY)
- file(TO_CMAKE_PATH "${PYTHON_HOME}/python27_d.dll" PYTHON_DLL)
- else()
- file(TO_CMAKE_PATH "${PYTHON_HOME}/python.exe" PYTHON_EXECUTABLE)
- file(TO_CMAKE_PATH "${PYTHON_HOME}/libs/python27.lib" PYTHON_LIBRARY)
- file(TO_CMAKE_PATH "${PYTHON_HOME}/python27.dll" PYTHON_DLL)
- endif()
-
- file(TO_CMAKE_PATH "${PYTHON_HOME}/Include" PYTHON_INCLUDE_DIR)
- if (NOT LLDB_RELOCATABLE_PYTHON)
- add_definitions( -DLLDB_PYTHON_HOME="${PYTHON_HOME}" )
- endif()
- else()
- message("Embedding Python on Windows without specifying a value for PYTHON_HOME is deprecated. Support for this will be dropped soon.")
-
- if ("${PYTHON_INCLUDE_DIR}" STREQUAL "" OR "${PYTHON_LIBRARY}" STREQUAL "")
- message("-- LLDB Embedded python disabled. Embedding python on Windows requires "
- "manually specifying PYTHON_INCLUDE_DIR *and* PYTHON_LIBRARY")
- set(LLDB_DISABLE_PYTHON 1)
- endif()
- endif()
-
- if (PYTHON_LIBRARY)
- message("-- Found PythonLibs: ${PYTHON_LIBRARY}")
- include_directories(${PYTHON_INCLUDE_DIR})
- endif()
-
- else()
- find_package(PythonLibs REQUIRED)
- include_directories(${PYTHON_INCLUDE_DIRS})
- endif()
-endif()
-
-if (LLDB_DISABLE_PYTHON)
- unset(PYTHON_INCLUDE_DIR)
- unset(PYTHON_LIBRARY)
- add_definitions( -DLLDB_DISABLE_PYTHON )
-endif()
-
-include_directories(../clang/include)
-include_directories("${CMAKE_CURRENT_BINARY_DIR}/../clang/include")
-
-# lldb requires c++11 to build. Make sure that we have a compiler and standard
-# library combination that can do that.
-if (NOT MSVC)
- # gcc and clang require the -std=c++0x or -std=c++11 flag.
- if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR
- "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
- if (NOT ("${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+0x" OR
- "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+0x" OR
- "${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+11" OR
- "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+11"))
- if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
- else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- endif()
- else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- endif()
- endif()
- endif()
-elseif (MSVC_VERSION LESS 1700)
- message(FATAL_ERROR "The selected compiler does not support c++11 which is "
- "required to build lldb.")
-endif()
-
-# Disable GCC warnings
-check_cxx_compiler_flag("-Wno-deprecated-declarations"
- CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS)
-if (CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
-endif ()
-
-check_cxx_compiler_flag("-Wno-unknown-pragmas"
- CXX_SUPPORTS_NO_UNKNOWN_PRAGMAS)
-if (CXX_SUPPORTS_NO_UNKNOWN_PRAGMAS)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas")
-endif ()
-
-# Disable Clang warnings
-check_cxx_compiler_flag("-Wno-deprecated-register"
- CXX_SUPPORTS_NO_DEPRECATED_REGISTER)
-if (CXX_SUPPORTS_NO_DEPRECATED_REGISTER)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register")
-endif ()
-
-# Disable MSVC warnings
-if( MSVC )
- add_definitions(
- -wd4018 # Suppress 'warning C4018: '>=' : signed/unsigned mismatch'
- -wd4068 # Suppress 'warning C4068: unknown pragma'
- -wd4150 # Suppress 'warning C4150: deletion of pointer to incomplete type'
- -wd4251 # Suppress 'warning C4251: T must have dll-interface to be used by clients of class U.'
- -wd4521 # Suppress 'warning C4521: 'type' : multiple copy constructors specified'
- -wd4530 # Suppress 'warning C4530: C++ exception handler used, but unwind semantics are not enabled.'
- )
-endif()
-
-set(LLDB_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(LLDB_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
-
-# If building on a 32-bit system, make sure off_t can store offsets > 2GB
-if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
- add_definitions( -D_LARGEFILE_SOURCE )
- add_definitions( -D_FILE_OFFSET_BITS=64 )
-endif()
-
-if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
- message(FATAL_ERROR "In-source builds are not allowed. CMake would overwrite "
-"the makefiles distributed with LLDB. Please create a directory and run cmake "
-"from there, passing the path to this source directory as the last argument. "
-"This process created the file `CMakeCache.txt' and the directory "
-"`CMakeFiles'. Please delete them.")
-endif()
-
-# Compute the LLDB version from the LLVM version.
-string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" LLDB_VERSION
- ${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 ()
-
-include_directories(BEFORE
- ${CMAKE_CURRENT_BINARY_DIR}/include
- ${CMAKE_CURRENT_SOURCE_DIR}/include
- )
-
-install(DIRECTORY include/
- DESTINATION include
- FILES_MATCHING
- PATTERN "*.h"
+set(LLDB_PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
+set(LLDB_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/source")
+set(LLDB_INCLUDE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/include")
+
+if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
+ set(LLDB_DEFAULT_DISABLE_PYTHON 0)
+ set(LLDB_DEFAULT_DISABLE_CURSES 1)
+else()
+ if ( __ANDROID_NDK__ )
+ set(LLDB_DEFAULT_DISABLE_PYTHON 1)
+ set(LLDB_DEFAULT_DISABLE_CURSES 1)
+ else()
+ set(LLDB_DEFAULT_DISABLE_PYTHON 0)
+ set(LLDB_DEFAULT_DISABLE_CURSES 0)
+ endif()
+endif()
+
+set(LLDB_DISABLE_PYTHON ${LLDB_DEFAULT_DISABLE_PYTHON} CACHE BOOL
+ "Disables the Python scripting integration.")
+set(LLDB_DISABLE_CURSES ${LLDB_DEFAULT_DISABLE_CURSES} CACHE BOOL
+ "Disables the Curses integration.")
+
+set(LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION 1 CACHE BOOL
+ "Enables using new Python scripts for SWIG API generation .")
+set(LLDB_RELOCATABLE_PYTHON 0 CACHE BOOL
+ "Causes LLDB to use the PYTHONHOME environment variable to locate Python.")
+
+if ((NOT MSVC) OR MSVC12)
+ add_definitions( -DHAVE_ROUND )
+endif()
+
+if (LLDB_DISABLE_CURSES)
+ add_definitions( -DLLDB_DISABLE_CURSES )
+endif()
+
+if (NOT LLDB_DISABLE_PYTHON)
+ if(UNIX)
+ # This is necessary for crosscompile on Ubuntu 14.04 64bit. Need a proper fix.
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(CMAKE_LIBRARY_ARCHITECTURE "x86_64-linux-gnu")
+ endif()
+ endif()
+
+ if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+ if (NOT "${PYTHON_HOME}" STREQUAL "")
+ file(TO_CMAKE_PATH "${PYTHON_HOME}" PYTHON_HOME)
+ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+ file(TO_CMAKE_PATH "${PYTHON_HOME}/python_d.exe" PYTHON_EXECUTABLE)
+ file(TO_CMAKE_PATH "${PYTHON_HOME}/libs/python27_d.lib" PYTHON_LIBRARY)
+ file(TO_CMAKE_PATH "${PYTHON_HOME}/python27_d.dll" PYTHON_DLL)
+ else()
+ file(TO_CMAKE_PATH "${PYTHON_HOME}/python.exe" PYTHON_EXECUTABLE)
+ file(TO_CMAKE_PATH "${PYTHON_HOME}/libs/python27.lib" PYTHON_LIBRARY)
+ file(TO_CMAKE_PATH "${PYTHON_HOME}/python27.dll" PYTHON_DLL)
+ endif()
+
+ file(TO_CMAKE_PATH "${PYTHON_HOME}/Include" PYTHON_INCLUDE_DIR)
+ if (NOT LLDB_RELOCATABLE_PYTHON)
+ add_definitions( -DLLDB_PYTHON_HOME="${PYTHON_HOME}" )
+ endif()
+ else()
+ message("Embedding Python on Windows without specifying a value for PYTHON_HOME is deprecated. Support for this will be dropped soon.")
+
+ if ("${PYTHON_INCLUDE_DIR}" STREQUAL "" OR "${PYTHON_LIBRARY}" STREQUAL "")
+ message("-- LLDB Embedded python disabled. Embedding python on Windows requires "
+ "manually specifying PYTHON_INCLUDE_DIR *and* PYTHON_LIBRARY")
+ set(LLDB_DISABLE_PYTHON 1)
+ endif()
+ endif()
+
+ if (PYTHON_LIBRARY)
+ message("-- Found PythonLibs: ${PYTHON_LIBRARY}")
+ include_directories(${PYTHON_INCLUDE_DIR})
+ endif()
+
+ else()
+ find_package(PythonLibs REQUIRED)
+ include_directories(${PYTHON_INCLUDE_DIRS})
+ endif()
+endif()
+
+if (LLDB_DISABLE_PYTHON)
+ unset(PYTHON_INCLUDE_DIR)
+ unset(PYTHON_LIBRARY)
+ add_definitions( -DLLDB_DISABLE_PYTHON )
+endif()
+
+include_directories(../clang/include)
+include_directories("${CMAKE_CURRENT_BINARY_DIR}/../clang/include")
+
+# lldb requires c++11 to build. Make sure that we have a compiler and standard
+# library combination that can do that.
+if (NOT MSVC)
+ # gcc and clang require the -std=c++0x or -std=c++11 flag.
+ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR
+ "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+ if (NOT ("${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+0x" OR
+ "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+0x" OR
+ "${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+11" OR
+ "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+11"))
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+ else()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()
+ else()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()
+ endif()
+ endif()
+elseif (MSVC_VERSION LESS 1700)
+ message(FATAL_ERROR "The selected compiler does not support c++11 which is "
+ "required to build lldb.")
+endif()
+
+# Disable GCC warnings
+check_cxx_compiler_flag("-Wno-deprecated-declarations"
+ CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS)
+if (CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+endif ()
+
+check_cxx_compiler_flag("-Wno-unknown-pragmas"
+ CXX_SUPPORTS_NO_UNKNOWN_PRAGMAS)
+if (CXX_SUPPORTS_NO_UNKNOWN_PRAGMAS)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas")
+endif ()
+
+# Disable Clang warnings
+check_cxx_compiler_flag("-Wno-deprecated-register"
+ CXX_SUPPORTS_NO_DEPRECATED_REGISTER)
+if (CXX_SUPPORTS_NO_DEPRECATED_REGISTER)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register")
+endif ()
+
+# Disable MSVC warnings
+if( MSVC )
+ add_definitions(
+ -wd4018 # Suppress 'warning C4018: '>=' : signed/unsigned mismatch'
+ -wd4068 # Suppress 'warning C4068: unknown pragma'
+ -wd4150 # Suppress 'warning C4150: deletion of pointer to incomplete type'
+ -wd4251 # Suppress 'warning C4251: T must have dll-interface to be used by clients of class U.'
+ -wd4521 # Suppress 'warning C4521: 'type' : multiple copy constructors specified'
+ -wd4530 # Suppress 'warning C4530: C++ exception handler used, but unwind semantics are not enabled.'
+ )
+endif()
+
+set(LLDB_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+set(LLDB_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+
+# If building on a 32-bit system, make sure off_t can store offsets > 2GB
+if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
+ add_definitions( -D_LARGEFILE_SOURCE )
+ add_definitions( -D_FILE_OFFSET_BITS=64 )
+endif()
+
+if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
+ message(FATAL_ERROR "In-source builds are not allowed. CMake would overwrite "
+"the makefiles distributed with LLDB. Please create a directory and run cmake "
+"from there, passing the path to this source directory as the last argument. "
+"This process created the file `CMakeCache.txt' and the directory "
+"`CMakeFiles'. Please delete them.")
+endif()
+
+# Compute the LLDB version from the LLVM version.
+string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" LLDB_VERSION
+ ${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 ()
+
+include_directories(BEFORE
+ ${CMAKE_CURRENT_BINARY_DIR}/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/include
+ )
+
+install(DIRECTORY include/
+ DESTINATION include
+ FILES_MATCHING
+ PATTERN "*.h"
PATTERN ".svn" EXCLUDE
)
@@ -196,10 +196,10 @@ endif()
# Find libraries or frameworks that may be needed
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
- find_library(CARBON_LIBRARY Carbon)
- find_library(FOUNDATION_LIBRARY Foundation)
- find_library(CORE_FOUNDATION_LIBRARY CoreFoundation)
- find_library(CORE_SERVICES_LIBRARY CoreServices)
+ find_library(CARBON_LIBRARY Carbon)
+ find_library(FOUNDATION_LIBRARY Foundation)
+ find_library(CORE_FOUNDATION_LIBRARY CoreFoundation)
+ find_library(CORE_SERVICES_LIBRARY CoreServices)
find_library(SECURITY_LIBRARY Security)
find_library(DEBUG_SYMBOLS_LIBRARY DebugSymbols PATHS "/System/Library/PrivateFrameworks")
@@ -220,23 +220,23 @@ else()
endif()
if(LLDB_REQUIRES_EH)
- set(LLDB_REQUIRES_RTTI ON)
-else()
- if(LLVM_COMPILER_IS_GCC_COMPATIBLE)
- set(LLDB_COMPILE_FLAGS "${LLDB_COMPILE_FLAGS} -fno-exceptions")
- elseif(MSVC)
- add_definitions( -D_HAS_EXCEPTIONS=0 )
- set(LLDB_COMPILE_FLAGS "${LLDB_COMPILE_FLAGS} /EHs-c-")
- endif()
-endif()
-
-# Disable RTTI by default
-if(NOT LLDB_REQUIRES_RTTI)
- if (LLVM_COMPILER_IS_GCC_COMPATIBLE)
- set(LLDB_COMPILE_FLAGS "${LLDB_COMPILE_FLAGS} -fno-rtti")
- elseif(MSVC)
- set(LLDB_COMPILE_FLAGS "${LLDB_COMPILE_FLAGS} /GR-")
- endif()
-endif()
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLDB_COMPILE_FLAGS}")
+ set(LLDB_REQUIRES_RTTI ON)
+else()
+ if(LLVM_COMPILER_IS_GCC_COMPATIBLE)
+ set(LLDB_COMPILE_FLAGS "${LLDB_COMPILE_FLAGS} -fno-exceptions")
+ elseif(MSVC)
+ add_definitions( -D_HAS_EXCEPTIONS=0 )
+ set(LLDB_COMPILE_FLAGS "${LLDB_COMPILE_FLAGS} /EHs-c-")
+ endif()
+endif()
+
+# Disable RTTI by default
+if(NOT LLDB_REQUIRES_RTTI)
+ if (LLVM_COMPILER_IS_GCC_COMPATIBLE)
+ set(LLDB_COMPILE_FLAGS "${LLDB_COMPILE_FLAGS} -fno-rtti")
+ elseif(MSVC)
+ set(LLDB_COMPILE_FLAGS "${LLDB_COMPILE_FLAGS} /GR-")
+ endif()
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLDB_COMPILE_FLAGS}")
More information about the lldb-commits
mailing list