summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLloyd Hilaiel <lloyd@hilaiel.com>2010-03-25 10:36:05 -0600
committerLloyd Hilaiel <lloyd@hilaiel.com>2010-03-25 10:36:05 -0600
commit00c04939ebf4a0ba51ab4a51666ddb2700fc733b (patch)
tree8f5ebfa6e6afe10b9709969d3572bba46467c095
parent870ab8439223ea39916136f2caabbe1fc9fa43a4 (diff)
downloadyajl-00c04939ebf4a0ba51ab4a51666ddb2700fc733b.tar.gz
don't ignore environmentally defined CFLAGS when present in the environment (contributed by Daniel P. Berrange)
-rw-r--r--CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fded928..1bc40b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,8 @@ IF (NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE "Release")
ENDIF (NOT CMAKE_BUILD_TYPE)
-SET(CMAKE_C_FLAGS "-Wall")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+
IF (WIN32)
ADD_DEFINITIONS(-DWIN32)
SET(linkFlags "/PDB:NONE /INCREMENTAL:NO /OPT:NOREF /OPT:NOICF")