X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=3dcc5e4f7ff0214e3b31ac4b2b788167993a1f78;hb=f45a82890e34984ad1e1e259f8fb902caddfb0b1;hp=4c4239b045afb24dc19f873595f291753f83bea8;hpb=cccecb8ea2a314f22d9081e339e74a1779ef684c;p=oota-llvm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c4239b045a..3dcc5e4f7ff 100644
--- 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 )
@@ -38,6 +39,10 @@ set(LLVM_ALL_TARGETS
   XCore
   )
 
+# List of targets whose asmprinters need to be forced to link
+# into executables on some platforms (i.e. Windows):
+set(LLVM_ASMPRINTERS_FORCE_LINK X86 PowerPC)
+
 if( MSVC )
   set(LLVM_TARGETS_TO_BUILD X86
     CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
@@ -46,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()
@@ -95,11 +102,20 @@ endif(WIN32)
 if( EXISTS ${LLVM_TOOLS_BINARY_DIR}/llvm-config )
   set(HAVE_LLVM_CONFIG 1)
 endif( EXISTS ${LLVM_TOOLS_BINARY_DIR}/llvm-config )
-# find_file(HAVE_LLVM_CONFIG llvm-config ${LLVM_TOOLS_BINARY_DIR})
-# message(STATUS ${HAVE_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 )
@@ -114,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 )
@@ -133,9 +149,6 @@ if( MSVC )
 endif( MSVC )
 
 include_directories( ${LLVM_BINARY_DIR}/include ${LLVM_MAIN_INCLUDE_DIR})
-#link_directories( d:/dev/lib )
-
-#add_subdirectory(lib)
 
 include(AddLLVM)
 include(AddPartiallyLinkedObject)
@@ -157,15 +170,7 @@ if( CMAKE_CROSSCOMPILING )
   include( CrossCompileLLVM )
 endif( CMAKE_CROSSCOMPILING )
 
-add_custom_command(OUTPUT ${llvm_builded_incs_dir}/Intrinsics.gen
-  COMMAND ${LLVM_TABLEGEN} -gen-intrinsic -I ${LLVM_MAIN_INCLUDE_DIR} ${LLVM_MAIN_INCLUDE_DIR}/llvm/Intrinsics.td -o ${llvm_builded_incs_dir}/Intrinsics.gen
-  DEPENDS tblgen
-  COMMENT "Building intrinsics.gen...")
-
-add_custom_target(intrinsics_gen ALL
-  DEPENDS ${llvm_builded_incs_dir}/Intrinsics.gen)
-
-set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} intrinsics_gen )
+add_subdirectory(include/llvm)
 
 add_subdirectory(lib/VMCore)
 add_subdirectory(lib/CodeGen)