]> git.proxmox.com Git - ceph.git/blob - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/yajl/cmake.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / yajl / cmake.patch
1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index 4c0a9be..cbec22f 100644
3 --- a/CMakeLists.txt
4 +++ b/CMakeLists.txt
5 @@ -28,7 +28,7 @@ ENDIF (NOT CMAKE_BUILD_TYPE)
6
7 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
8
9 -IF (WIN32)
10 +IF (WIN32 AND FALSE)
11 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
12 ADD_DEFINITIONS(-DWIN32)
13 SET(linkFlags "/PDB:NONE /INCREMENTAL:NO /OPT:NOREF /OPT:NOICF")
14 @@ -46,7 +46,8 @@ IF (WIN32)
15 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /wd4255 /wd4130 /wd4100 /wd4711")
16 SET(CMAKE_C_FLAGS_DEBUG "/D DEBUG /Od /Z7")
17 SET(CMAKE_C_FLAGS_RELEASE "/D NDEBUG /O2")
18 -ELSE (WIN32)
19 +endif()
20 +if (NOT WIN32)
21 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
22 IF(CMAKE_COMPILER_IS_GNUCC)
23 INCLUDE(CheckCCompilerFlag)
24 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
25 index 99cf9e9..454482a 100644
26 --- a/src/CMakeLists.txt
27 +++ b/src/CMakeLists.txt
28 @@ -78,7 +78,7 @@ INCLUDE_DIRECTORIES(${incDir}/..)
29 # at build time you may specify the cmake variable LIB_SUFFIX to handle
30 # 64-bit systems which use 'lib64'
31 INSTALL(TARGETS yajl
32 - RUNTIME DESTINATION lib${LIB_SUFFIX}
33 + RUNTIME DESTINATION bin
34 LIBRARY DESTINATION lib${LIB_SUFFIX}
35 ARCHIVE DESTINATION lib${LIB_SUFFIX})
36 INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})