aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2016-10-13 18:37:26 +0200
committerGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2016-10-13 21:11:02 +0200
commit588cf0f909f02bc07f5ead1f6b6f180d985bced3 (patch)
tree518484a5201d7a041110ed907107478de5d1f9da
parent9a7b3447e45fef6598825c0c46b05d296374c429 (diff)
downloadcanvas_display.lv2-588cf0f909f02bc07f5ead1f6b6f180d985bced3.zip
canvas_display.lv2-588cf0f909f02bc07f5ead1f6b6f180d985bced3.tar.gz
canvas_display.lv2-588cf0f909f02bc07f5ead1f6b6f180d985bced3.tar.bz2
canvas_display.lv2-588cf0f909f02bc07f5ead1f6b6f180d985bced3.tar.xz
fix cairo inclusion.
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--CMakeLists.txt18
-rw-r--r--VERSION2
-rw-r--r--cmake/arm-linux-gnueabihf.cmake1
-rw-r--r--cmake/i686-linux-gnu.cmake1
-rw-r--r--cmake/i686-w64-mingw32.cmake1
-rw-r--r--cmake/universal-apple-darwin.cmake1
-rw-r--r--cmake/x86_64-linux-gnu.cmake1
-rw-r--r--cmake/x86_64-w64-mingw32.cmake1
9 files changed, 25 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ada89e1..8fd87de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,8 @@ stages:
.build_template: &build_definition
<<: *common_definition
script:
+ - sed -i -e 's/cairo\/cairo/cairo/g' canvas_ui.c
+ - sed -i -e 's/cairo\/cairo/cairo/g' pugl/pugl/pugl_x11.c
- mkdir build
- pushd build
- cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR} -DPLUGIN_DEST="${BASE_NAME}-$(cat ../VERSION)/${CI_BUILD_NAME}/${BASE_NAME}" -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} ..
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1dfee4b..ae011fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,8 +39,18 @@ include_directories(${LV2_INCLUDE_DIRS})
pkg_search_module(CAIRO REQUIRED cairo>=1.14)
include_directories(${CAIRO_INCLUDE_DIRS})
-set(LIBS ${LIBS} ${CAIRO_LDFLAGS})
-set(LIBS_UI ${LIBS_UI} ${CAIRO_LDFLAGS})
+if(DEFINED STATIC_CAIRO)
+ set(LIBS ${STATIC_CAIRO} ${STATIC_PIXMAN} ${LIBS})
+ set(LIBS_UI ${STATIC_CAIROX} ${STATIC_PIXMAN} ${LIBS})
+
+ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+ set(LIBS ${LIBS} pthread)
+ set(LIBS_UI ${LIBS_UI} pthread)
+ endif()
+else()
+ set(LIBS ${LIBS} ${CAIRO_LDFLAGS})
+ set(LIBS_UI ${LIBS_UI} ${CAIRO_LDFLAGS})
+endif()
add_definitions("-DPUGL_HAVE_CAIRO")
find_package(OpenGL)
@@ -83,6 +93,10 @@ else() # GNU/Linux
include_directories(${X11_INCLUDE_DIRS})
set(LIBS_UI ${LIBS_UI} ${X11_LDFLAGS})
+ pkg_search_module(XEXT REQUIRED xext>=1.3)
+ include_directories(${XEXT_INCLUDE_DIRS})
+ set(LIBS_UI ${LIBS_UI} ${XEXT_LDFLAGS})
+
set(TAR_UI ${TAR_UI} pugl/pugl/pugl_x11.c)
endif()
diff --git a/VERSION b/VERSION
index 00d605c..0e74d9d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.281
+0.1.283
diff --git a/cmake/arm-linux-gnueabihf.cmake b/cmake/arm-linux-gnueabihf.cmake
index ac43290..3f33480 100644
--- a/cmake/arm-linux-gnueabihf.cmake
+++ b/cmake/arm-linux-gnueabihf.cmake
@@ -18,6 +18,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(STATIC_CAIRO "/opt/${TOOLCHAIN}/lib/libcairo.a")
+set(STATIC_CAIROX "/opt/${TOOLCHAIN}/lib/libcairoX.a")
set(STATIC_PIXMAN "/opt/${TOOLCHAIN}/lib/libpixman-1.a")
set(QEMU qemu-arm)
diff --git a/cmake/i686-linux-gnu.cmake b/cmake/i686-linux-gnu.cmake
index 6148f85..8422326 100644
--- a/cmake/i686-linux-gnu.cmake
+++ b/cmake/i686-linux-gnu.cmake
@@ -7,4 +7,5 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "c++ flags")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32" CACHE STRING "c flags")
set(STATIC_CAIRO "/opt/${TOOLCHAIN}/lib/libcairo.a")
+set(STATIC_CAIROX "/opt/${TOOLCHAIN}/lib/libcairoX.a")
set(STATIC_PIXMAN "/opt/${TOOLCHAIN}/lib/libpixman-1.a")
diff --git a/cmake/i686-w64-mingw32.cmake b/cmake/i686-w64-mingw32.cmake
index df7d2d0..8160732 100644
--- a/cmake/i686-w64-mingw32.cmake
+++ b/cmake/i686-w64-mingw32.cmake
@@ -19,6 +19,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(STATIC_CAIRO "/opt/${TOOLCHAIN}/lib/libcairo.a")
+set(STATIC_CAIROX "/opt/${TOOLCHAIN}/lib/libcairoX.a")
set(STATIC_PIXMAN "/opt/${TOOLCHAIN}/lib/libpixman-1.a")
set(WINE wine32)
diff --git a/cmake/universal-apple-darwin.cmake b/cmake/universal-apple-darwin.cmake
index 3efab34..31f2c10 100644
--- a/cmake/universal-apple-darwin.cmake
+++ b/cmake/universal-apple-darwin.cmake
@@ -20,4 +20,5 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(STATIC_CAIRO "/opt/${TOOLCHAIN}/lib/libcairo.a")
+set(STATIC_CAIROX "/opt/${TOOLCHAIN}/lib/libcairoX.a")
set(STATIC_PIXMAN "/opt/${TOOLCHAIN}/lib/libpixman-1.a")
diff --git a/cmake/x86_64-linux-gnu.cmake b/cmake/x86_64-linux-gnu.cmake
index 290d01b..8b09ebf 100644
--- a/cmake/x86_64-linux-gnu.cmake
+++ b/cmake/x86_64-linux-gnu.cmake
@@ -4,4 +4,5 @@ set(CMAKE_SYSTEM_PROCESSOR "x86_64")
set(TOOLCHAIN "x86_64-linux-gnu")
set(STATIC_CAIRO "/opt/${TOOLCHAIN}/lib/libcairo.a")
+set(STATIC_CAIROX "/opt/${TOOLCHAIN}/lib/libcairoX.a")
set(STATIC_PIXMAN "/opt/${TOOLCHAIN}/lib/libpixman-1.a")
diff --git a/cmake/x86_64-w64-mingw32.cmake b/cmake/x86_64-w64-mingw32.cmake
index d699ad3..bbf5392 100644
--- a/cmake/x86_64-w64-mingw32.cmake
+++ b/cmake/x86_64-w64-mingw32.cmake
@@ -19,6 +19,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(STATIC_CAIRO "/opt/${TOOLCHAIN}/lib/libcairo.a")
+set(STATIC_CAIROX "/opt/${TOOLCHAIN}/lib/libcairoX.a")
set(STATIC_PIXMAN "/opt/${TOOLCHAIN}/lib/libpixman-1.a")
set(WINE wine64)