update

CMakeLists.txt

@@ -3,29 +3,6 @@ project(
 	mdebase
 )
 
-macro(PKGCONF_ADD dest name)
-	pkg_check_modules(${name} REQUIRED ${name})
-	target_include_directories(
-		${dest}
-		PRIVATE
-		${${name}_INCLUDE_DIRS}
-	)
-	target_link_directories(
-		${dest}
-		PRIVATE
-		${${name}_LIBRARY_DIRS}
-	)
-	target_link_libraries(
-		${dest}
-		PRIVATE
-		${${name}_LIBRARIES}
-	)
-endmacro()
-
-include(GNUInstallDirs)
-configure_file(include/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 add_subdirectory(mdm)
 add_subdirectory(milkwm)
 add_subdirectory(mpanel)

include/config.h.in

@@ -1,8 +0,0 @@
-#ifndef __CONFIG_H__
-#define __CONFIG_H__
-
-#define PREFIX "@CMAKE_INSTALL_PREFIX@"
-#define CONFDIR "@CMAKE_INSTALL_FULL_SYSCONFDIR@"
-#define DATADIR "@CMAKE_INSTALL_FULL_DATAROOTDIR@"
-
-#endif

mdm/CMakeLists.txt

@@ -1,37 +1,17 @@
-project(
-	mdm
-)
+setup_project(mdm ${CMAKE_INSTALL_SBINDIR})
 
-find_package(PkgConfig)
-
-file(
-	GLOB
-	mdm_SRC
-	*.c
-)
-
-add_executable(
-	mdm
-	${mdm_SRC}
-)
-
-PKGCONF_ADD(mdm x11)
-PKGCONF_ADD(mdm inih)
+pkg_config_add(mdm x11)
+pkg_config_add(mdm inih)
 
 target_link_libraries(
 	mdm
 	PRIVATE
-	pam pthread MDELib Mw
+	pam pthread
 )
 
-
 include(GNUInstallDirs)
 configure_file(mdmrc.in mdmrc)
 
-install(
-	TARGETS mdm
-	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
-)
 install(
 	FILES pam
 	RENAME mdm

milkwm/CMakeLists.txt

@@ -1,26 +1 @@
-project(
-	milkwm
-)
-
-file(
-	GLOB
-	milkwm_SRC
-	*.c
-)
-
-add_executable(
-	milkwm
-	${milkwm_SRC}
-)
-
-target_link_libraries(
-	milkwm
-	PRIVATE
-	MDELib
-)
-
-include(GNUInstallDirs)
-install(
-	TARGETS milkwm
-	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
+setup_project(milkwm ${CMAKE_INSTALL_BINDIR})

mpanel/CMakeLists.txt

@@ -1,23 +1,5 @@
-project(
-	mpanel
-)
+setup_project(mpanel ${CMAKE_INSTALL_BINDIR})
 
-file(
-	GLOB
-	mpanel_SRC
-	*.c
-)
-
-add_executable(
-	mpanel
-	${mpanel_SRC}
-)
-
-target_link_libraries(
-	mpanel
-	PRIVATE
-	MDELib
-)
 if(${CMAKE_SYSTEM_NAME} STREQUAL Linux)
 	target_link_libraries(
 		mpanel
@@ -25,9 +7,3 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL Linux)
 		dl
 	)
 endif()
-
-include(GNUInstallDirs)
-install(
-	TARGETS mpanel
-	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)