Re-enable CMake build support
This commit is contained in:
parent
90458c38c3
commit
907ce8082f
|
@ -0,0 +1,3 @@
|
||||||
|
[submodule "GCR_CMake"]
|
||||||
|
path = GCR_CMake
|
||||||
|
url = https://github.com/daleclack/GCR_CMake
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 6ea69eca6817aead20a2cb87cdd08ab8e9a173cd
|
|
@ -0,0 +1,57 @@
|
||||||
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
cmake_minimum_required(VERSION 3.0.0)
|
||||||
|
project(XeRelease VERSION 14.0.0)
|
||||||
|
|
||||||
|
#Add GCR_CMake
|
||||||
|
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../GCR_CMake/macros)
|
||||||
|
include(GlibCompileResourcesSupport)
|
||||||
|
|
||||||
|
include(CTest)
|
||||||
|
enable_testing()
|
||||||
|
|
||||||
|
set(CPACK_PROJECT_NAME ${PROJECT_NAME})
|
||||||
|
set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})
|
||||||
|
|
||||||
|
include(CPack)
|
||||||
|
include_directories(..)
|
||||||
|
include_directories(../cfgfile2)
|
||||||
|
|
||||||
|
find_package (PkgConfig REQUIRED)
|
||||||
|
pkg_check_modules (GTKMM3 REQUIRED gtkmm-3.0)
|
||||||
|
include_directories (${GTKMM3_INCLUDE_DIRS})
|
||||||
|
link_directories (${GTKMM3_LIBRARY_DIRS})
|
||||||
|
|
||||||
|
set(SOURCES src/main.cc src/MyWin.cc src/MyDialog.cc
|
||||||
|
src/xerelease.cc src/xeapi.cc ../cfgfile2/cfgfile.cc)
|
||||||
|
|
||||||
|
#Compile resources with GCR_CMake
|
||||||
|
set(RESOURCE_LIST
|
||||||
|
STRIPBLANKS menubar.xml
|
||||||
|
STRIPBLANKS prefs.ui
|
||||||
|
icons/16x16/actions/open-menu.png
|
||||||
|
icons/48x48/actions/Xe-Release.png)
|
||||||
|
|
||||||
|
compile_gresources(RESOURCE_FILE
|
||||||
|
XML_OUT
|
||||||
|
TYPE EMBED_C
|
||||||
|
RESOURCES ${RESOURCE_LIST}
|
||||||
|
PREFIX "/org/gtk/daleclack"
|
||||||
|
SOURCE_DIR ${PROJECT_SOURCE_DIR}/res)
|
||||||
|
|
||||||
|
# Add a custom target to the makefile. Now make builds our resource file.
|
||||||
|
# It depends on the output RESOURCE_FILE.
|
||||||
|
add_custom_target(resource ALL DEPENDS ${RESOURCE_FILE})
|
||||||
|
|
||||||
|
if(WIN32)
|
||||||
|
SET(CMAKE_RC_COMPILER windres)
|
||||||
|
set(app_WINRC icon.rc)
|
||||||
|
set_property(SOURCE icon.rc APPEND PROPERTY
|
||||||
|
OBJECT_DEPENDS ${PROJECT_SOURCE_DIR}/icon.ico
|
||||||
|
)
|
||||||
|
add_executable(XeRelease WIN32 ${app_WINRC} ${SOURCES} ${RESOURCE_FILE})
|
||||||
|
else()
|
||||||
|
add_executable(XeRelease ${SOURCES} ${RESOURCE_FILE})
|
||||||
|
endif(WIN32)
|
||||||
|
|
||||||
|
SET (CMAKE_EXTRA_CXX_FLAGS ${GTKMM3_CFLAGS_OTHER})
|
||||||
|
target_link_libraries (${PROJECT_NAME} ${GTKMM3_LIBRARIES})
|
|
@ -1,33 +0,0 @@
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
|
||||||
cmake_minimum_required(VERSION 3.0.0)
|
|
||||||
project(XeRelease VERSION 12.1.0)
|
|
||||||
|
|
||||||
include(CTest)
|
|
||||||
enable_testing()
|
|
||||||
|
|
||||||
set(CPACK_PROJECT_NAME ${PROJECT_NAME})
|
|
||||||
set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})
|
|
||||||
|
|
||||||
include(CPack)
|
|
||||||
include_directories(..)
|
|
||||||
|
|
||||||
find_package (PkgConfig REQUIRED)
|
|
||||||
pkg_check_modules (GTKMM3 REQUIRED gtkmm-3.0)
|
|
||||||
include_directories (${GTKMM3_INCLUDE_DIRS})
|
|
||||||
link_directories (${GTKMM3_LIBRARY_DIRS})
|
|
||||||
|
|
||||||
if(WIN32)
|
|
||||||
SET(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
|
|
||||||
set(app_WINRC icon.rc)
|
|
||||||
set_property(SOURCE icon.rc APPEND PROPERTY
|
|
||||||
OBJECT_DEPENDS ${PROJECT_SOURCE_DIR}/icon.ico
|
|
||||||
)
|
|
||||||
add_executable(XeRelease WIN32 ${app_WINRC} src/main.cc src/MyWin.cc src/MyDialog.cc
|
|
||||||
src/xerelease.cc src/xeapi.cc src/resources.cpp)
|
|
||||||
else()
|
|
||||||
add_executable(XeRelease src/main.cc src/MyWin.cc src/MyDialog.cc
|
|
||||||
src/xerelease.cc src/xeapi.cc src/resources.cpp)
|
|
||||||
endif(WIN32)
|
|
||||||
|
|
||||||
SET (CMAKE_EXTRA_CXX_FLAGS ${GTKMM3_CFLAGS_OTHER})
|
|
||||||
target_link_libraries (${PROJECT_NAME} ${GTKMM3_LIBRARIES})
|
|
|
@ -3,8 +3,6 @@
|
||||||
<gresource prefix="org/gtk/daleclack">
|
<gresource prefix="org/gtk/daleclack">
|
||||||
<file>icons/16x16/actions/open-menu.png</file>
|
<file>icons/16x16/actions/open-menu.png</file>
|
||||||
<file>icons/48x48/actions/Xe-Release.png</file>
|
<file>icons/48x48/actions/Xe-Release.png</file>
|
||||||
</gresource>
|
|
||||||
<gresource prefix="XeRelease">
|
|
||||||
<file preprocess="xml-stripblanks">menubar.xml</file>
|
<file preprocess="xml-stripblanks">menubar.xml</file>
|
||||||
<file preprocess="xml-stripblanks">prefs.ui</file>
|
<file preprocess="xml-stripblanks">prefs.ui</file>
|
||||||
</gresource>
|
</gresource>
|
||||||
|
|
|
@ -80,7 +80,7 @@ void MyDialog::on_response(int response_id){
|
||||||
|
|
||||||
MyDialog * MyDialog::create(Gtk::Window& parent){
|
MyDialog * MyDialog::create(Gtk::Window& parent){
|
||||||
//Create a dialog
|
//Create a dialog
|
||||||
auto builder=Gtk::Builder::create_from_resource("/XeRelease/prefs.ui");
|
auto builder=Gtk::Builder::create_from_resource("/org/gtk/daleclack/prefs.ui");
|
||||||
|
|
||||||
MyDialog * dialog=nullptr;
|
MyDialog * dialog=nullptr;
|
||||||
builder->get_widget_derived("prefs",dialog);
|
builder->get_widget_derived("prefs",dialog);
|
||||||
|
|
|
@ -70,7 +70,7 @@ void MyWin::titlebar_init()
|
||||||
set_titlebar(header);
|
set_titlebar(header);
|
||||||
|
|
||||||
// Initalize Menu
|
// Initalize Menu
|
||||||
menu_builder = Gtk::Builder::create_from_resource("/XeRelease/menubar.xml");
|
menu_builder = Gtk::Builder::create_from_resource("/org/gtk/daleclack/menubar.xml");
|
||||||
auto object = menu_builder->get_object("app-menu");
|
auto object = menu_builder->get_object("app-menu");
|
||||||
auto gmenu = Glib::RefPtr<Gio::Menu>::cast_dynamic(object);
|
auto gmenu = Glib::RefPtr<Gio::Menu>::cast_dynamic(object);
|
||||||
popover.bind_model(gmenu);
|
popover.bind_model(gmenu);
|
||||||
|
|
Loading…
Reference in New Issue