diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-08-05 17:20:51 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-08-05 17:20:51 +0000 |
| commit | 298517da097dc49dc3adaf0f8c62d70d5b5d0183 (patch) | |
| tree | 71b3c2b0cccc3cb6ab5e634acb7659b8df8c7434 /CMakeLists.txt | |
| parent | e047029fe932df094170670eb6f80b5d1a0ad74e (diff) | |
| download | navit-298517da097dc49dc3adaf0f8c62d70d5b5d0183.tar.gz | |
Fix:Build:Better approach for #pragma pack vs __attribute__((packed))
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4673 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e1105fb62..4d8ca16be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -420,6 +420,7 @@ if(WIN32 OR WINCE) endif(HAVE_WINSOCK) if(MSVC) + set(HAVE_PRAGMA_PACK 1) add_plugin(support/xgetopt "Windows detected" TRUE) set(ENABLE_NLS FALSE) else(MSVC) @@ -430,6 +431,7 @@ if(WIN32 OR WINCE) set(XSLTS "windows;${XSLTS}" CACHE STRING "define a semicolon seperated list of XSLTs to process") endif() if (WIN32 AND NOT WINCE) + set(HAVE_PRAGMA_PACK 1) set(HAVE_API_WIN32 1) set(HAVE_STDINT_H 1) #set(BUILD_MAPTOOL FALSE) @@ -438,6 +440,7 @@ if (WIN32 AND NOT WINCE) endif() if(WINCE) add_plugin(support/libc "wince detected" TRUE) + set(HAVE_PRAGMA_PACK 1) set(HAVE_API_WIN32_CE 1) set(BUILD_MAPTOOL FALSE) set_with_reason(vehicle/file "wince: currently broken" FALSE) |