kolan
/
gtkbuilder-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Config added.

This commit is contained in:
Kolan Sh 2015-10-24 19:17:17 +03:00
parent df2f9f2b54
commit e08640e979
9 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -11,7 +11,7 @@ SET (PATCH 0)
LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/backbone) LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/backbone)
#ADD_SUBDIRECTORY (config) ADD_SUBDIRECTORY (config)
ADD_SUBDIRECTORY (src) ADD_SUBDIRECTORY (src)
ADD_SUBDIRECTORY (pkg-config) ADD_SUBDIRECTORY (pkg-config)
ADD_SUBDIRECTORY (po) ADD_SUBDIRECTORY (po)

2
cmake/backbone

@ -1 +1 @@
Subproject commit 972b5e5d882bb590fb5eee248c92cdc13ff19c5f Subproject commit 4b74a70c2806e160ac2ae1cfe8a960cee8d490d4

2
config/CMakeLists.txt Normal file
View File

@ -0,0 +1,2 @@
CONFIGURE_FILE ("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/config.h")

6
config/Config.vapi Normal file
View File

@ -0,0 +1,6 @@
[CCode (cheader_filename = "config.h")]
namespace Config {
static const int VERSION_MAJOR;
static const int VERSION_MINOR;
static const int VERSION_PATCH;
}

3
config/config.h.in Normal file
View File

@ -0,0 +1,3 @@
#define CONFIG_VERSION_MAJOR @MAJOR@
#define CONFIG_VERSION_MINOR @MINOR@
#define CONFIG_VERSION_PATCH @PATCH@

4
src/CMakeLists.txt
View File

@ -1,7 +1,9 @@
SET (BinName gtkbuilder-test) SET (BinName gtkbuilder-test-${MAJOR})
FILE (GLOB_RECURSE BinSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.vala) FILE (GLOB_RECURSE BinSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.vala)
SET (BinPackages gtk+-3.0) SET (BinPackages gtk+-3.0)
SET (BinPkgModules gtk+-3.0) SET (BinPkgModules gtk+-3.0)
SET (BinCustomVapis ${CMAKE_SOURCE_DIR}/config/Config.vapi)
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/config")
SET (BinInstall ON) SET (BinInstall ON)
IF (WIN32) IF (WIN32)
SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-all-symbols") SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-all-symbols")

2
src/GtkBuilderTest.vala
View File

@ -23,7 +23,7 @@ int main (string[] args) {
// Custom location: // Custom location:
File exec_file = File.new_for_path (Environment.find_program_in_path (args[0])); File exec_file = File.new_for_path (Environment.find_program_in_path (args[0]));
string settings_dir = Path.build_path (Path.DIR_SEPARATOR_S, string settings_dir = Path.build_path (Path.DIR_SEPARATOR_S,
exec_file.get_parent().get_parent().get_path(), "share/gtkbuilder-test/ui"); exec_file.get_parent().get_parent().get_path(), "share/gtkbuilder-test-"+Config.VERSION_MAJOR.to_string()+"/ui");
// l18n location: // l18n location:
string localedir = Path.build_path (Path.DIR_SEPARATOR_S, exec_file.get_parent().get_parent().get_path(), "share/locale"); string localedir = Path.build_path (Path.DIR_SEPARATOR_S, exec_file.get_parent().get_parent().get_path(), "share/locale");

2
ui/CMakeLists.txt
View File

@ -1 +1 @@
INSTALL (FILES glade/gtkbuilder-test.glade DESTINATION "share/gtkbuilder-test/ui") ADD_SUBDIRECTORY (glade)

1
ui/glade/CMakeLists.txt Normal file
View File

@ -0,0 +1 @@
INSTALL (FILES gtkbuilder-test.glade DESTINATION "share/gtkbuilder-test-${MAJOR}/ui")