df1d099db3
* Initial build of yajl package * Common PKGBUILD for msys and mingw * Minor updates and cleaning * Fixed tests
31 lines
937 B
Diff
31 lines
937 B
Diff
diff -ruN yajl-2.1.0-orig/CMakeLists.txt yajl-2.1.0/CMakeLists.txt
|
|
--- yajl-2.1.0-orig/CMakeLists.txt 2014-03-19 04:58:29.000000000 +0100
|
|
+++ yajl-2.1.0/CMakeLists.txt 2016-06-15 11:39:01.048338100 +0200
|
|
@@ -28,7 +28,7 @@
|
|
|
|
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
|
|
|
|
-IF (WIN32)
|
|
+IF (MSVC)
|
|
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
|
|
ADD_DEFINITIONS(-DWIN32)
|
|
SET(linkFlags "/PDB:NONE /INCREMENTAL:NO /OPT:NOREF /OPT:NOICF")
|
|
@@ -46,7 +46,7 @@
|
|
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 (WIN32)
|
|
+ELSE (MSVC)
|
|
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
|
|
IF(CMAKE_COMPILER_IS_GNUCC)
|
|
INCLUDE(CheckCCompilerFlag)
|
|
@@ -60,7 +60,7 @@
|
|
|
|
SET(CMAKE_C_FLAGS_DEBUG "-DDEBUG -g")
|
|
SET(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O2 -Wuninitialized")
|
|
-ENDIF (WIN32)
|
|
+ENDIF (MSVC)
|
|
|
|
|
|
ADD_SUBDIRECTORY(src)
|