diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-03-24 22:30:09 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-03-24 22:30:09 +0100 |
| commit | bbb4c1c61863b9032af2291bff20814733995391 (patch) | |
| tree | 3ea88d5d789e2046c88680bf6decc088f29719fd /src/CMakeLists.txt | |
| parent | 096b2cd614c521db3dd5b26508ce983e50acc531 (diff) | |
| parent | a5690fa2a4cce2698225f1f558183f6fe306d860 (diff) | |
| download | mana-client-bbb4c1c61863b9032af2291bff20814733995391.tar.gz mana-client-bbb4c1c61863b9032af2291bff20814733995391.tar.bz2 mana-client-bbb4c1c61863b9032af2291bff20814733995391.tar.xz mana-client-bbb4c1c61863b9032af2291bff20814733995391.zip | |
Merge branch '0.6'
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 977524e9..e0a42478 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,7 +34,11 @@ ENDIF() SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"") SET(FLAGS "${FLAGS} -DPKG_DATADIR=\\\"${PKG_DATADIR}/\\\"") SET(FLAGS "${FLAGS} -DLOCALEDIR=\\\"${LOCALEDIR}/\\\"") -SET(FLAGS "${FLAGS} -std=c++0x") +IF (ENABLE_CPP0X) + SET(FLAGS "${FLAGS} -std=c++0x -DENABLE_CPP0X=1") +ELSE() + INCLUDE_DIRECTORIES("cpp0x_compat") +ENDIF() IF (ENABLE_NLS) SET(FLAGS "${FLAGS} -DENABLE_NLS=1") |