--- CMakeLists.txt.orig	2009-11-01 05:50:26 UTC
+++ CMakeLists.txt
@@ -1,11 +1,8 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
 
-PROJECT(BMPANEL)
-SET(BMPANEL_VERSION_MAJOR "2")
-SET(BMPANEL_VERSION_MINOR "1")
-SET(BMPANEL_VERSION "${BMPANEL_VERSION_MAJOR}.${BMPANEL_VERSION_MINOR}")
+PROJECT(BMPANEL VERSION 2.1)
 
-SET(BMPANEL_EXECUTABLE_NAME "bmpanel${BMPANEL_VERSION_MAJOR}")
+SET(BMPANEL_EXECUTABLE_NAME "bmpanel${PROJECT_VERSION_MAJOR}")
 
 # always compile with -Wall
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=gnu99")
@@ -50,9 +47,11 @@ PKG_CHECK_MODULES(GTHREAD REQUIRED gthread-2.0)
 
 INCLUDE_DIRECTORIES(${X11_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS}
 	${GLIB_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS})
+LINK_DIRECTORIES(${X11_LIBRARY_DIRS} ${CAIRO_LIBRARY_DIRS}
+	${GLIB_LIBRARY_DIRS} ${GTHREAD_LIBRARY_DIRS} ${PANGO_LIBRARY_DIRS})
 	
 ADD_EXECUTABLE(${BMPANEL_EXECUTABLE_NAME} ${SOURCES})
-TARGET_LINK_LIBRARIES(${BMPANEL_EXECUTABLE_NAME} ${X11_LIBRARIES}
+TARGET_LINK_LIBRARIES(${BMPANEL_EXECUTABLE_NAME} -lm ${X11_LIBRARIES}
 	${CAIRO_LIBRARIES} ${GLIB_LIBRARIES} ${GTHREAD_LIBRARIES} ${PANGO_LIBRARIES})
 
 # OPTIONS
@@ -60,7 +59,7 @@ OPTION(BMPANEL2_FEATURE_MANPAGE "Build man page? (requ
 OPTION(BMPANEL2_FEATURE_CONFIG "Install PyGTK based configuration tool? (requires Python and PyGTK)" ON)
 
 # install commands
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${BMPANEL_EXECUTABLE_NAME}
+INSTALL(TARGETS ${BMPANEL_EXECUTABLE_NAME}
 	DESTINATION bin)
 INSTALL(DIRECTORY themes
 	DESTINATION share/bmpanel2)