drogonCMS-cmake into main branch that replaces make plus other things #1

Merged
sharpetronics merged 36 commits from drogonCMS-cmake into master 2024-01-18 19:01:07 -05:00
2 changed files with 8 additions and 7 deletions
Showing only changes of commit 76c2bfc873 - Show all commits

View File

@ -34,16 +34,17 @@ set(CMAKE_PROJECT_DESCRIPTION "A GTK / Drogon CMS")
set(CMAKE_PROJECT_HOMEPAGE_URL "https://github.com/odinzu/drogoncms")
set(CMAKE_C_STANDARD 11)
#set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_C_STANDARD_REQUIRED ON)
#set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
# This is your project statement. You should always list languages;
# Listing the version is nice here since it sets lots of useful variables
# we removed LANGUAGES C from project to allow for automatic compiler/linker checks; we will use C and C++ libraries for this project.
project(
DrogonCMS
VERSION 1.0)
VERSION 1.0
)
#===============================================================================
# Setting compilation flags for various compilers and build types:
@ -83,7 +84,7 @@ set(WARNING_LEVELS_GCC_DEBUG
# set(CMAKE_BUILD_TYPE debug)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug CACHE STRING
"Choose build type: None Debug Release RelWithDebInfo MinSizeRel"
"Choose build type: None Debug Release"
FORCE)
endif()

View File

@ -2,9 +2,9 @@
# This software creates a local/remote Drogon content management system (CMS) application with Gtk-4.0 GUI and the Drogon framework.
# A Drogon Dashboard built with C, Drogon, GNU Autotools, Adwaita and Gtk4.
#
# Copyright (C) SharpeTronics, Inc. - 2013-PRESENT
# Copyright (C) SharpeTronics, LLC. - 2013-PRESENT
#
# Author(s): SharpeTronics, Inc.
# Author(s): SharpeTronics, LLC.
# oDinZu WenKi
#
# License: GPL-3.0
@ -72,7 +72,7 @@ activate(GtkApplication *app,
GtkBuilder *builder = gtk_builder_new();
/* Loads the UI objects */
gtk_builder_add_from_file(builder, "../src/ui/admin-register.ui", NULL);
gtk_builder_add_from_file(builder, "src/ui/admin-register.ui", NULL);
/* Register the ID's of gtk_object from admin-register.ui */
GObject *window = gtk_builder_get_object(builder, "register_window");