Fixed build.

rilian-la-te · Sep 5, 2016 · 7f37423 · 7f37423
1 parent c403a52
commit 7f37423
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 36 deletions.
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
@@ -2,6 +2,7 @@ if (ENABLE_XFCE)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appmenu.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/xfce4/panel/plugins)
 endif()
 if (ENABLE_MATE)
+    configure_file(${CMAKE_SOURCE_DIR}/data/appmenu-mate.desktop.plugin.in ${CMAKE_SOURCE_DIR}/data/appmenu-mate.desktop.in)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appmenu-mate.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/mate-panel/applets/ RENAME org.vala-panel.appmenu.mate-panel-applet)
 endif()
 if (ENABLE_VALAPANEL)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -110,41 +110,6 @@ if (ENABLE_XFCE)
     # Install plugin stuffs
     install(TARGETS appmenu-xfce DESTINATION ${CMAKE_INSTALL_LIBDIR}/xfce4/panel/plugins)
 endif()
-
-##########
-# MATE Part
-##########
-if (ENABLE_MATE)
-    vala_precompile(VALA_C_MATE appmenu-mate
-	${CMAKE_BINARY_DIR}/vapi/config.vala
-	mate-plugin-appmenu.vala
-    PACKAGES
-	${CORE_PACKAGES}
-	vala-panel-appmenu
-	${WNCK_PACKAGES}
-	libmatepanelapplet-4.0
-    OPTIONS
-	--vapidir=${CMAKE_SOURCE_DIR}/vapi
-	--vapidir=${CMAKE_CURRENT_BINARY_DIR}
-	--target-glib=2.44
-	--gresources=${CMAKE_CURRENT_SOURCE_DIR}/libappmenu.gresource.xml
-	--thread
-	${WNCK_DEFINE}
-    )
-    set (MA_CFLAGS ${CORE_CFLAGS} ${WNCK_CFLAGS} ${MATE_CFLAGS})
-    add_definitions(${MA_CFLAGS})
-    set (MATE_LIB_FILES ${VALA_C_CORE} ${VALA_C_MATE} ${VALA_C_DBUSMENU})
-    add_library (appmenu-mate MODULE
-	${MATE_LIB_FILES}
-	${RESOURCES}
-    )
-    target_link_libraries (appmenu-mate ${CORE_LIBRARIES} ${WNCK_LIBRARIES} ${MATE_LIBRARIES} m)
-    target_include_directories (appmenu-mate PRIVATE ${CORE_INCLUDE_DIRS} ${WNCK_INCLUDE_DIRS} ${MATE_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
-    link_directories (${CORE_LIBRARY_DIRS} ${WNCK_LIBRARY_DIRS} ${MATE_LIBRARY_DIRS})
-    add_dependencies(appmenu-mate appmenu-core)
-    # Install plugin stuffs
-    install(TARGETS appmenu-mate DESTINATION ${CMAKE_INSTALL_LIBDIR}/mate-panel)
-endif()
 ##########
 # ValaPanel Part
 ##########
@@ -183,3 +148,37 @@ if(ENABLE_VALAPANEL)
     # Install plugin stuffs
     install(TARGETS appmenu-valapanel DESTINATION ${CMAKE_INSTALL_LIBDIR}/vala-panel/applets)
 endif()
+##########
+# MATE Part
+##########
+if (ENABLE_MATE)
+    vala_precompile(VALA_C_MATE appmenu-mate
+	mate-plugin-appmenu.vala
+	${CMAKE_BINARY_DIR}/vapi/config.vala
+    PACKAGES
+	${CORE_PACKAGES}
+	vala-panel-appmenu
+	${WNCK_PACKAGES}
+	libmatepanelapplet-4.0
+    OPTIONS
+	--vapidir=${CMAKE_SOURCE_DIR}/vapi
+	--vapidir=${CMAKE_CURRENT_BINARY_DIR}
+	--target-glib=2.44
+	--gresources=${CMAKE_CURRENT_SOURCE_DIR}/libappmenu.gresource.xml
+	--thread
+	${WNCK_DEFINE}
+    )
+    set (MA_CFLAGS ${CORE_CFLAGS} ${WNCK_CFLAGS} ${MATE_CFLAGS})
+    add_definitions(${MA_CFLAGS})
+    set (MATE_LIB_FILES ${VALA_C_CORE} ${VALA_C_MATE} ${VALA_C_DBUSMENU})
+    add_library (appmenu-mate MODULE
+	${MATE_LIB_FILES}
+	${RESOURCES}
+    )
+    target_link_libraries (appmenu-mate ${CORE_LIBRARIES} ${WNCK_LIBRARIES} ${MATE_LIBRARIES} m)
+    target_include_directories (appmenu-mate PRIVATE ${CORE_INCLUDE_DIRS} ${WNCK_INCLUDE_DIRS} ${MATE_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
+    link_directories (${CORE_LIBRARY_DIRS} ${WNCK_LIBRARY_DIRS} ${MATE_LIBRARY_DIRS})
+    add_dependencies(appmenu-mate appmenu-core)
+    # Install plugin stuffs
+    install(TARGETS appmenu-mate DESTINATION ${CMAKE_INSTALL_LIBDIR}/mate-panel)
+endif()
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
@@ -1,4 +1,3 @@
-configure_file(${CMAKE_SOURCE_DIR}/data/appmenu-mate.desktop.plugin.in ${CMAKE_SOURCE_DIR}/data/appmenu-mate.desktop.in)
 include(Translations)
 add_translations_directory("vala-panel-appmenu")
 add_translations_catalog("vala-panel-appmenu"