diff options
| author | lloydh <lloydh@e775cfb5-b74b-0410-aad5-5bebe4a96390> | 2008-01-14 14:16:18 +0000 |
|---|---|---|
| committer | lloydh <lloydh@e775cfb5-b74b-0410-aad5-5bebe4a96390> | 2008-01-14 14:16:18 +0000 |
| commit | 00ca98b8460cdd239b99f47e9a2b7e8c60cc15b0 (patch) | |
| tree | 7e8d69661c5d53b7f1f1081d9d614763b78cb90f /CMakeLists.txt | |
| parent | ae3d4b376c0094c3b3c12b2c0b728c2eb64227e8 (diff) | |
| download | yajl-00ca98b8460cdd239b99f47e9a2b7e8c60cc15b0.tar.gz | |
1. doxygen docs now part of the build
2. many documentation updates
3. freebsd4 fixes
4. works with CMake pre-LOOSE_LOOP_CONSTRUCTS
git-svn-id: http://yajl-c.googlecode.com/svn/yajl/trunk@90 e775cfb5-b74b-0410-aad5-5bebe4a96390
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ff1dab6..dd7a830 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,17 +30,15 @@ PROJECT(YetAnotherJSONParser) -SET (YAJL_MAJOR 1) -SET (YAJL_MINOR 0) +SET (YAJL_MAJOR 0) +SET (YAJL_MINOR 3) SET (YAJL_MICRO 0) SET (YAJL_DIST_NAME "yajl-${YAJL_MAJOR}.${YAJL_MINOR}.${YAJL_MICRO}") -SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS 1) - IF (NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE "Debug") -ENDIF () +ENDIF (NOT CMAKE_BUILD_TYPE) SET(CMAKE_C_FLAGS "-Wall") IF (WIN32) @@ -59,14 +57,16 @@ IF (WIN32) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /wd4255 /wd4130 /wd4100 /wd4711") SET(CMAKE_C_FLAGS_DEBUG "/D DEBUG /Od /Z7") SET(CMAKE_C_FLAGS_RELEASE "/D NDEBUG /O2") -ELSE () +ELSE (WIN32) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -ansi") SET(CMAKE_C_FLAGS_DEBUG "-DDEBUG -g") SET(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O2") -ENDIF () +ENDIF (WIN32) ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(reformatter) ADD_SUBDIRECTORY(verify) + +INCLUDE(YAJLDoc.cmake) |