Skip to content
Snippets Groups Projects
Commit 9bc0825b authored by drausch's avatar drausch
Browse files

FIX: VISTA_64BIT was not always correctly set after yesterdays changes

parent 396722ac
No related branches found
No related tags found
No related merge requests found
......@@ -9,8 +9,6 @@
# VISTA_64BIT - set to true if the code is compiled for 64bit execution
# VISTA_PLATFORM_DEFINE - compiler definition for the platform ( -DWIN32 or -DLINUX or -DDARWIN )
if( NOT VISTA_HWARCH )
set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
......@@ -19,6 +17,7 @@ if( NOT VISTA_HWARCH )
SET( VISTA_64BIT FALSE )
endif()
if( NOT VISTA_HWARCH )
if( WIN32 )
set( VISTA_PLATFORM_DEFINE -DWIN32 )
......@@ -67,7 +66,6 @@ if( NOT VISTA_HWARCH )
else()
message( WARNING "VistaHWarchSettings - Could not detect hardware architecture" )
endif()
endif()
set( VISTA_HWARCH "${VISTA_HWARCH}" CACHE STRING "ViSTA definition of architectures descriptor" )
set( VISTA_COMPATIBLE_HWARCH "${VISTA_COMPATIBLE_HWARCH}" CACHE STRING "ViSTA descriptors for compatible architectures" )
......@@ -78,3 +76,5 @@ mark_as_advanced( VISTA_PLATFORM_DEFINE )
if( NOT VISTA_HWARCH OR NOT VISTA_COMPATIBLE_HWARCH OR NOT VISTA_PLATFORM_DEFINE )
message( FATAL_ERROR "VistaHWArch could not detect all required settings - please ensure that VISTA_HWARCH, VISTA_COMPATIBLE_HWARCH, and VISTA_PLATFORM_DEFINE are set" )
endif()
endif()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment