Commit 5f6ad768 authored by Eisenhauer, Greg's avatar Eisenhauer, Greg
Browse files

Merge branch 'upstream-dill' into fx100

* upstream-dill:
  dill 2018-10-29 (8671d236)
parents 98b926c0 19a97b5f
Loading
Loading
Loading
Loading
+9 −13
Original line number Diff line number Diff line
cmake_minimum_required(VERSION 2.8.3)
if(POLICY CMP0048)
  cmake_policy(SET CMP0048 NEW)
cmake_minimum_required(VERSION 3.0)

project(DILL VERSION 2.4.0 LANGUAGES C CXX)
else()
  project(DILL C CXX)
  set(DILL_MAJOR_VERSION 2)
  set(DILL_MINOR_VERSION 4)
  set(DILL_PATCH_VERSION 0)
  set(DILL_VERSION
    ${DILL_MAJOR_VERSION}.${DILL_MINOR_VERSION}.${DILL_PATCH_VERSION})
endif()

# Some boilerplate to setup nice output directories
set(CMAKE_INSTALL_BINDIR bin CACHE STRING "Installation runtime subdirectory")
@@ -111,7 +102,8 @@ CHECK_TYPE_SIZE("void*" CMAKE_SIZEOF_VOID_P)
CHECK_TYPE_SIZE("long" SIZEOF_LONG)
set (NATIVE_CG true)
if (("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i.86") OR
	("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64"))
	("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") OR
	("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "AMD64"))
    if (CMAKE_SIZEOF_VOID_P MATCHES "8")
      	set (NATIVE_ARCH x86_64)
	set (HOST_X86_64 1)
@@ -153,6 +145,10 @@ elseif ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "ppc64le")
    set (NATIVE_ARCH ppc64le)
    set (HOST_PPC64LE 1)
    set (ARCH_FILE ppc64le)
elseif ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "s64fx")
    set (NATIVE_ARCH sparcv9)
    set (HOST_SPARCV9 1)
    set (ARCH_FILE sparc)
else()
    message (STATUS "NO CG for Processor \"${CMAKE_SYSTEM_PROCESSOR}\"")
    set (NATIVE_CG false)