set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE)
set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
-set(CMAKE_MODULE_PATH
-${CMAKE_MODULE_PATH}
-${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
-)
-
## Mapping version number -> version name
# 3.5.99 -> alpha1 (oops)
# 3.5.9{1,2} -> beta{1,2}
# 3.5.9{3,4,5} -> rc{1,2,3}
# 3.6.{0,1,2} -> release 3.6, 3.6.1, 3.6.2
-# 3.7.0
+# 3.7.{0,1} -> release 3.7, 3.7.1
set(SIMGRID_VERSION_MAJOR "3")
set(SIMGRID_VERSION_MINOR "7")
-set(SIMGRID_VERSION_PATCH "0")
+set(SIMGRID_VERSION_PATCH "1")
if(${SIMGRID_VERSION_PATCH} EQUAL "0")
set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
if(ARCH_32_BITS) ### Arch 32bits
set(_WIN32 1)
- set(NSIS_WIN_VERSION "win32")
else(ARCH_32_BITS) ### Arch 64bits
set(_WIN64 1)
- set(NSIS_WIN_VERSION "win64")
endif(ARCH_32_BITS)
+ set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITEW6432})
+ if(NSIS_WIN_VERSION MATCHES "")
+ set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITECTURE})
+ endif(NSIS_WIN_VERSION MATCHES "")
+ string(TOLOWER ${NSIS_WIN_VERSION} NSIS_WIN_VERSION)
set(_XBT_WIN32 1)
include(CMakeDetermineSystem)
set(PROCESSOR_${CMAKE_SYSTEM_PROCESSOR} 1)
-### Print NbCore
-include(FindNbCore)
-
### Setup Options
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Option.cmake)