Remove define breaking windows build

- -DLittleEndian was being defined before pulling in windows.h causing compiler errors
pull/12/head
Izaak Beekman 8 years ago
parent 8173b8c1ec
commit b3975878ef
No known key found for this signature in database
GPG Key ID: A93CE70D8021BD0F

@ -84,23 +84,25 @@ else()
message( FATAL_ERROR "Fortran name mangling suffix, \'${FortranCInterface_GLOBAL__SUFFIX}\', unknown to PSBLAS") message( FATAL_ERROR "Fortran name mangling suffix, \'${FortranCInterface_GLOBAL__SUFFIX}\', unknown to PSBLAS")
endif() endif()
#---------------------------------------------- if(NOT ${WIN32})
# Determine system endian-ness and pointer size #----------------------------------------------
#---------------------------------------------- # Determine system endian-ness and pointer size
include(TestBigEndian) #----------------------------------------------
TEST_BIG_ENDIAN(IS_BIG_ENDIAN) include(TestBigEndian)
if(IS_BIG_ENDIAN) TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
message( STATUS "System appears to be big endian.") if(IS_BIG_ENDIAN)
else() message( STATUS "System appears to be big endian.")
message( STATUS "System appears to be little endian.") else()
add_definitions(-DLittleEndian) message( STATUS "System appears to be little endian.")
endif() add_definitions(-DLittleEndian)
include(CheckTypeSize) endif()
CHECK_TYPE_SIZE("void *" VOID_P_SIZE LANGUAGE C) include(CheckTypeSize)
if(${VOID_P_SIZE} EQUAL 8) CHECK_TYPE_SIZE("void *" VOID_P_SIZE LANGUAGE C)
add_definitions(-DPtr64Bits) if(${VOID_P_SIZE} EQUAL 8)
add_definitions(-DPtr64Bits)
endif()
message(STATUS "Have 64bit pointers")
endif() endif()
message(STATUS "Have 64bit pointers")
#----------------------------------------- #-----------------------------------------
# Check for some Fortran compiler features # Check for some Fortran compiler features

@ -1,6 +1,8 @@
#if !(defined(_WIN32) || defined(WIN32)) #if (defined(_WIN32) || defined(WIN32))
#include <stdlib.h> #include <stdlib.h>
#include <windows.h> #include <windows.h>
#include <time.h>
#else
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#include <stdio.h> #include <stdio.h>

Loading…
Cancel
Save