mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-13 07:10:05 +02:00
54 lines
2.0 KiB
Plaintext
54 lines
2.0 KiB
Plaintext
From fe1928ac190c5e8ad0cd4b9b5e34e430eba9efb1 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Sun, 16 Dec 2018 13:16:04 +0100
|
|
Subject: Build fix for Haiku
|
|
|
|
|
|
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
|
|
index 4d448cc..48f16ef 100644
|
|
--- a/example/CMakeLists.txt
|
|
+++ b/example/CMakeLists.txt
|
|
@@ -26,7 +26,7 @@ include_directories("../include/")
|
|
add_definitions(-D__STDC_FORMAT_MACROS)
|
|
|
|
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -Werror -Wall -Wextra -Weffc++ -Wswitch-default")
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lpthread -Werror -Wall -Wextra -Weffc++ -Wswitch-default")
|
|
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Weffc++ -Wswitch-default -Wfloat-equal -Wimplicit-fallthrough -Weverything")
|
|
endif()
|
|
--
|
|
2.23.0
|
|
|
|
|
|
From 73c5f7ae01d24ec8556add4e9b879927a90a9009 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Fri, 23 Aug 2019 16:21:48 +0200
|
|
Subject: PKGCONFIG fix
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index ceda71b..99e3d51 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -93,6 +93,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
|
|
endif()
|
|
|
|
#add extra search paths for libraries and includes
|
|
+SET(INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH "The prefix directory")
|
|
SET(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in")
|
|
SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE STRING "Directory where lib will install")
|
|
SET(DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}" CACHE PATH "Path to the documentation")
|
|
diff --git a/RapidJSON.pc.in b/RapidJSON.pc.in
|
|
index 7467f97..28b88c4 100644
|
|
--- a/RapidJSON.pc.in
|
|
+++ b/RapidJSON.pc.in
|
|
@@ -1,3 +1,4 @@
|
|
+prefix=@INSTALL_PREFIX@
|
|
includedir=@INCLUDE_INSTALL_DIR@
|
|
|
|
Name: @PROJECT_NAME@
|
|
--
|
|
2.23.0
|
|
|