diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-10-19 19:14:06 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-10-19 19:14:06 +0000 |
| commit | 0ce90828ff74bb283f2d5934c8a24010f6d55983 (patch) | |
| tree | ac0e69153544c444effeff1ff136753408166d5f | |
| parent | bc845f57d71759abbe4e49ca3b66fb0c10ccfb3a (diff) | |
| download | ATCD-0ce90828ff74bb283f2d5934c8a24010f6d55983.tar.gz | |
Wed Oct 19 19:13:38 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* bin/MakeProjectCreator/config/global.features:
disable openmp by default.
* include/makeinclude/platform_clang_common.GNU:
* include/makeinclude/platform_g++_common.GNU:
add flags for openmp.
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/global.features | 1 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_clang_common.GNU | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_g++_common.GNU | 5 |
4 files changed, 20 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 8031e03b8ee..eabbdf0ed81 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Wed Oct 19 19:13:38 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/MakeProjectCreator/config/global.features: + disable openmp by default. + + * include/makeinclude/platform_clang_common.GNU: + * include/makeinclude/platform_g++_common.GNU: + add flags for openmp. + Wed Oct 19 09:56:20 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * rpmbuild/ace-tao.spec: diff --git a/ACE/bin/MakeProjectCreator/config/global.features b/ACE/bin/MakeProjectCreator/config/global.features index 74b7625098e..b7a1c75278f 100644 --- a/ACE/bin/MakeProjectCreator/config/global.features +++ b/ACE/bin/MakeProjectCreator/config/global.features @@ -70,6 +70,7 @@ dds4ccm_opendds = 0 dds4ccm_ndds = 0 dds4ccm_splice = 0 dds4ccm_coredx = 0 +openmp = 0 // Features for various GUI libraries diff --git a/ACE/include/makeinclude/platform_clang_common.GNU b/ACE/include/makeinclude/platform_clang_common.GNU index 94cea192d09..2ab412828fc 100644 --- a/ACE/include/makeinclude/platform_clang_common.GNU +++ b/ACE/include/makeinclude/platform_clang_common.GNU @@ -3,6 +3,11 @@ # # Common file help turn on/off explicit template instantiation +ifeq ($(openmp),1) +FLAGS_C_CC += -fopenmp +LDFLAGS += -fopenmp +endif + ifeq ($(CXX),insure) # insure does not pass through the -dumpversion option. CXX_FOR_VERSION_TEST ?= g++ diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU index 53c5dde5687..d7e4db7355d 100644 --- a/ACE/include/makeinclude/platform_g++_common.GNU +++ b/ACE/include/makeinclude/platform_g++_common.GNU @@ -1,6 +1,11 @@ # -*- Makefile -*- # $Id$ +ifeq ($(openmp),1) +FLAGS_C_CC += -fopenmp +LDFLAGS += -fopenmp +endif + ifeq ($(insure),1) CC = insure CXX = insure |