Mercurial > molko

changeset 194:10a7df431d00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
misc: portability fixes
author David Demelier <markand@malikania.fr>
date Sat, 07 Nov 2020 21:04:04 +0100
parents 78774cc2cc6b
children 02285657294c
files extern/libsqlite/CMakeLists.txt libcore/CMakeLists.txt tools/bcc/bcc.c
diffstat 3 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/extern/libsqlite/CMakeLists.txt	Sat Nov 07 19:26:51 2020 +0100
+++ b/extern/libsqlite/CMakeLists.txt	Sat Nov 07 21:04:04 2020 +0100
@@ -18,6 +18,8 @@
 
 project(libsqlite)
 
+find_package(Threads REQUIRED)
+
 molko_define_library(
 	TARGET libsqlite
 	SOURCES sqlite3.c sqlite3.h
@@ -25,4 +27,5 @@
 	PUBLIC_INCLUDES
 		$<BUILD_INTERFACE:${libsqlite_SOURCE_DIR}>
 		$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+	LIBRARIES Threads::Threads ${CMAKE_DL_LIBS}
 )
--- a/libcore/CMakeLists.txt	Sat Nov 07 19:26:51 2020 +0100
+++ b/libcore/CMakeLists.txt	Sat Nov 07 21:04:04 2020 +0100
@@ -18,6 +18,8 @@
 
 project(libcore)
 
+include(CheckLibraryExists)
+
 set(
 	SQL_ASSETS
 	${libcore_SOURCE_DIR}/core/assets/sql/init.sql
@@ -87,11 +89,14 @@
 	${libcore_SOURCE_DIR}/core/window_p.h
 )
 
+check_library_exists(m sqrt "" LIBM)
+
 molko_define_library(
 	TARGET libcore
 	SOURCES ${SOURCES} ${SQL_ASSETS}
 	ASSETS ${SQL_ASSETS}
 	LIBRARIES
+		$<$<BOOL:${LIBM}>:m>
 		libsqlite
 		SDL2::SDL2
 		SDL2::image
--- a/tools/bcc/bcc.c	Sat Nov 07 19:26:51 2020 +0100
+++ b/tools/bcc/bcc.c	Sat Nov 07 21:04:04 2020 +0100
@@ -16,6 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define _XOPEN_SOURCE 700
 #include <errno.h>
 #include <stdarg.h>
 #include <stdbool.h>