Update to use gtkmm 3
This commit is contained in:
@@ -24,7 +24,7 @@ build-job: # This job runs in the build stage, which runs first.
|
|||||||
- linux
|
- linux
|
||||||
before_script:
|
before_script:
|
||||||
- apt update
|
- apt update
|
||||||
- apt install -y cmake libgtk2.0-dev
|
- apt install -y cmake libgtkmm-3.0-dev
|
||||||
script:
|
script:
|
||||||
- echo "Configuring"
|
- echo "Configuring"
|
||||||
- cmake -B build .
|
- cmake -B build .
|
||||||
|
|||||||
@@ -3,8 +3,8 @@ set(CMAKE_CXX_STANDARD 17)
|
|||||||
|
|
||||||
project(PiCamera)
|
project(PiCamera)
|
||||||
|
|
||||||
# Find gtk+-2.0 library
|
# Find gtk+-4.0 library
|
||||||
find_package(PkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
pkg_check_modules(GTK2 REQUIRED gtk+-2.0)
|
pkg_check_modules(GTK REQUIRED gtkmm-3.0)
|
||||||
|
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Camera for Raspberry Pi in C++ :)
|
|||||||
Requirements:
|
Requirements:
|
||||||
```
|
```
|
||||||
cmake
|
cmake
|
||||||
libgtk2.0-dev
|
libgtkmm-3.0-dev
|
||||||
```
|
```
|
||||||
|
|
||||||
Then:
|
Then:
|
||||||
|
|||||||
@@ -5,16 +5,16 @@ add_executable(
|
|||||||
target_include_directories(
|
target_include_directories(
|
||||||
JAMCS
|
JAMCS
|
||||||
PRIVATE
|
PRIVATE
|
||||||
${GTK2_INCLUDE_DIRS}
|
${GTK_INCLUDE_DIRS}
|
||||||
)
|
)
|
||||||
target_link_directories(
|
target_link_directories(
|
||||||
JAMCS
|
JAMCS
|
||||||
PRIVATE
|
PRIVATE
|
||||||
${GTK2_LIBRARY_DIRS}
|
${GTK_LIBRARY_DIRS}
|
||||||
)
|
)
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
JAMCS
|
JAMCS
|
||||||
PRIVATE
|
PRIVATE
|
||||||
${GTK2_LIBRARIES}
|
${GTK_LIBRARIES}
|
||||||
)
|
)
|
||||||
add_definitions (${GTK2_CFLAGS_OTHER})
|
add_definitions (${GTK_CFLAGS_OTHER})
|
||||||
|
|||||||
Reference in New Issue
Block a user