diff --git a/CMakeLists.txt b/CMakeLists.txt index f8d4a5c..8d4d837 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ pkg_search_module(GLIB REQUIRED glib-2.0) pkg_check_modules(GTK3 REQUIRED gtk+-3.0) pkg_check_modules(CAIRO REQUIRED cairo) -add_subdirectory(glade) +add_subdirectory(resources) add_subdirectory(doxygen) add_subdirectory(version) @@ -36,10 +36,10 @@ set(SOURCE add_compile_options(-Wall) -add_executable(${PROJECT_NAME} ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/glade/resources.c) +add_executable(${PROJECT_NAME} ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c) add_dependencies(${PROJECT_NAME} glib-resources) add_dependencies(${PROJECT_NAME} version) -SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/glade/resources.c PROPERTIES GENERATED 1) +SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c PROPERTIES GENERATED 1) target_link_libraries(${PROJECT_NAME} ${GLIB_LDFLAGS} ${GTK3_LDFLAGS} ${CAIRO_LDFLAGS} m version ${CMAKE_DL_LIBS}) install (TARGETS ${PROJECT_NAME} DESTINATION bin) diff --git a/glade/CMakeLists.txt b/resources/CMakeLists.txt similarity index 90% rename from glade/CMakeLists.txt rename to resources/CMakeLists.txt index 7e98584..80e3929 100644 --- a/glade/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -2,6 +2,7 @@ add_custom_target(glib-resources DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/resources.c add_custom_command(DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.glade ${CMAKE_CURRENT_SOURCE_DIR}/resources.xml + ${CMAKE_CURRENT_SOURCE_DIR}/color-palette.txt OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/resources.c COMMAND diff --git a/glade/about.glade b/resources/about.glade similarity index 100% rename from glade/about.glade rename to resources/about.glade diff --git a/glade/dialog.glade b/resources/dialog.glade similarity index 100% rename from glade/dialog.glade rename to resources/dialog.glade diff --git a/glade/layer-widget.glade b/resources/layer-widget.glade similarity index 100% rename from glade/layer-widget.glade rename to resources/layer-widget.glade diff --git a/glade/main.glade b/resources/main.glade similarity index 100% rename from glade/main.glade rename to resources/main.glade diff --git a/glade/resources.xml b/resources/resources.xml similarity index 100% rename from glade/resources.xml rename to resources/resources.xml