Fix a long-standing bug and misfeature of the disassembler: when dealing with a

[oota-llvm.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ef79b91deb6e2f1c37030ce03d5ff68a6a6b70d..3dcc5e4f7ff0214e3b31ac4b2b788167993a1f78 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,8 @@ project(LLVM)
 cmake_minimum_required(VERSION 2.6.1)
 
 set(PACKAGE_NAME llvm)
-set(PACKAGE_VERSION svn)
+set(PACKAGE_VERSION 2.6svn)
+set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 set(PACKAGE_BUGREPORT "llvmbugs@cs.uiuc.edu")
 
 if( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE )
@@ -50,6 +51,8 @@ else( MSVC )
     CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
 endif( MSVC )
 
+option(LLVM_ENABLE_THREADS "Use threads if available." ON)
+
 if( LLVM_TARGETS_TO_BUILD STREQUAL "all" )
   set( LLVM_TARGETS_TO_BUILD ${LLVM_ALL_TARGETS} )
 endif()
@@ -102,6 +105,17 @@ endif( EXISTS ${LLVM_TOOLS_BINARY_DIR}/llvm-config )
 
 include(config-ix)
 
+option(LLVM_ENABLE_PIC "Build Position-Independent Code" OFF)
+
+if( LLVM_ENABLE_PIC )
+  if( SUPPORTS_FPIC_FLAG )
+    message(STATUS "Building with -fPIC")
+    add_definitions(-fPIC)
+  else( SUPPORTS_FPIC_FLAG )
+    message(STATUS "Warning: -fPIC not supported.")
+  endif()
+endif()
+
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_TOOLS_BINARY_DIR} )
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib )
@@ -116,14 +130,14 @@ set(LLVM_PLO_FLAGS "" CACHE
 
 if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32 )
   # TODO: support other platforms and toolchains.
-  option(BUILD_32_BITS "Build 32 bits executables and libraries." OFF)
-  if( BUILD_32_BITS )
+  option(LLVM_BUILD_32_BITS "Build 32 bits executables and libraries." OFF)
+  if( LLVM_BUILD_32_BITS )
     message(STATUS "Building 32 bits executables and libraries.")
     add_definitions( -m32 )
-    set( CMAKE_EXE_LINKER_FLAGS "-m32 ${CMAKE_EXE_LINKER_FLAGS}" )
-    set( CMAKE_LINK_LIBRARY_FLAG "-m32 ${CMAKE_LINK_LIBRARY_FLAG}" )
+    list(APPEND CMAKE_EXE_LINKER_FLAGS -m32)
+    list(APPEND CMAKE_SHARED_LINKER_FLAGS -m32)
     set( LLVM_PLO_FLAGS -melf_i386 ${LLVM_PLO_FLAGS} )
-  endif( BUILD_32_BITS )
+  endif( LLVM_BUILD_32_BITS )
 endif( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32 )
 
 if( MSVC )