Kill dead code in cmake and appveyor

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9baed7..d139db2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 # Java requires 2.8.6
 cmake_minimum_required(VERSION 2.6)
 # Java requires 2.8.6

-message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
+message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}$")

 
 project(SimGrid C CXX)
 
 
 project(SimGrid C CXX)
 


@@ -156,6 +156,7 @@ endif()
 ### Set some variables for Cmake
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 
 ### Set some variables for Cmake
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 

+### Compute the include paths

 set(INCLUDES
   ${CMAKE_HOME_DIRECTORY}
   ${CMAKE_HOME_DIRECTORY}/include
 set(INCLUDES
   ${CMAKE_HOME_DIRECTORY}
   ${CMAKE_HOME_DIRECTORY}/include


@@ -197,12 +198,6 @@ if(WIN32)
     string(REGEX MATCH "^[0-9]" COMPILER_C_MAJOR_VERSION "${COMPILER_C_VERSION}")
     string(REGEX MATCH "^[0-9].[0-9]" COMPILER_C_MINOR_VERSION "${COMPILER_C_VERSION}")
     string(REGEX REPLACE "^${COMPILER_C_MAJOR_VERSION}." "" COMPILER_C_MINOR_VERSION "${COMPILER_C_MINOR_VERSION}")
     string(REGEX MATCH "^[0-9]" COMPILER_C_MAJOR_VERSION "${COMPILER_C_VERSION}")
     string(REGEX MATCH "^[0-9].[0-9]" COMPILER_C_MINOR_VERSION "${COMPILER_C_VERSION}")
     string(REGEX REPLACE "^${COMPILER_C_MAJOR_VERSION}." "" COMPILER_C_MINOR_VERSION "${COMPILER_C_MINOR_VERSION}")

-    if(COMPILER_C_MAJOR_VERSION)
-      # set(__GNUC__ ${COMPILER_C_MAJOR_VERSION})
-    endif()
-    if(COMPILER_C_MINOR_VERSION)
-      # set(__GNUC_MINOR__ ${COMPILER_C_MINOR_VERSION})
-    endif()

   endif()
 
   set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITEW6432})
   endif()
 
   set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITEW6432})


@@ -238,10 +233,6 @@ set(CMAKE_MODULE_PATH
   ${CMAKE_HOME_DIRECTORY}/tools/cmake/Modules
   )
 
   ${CMAKE_HOME_DIRECTORY}/tools/cmake/Modules
   )
 

-# x86_64
-# x86
-# i.86
-

 ### Determine the assembly flavor that we need today
 include(CMakeDetermineSystem)
 IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64")
 ### Determine the assembly flavor that we need today
 include(CMakeDetermineSystem)
 IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64")


@@ -258,41 +249,6 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64")
     set(HAVE_RAWCTX 1)
   endif()
 
     set(HAVE_RAWCTX 1)
   endif()
 

-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")
-  message(STATUS "System processor: alpha")
-
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
-  # Subdir is "arm" for both big-endian (arm) and little-endian (armel).
-  message(STATUS "System processor: arm")
-
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
-  # mips* machines are bi-endian mostly so processor does not tell
-  # endianess of the underlying system.
-  message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
-
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
-  message(STATUS "System processor: ppc64")
-
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
-  message(STATUS "System processor: ppc")
-
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")
-  # Both flavours can run on the same processor
-  message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}" "sparc" "sparcv9")
-
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(parisc|hppa)")
-  message(STATUS "System processor: parisc" "parisc64")
-
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390")
-  # s390 binaries can run on s390x machines
-  message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}" "s390" "s390x")
-
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sh")
-  message(STATUS "System processor: sh")
-
-ELSE() #PROCESSOR NOT FOUND
-  message(STATUS "PROCESSOR NOT FOUND: ${CMAKE_SYSTEM_PROCESSOR}")
-

 ENDIF()
 
 if(ARCH_32_BITS)
 ENDIF()
 
 if(ARCH_32_BITS)


@@ -429,6 +385,8 @@ if(MINGW)
   # The detection of asprintf fails on MinGW, assumingly because it's
   # defined as an inline function in stdio.h instead of a regular
   # function. So force the result to be 1 despite of the test.
   # The detection of asprintf fails on MinGW, assumingly because it's
   # defined as an inline function in stdio.h instead of a regular
   # function. So force the result to be 1 despite of the test.

+  set(HAVE_SNPRINTF 1)
+  set(HAVE_VSNPRINTF 1)

   set(HAVE_ASPRINTF 1)
   set(HAVE_VASPRINTF 1)
 endif()
   set(HAVE_ASPRINTF 1)
   set(HAVE_VASPRINTF 1)
 endif()


@@ -471,15 +429,13 @@ endif()
 if(WIN32) # Those files are not detected despite being present
   set(HAVE_UCONTEXT_H 1)
   set(HAVE_MAKECONTEXT 1)
 if(WIN32) # Those files are not detected despite being present
   set(HAVE_UCONTEXT_H 1)
   set(HAVE_MAKECONTEXT 1)

-  set(HAVE_SNPRINTF 1)
-  set(HAVE_VSNPRINTF 1)

 endif()
 
 set(CONTEXT_UCONTEXT 0)
 endif()
 
 set(CONTEXT_UCONTEXT 0)

-SET(CONTEXT_THREADS 0)
+set(CONTEXT_THREADS 0)

 
 if(enable_jedule)
 
 if(enable_jedule)

-  SET(HAVE_JEDULE 1)
+  set(HAVE_JEDULE 1)

 endif()
 
 if(enable_latency_bound_tracking)
 endif()
 
 if(enable_latency_bound_tracking)

diff --git a/appveyor.yml b/appveyor.yml
index 69fc6c4..de0639a 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,21 +8,18 @@ clone_depth: 1
 
 # scripts that are called at very beginning, before repo cloning
 init:
 
 # scripts that are called at very beginning, before repo cloning
 init:

-- cmake --version

 - git config --global core.longpaths true
 - git config --global core.autocrlf input
 
 environment:
   global:
 - git config --global core.longpaths true
 - git config --global core.autocrlf input
 
 environment:
   global:

-    #  BOOST_ROOT: c:\Libraries\boost_1_59_0 # Mandatory for MSVC15 right now, but not good on the long term
-    #  BOOST_LIBRARYDIR: c:\Libraries\boost_1_59_0\stage\lib

     BOOST_ROOT: c:\Libraries\boost
     BOOST_LIBRARYDIR: c:\Libraries\boost\stage\lib
     TESH_ARGS: C:/projects/simgrid/bin/tesh --setenv srcdir=C:/projects/simgrid/examples/java --setenv classpath=C:/projects/simgrid/examples/java;C:/projects/simgrid/teshsuite/java;C:/projects/simgrid/simgrid.jar --cd C:/projects/simgrid/examples/java
   matrix:
     - COMPILER: MinGW-w64
 
     BOOST_ROOT: c:\Libraries\boost
     BOOST_LIBRARYDIR: c:\Libraries\boost\stage\lib
     TESH_ARGS: C:/projects/simgrid/bin/tesh --setenv srcdir=C:/projects/simgrid/examples/java --setenv classpath=C:/projects/simgrid/examples/java;C:/projects/simgrid/teshsuite/java;C:/projects/simgrid/simgrid.jar --cd C:/projects/simgrid/examples/java
   matrix:
     - COMPILER: MinGW-w64
 

-# MSCV15 is too hard for me: I fail to get the lib to link on that platf.
+# MSCV15 is too hard for me: I fail to get the lib to link on that platf (even with c:\Libraries\boost_1_59_0)

 #    - COMPILER: MSVC15
 #      PLATFORM: Win32 # That's actually an appveyor parameter of MSVC15, it's useless with MinGW-w64
 #    - COMPILER: MSVC15
 #    - COMPILER: MSVC15
 #      PLATFORM: Win32 # That's actually an appveyor parameter of MSVC15, it's useless with MinGW-w64
 #    - COMPILER: MSVC15