Commit e1a9415b authored by Lynn Garren's avatar Lynn Garren
Browse files

add USING_VISUAL for Windows VC++

parent 5ec2d900
2018-03-13 Lynn Garren <garren@fnal.gov>
2018-03-14 Lynn Garren <garren@fnal.gov>
* Utility/use_atomic.h: WIN32 supports atomic
* Utility/atomic_int.h: WIN32 supports atomic
* Utility/use_atomic.h: allow atomic with Windows VC++
* Utility/atomic_int.h: allow atomic with Windows VC++
==============================
15.02.18 Release CLHEP-2.4.0.2
......
......@@ -9,7 +9,7 @@
#if __cplusplus >= 201103L
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || WIN32
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || USING_VISUAL
#include <atomic>
#define CLHEP_ATOMIC_INT_TYPE std::atomic<int>
#elif __clang__
......
......@@ -9,7 +9,7 @@
#if __cplusplus >= 201103L
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || WIN32
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || USING_VISUAL
#include <atomic>
#define CLHEP_USE_ATOMIC
#elif __clang__
......
......@@ -372,9 +372,10 @@ macro( clhep_set_compiler_flags )
if( ${CMAKE_BASE_NAME} MATCHES "cl" )
##message( STATUS "compiler is MSVC" )
##message( STATUS "incoming basic compiler flags are ${CMAKE_CXX_FLAGS}")
set(CMAKE_C_FLAGS "/EHsc /nologo /GR /MD /D USING_VISUAL")
set(CLHEP_THREAD_DEFINITION "#define CLHEP_THREAD_LOCAL thread_local")
set(CMAKE_C_FLAGS "/EHsc /nologo /GR /MD /D USING_VISUAL")
set(CMAKE_CXX_FLAGS "/EHsc /nologo /GR /MD /D USING_VISUAL")
set(CMAKE_SHARED_LINKER_FLAGS "/EHsc /nologo /GR /MD /D USING_VISUAL")
set(CMAKE_SHARED_LINKER_FLAGS "/nologo")
endif()
endif()
clhep_autoconf_variables()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment