Fix deb package build

JoseExposito · Feb 24, 2021 · 2261cff · 2261cff
1 parent 8fce376
commit 2261cff
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 34 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,47 +16,47 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
 endif()
 
 find_package(Threads REQUIRED) # Required to use std threads
-find_package(Libudev REQUIRED)
-find_package(Libinput REQUIRED)
-find_package(PugiXML REQUIRED)
-find_package(Cairo REQUIRED)
+find_package(LIBUDEV REQUIRED)
+find_package(LIBINPUT REQUIRED)
+find_package(PUGIXML REQUIRED)
+find_package(CAIRO REQUIRED)
 find_package(X11 REQUIRED)
-find_package(XTest REQUIRED)
-find_package(Xrandr REQUIRED)
-find_package(XInput REQUIRED)
-find_package(GLib REQUIRED)
+find_package(XTEST REQUIRED)
+find_package(XRANDR REQUIRED)
+find_package(XINPUT REQUIRED)
+find_package(GLIB REQUIRED)
 
 include_directories(${PROJECT_SOURCE_DIR}/src)
 file(GLOB_RECURSE SOURCE_FILES RELATIVE ${PROJECT_SOURCE_DIR} src/*.h src/*.cpp)
 
 add_executable(touchegg ${SOURCE_FILES})
 target_include_directories(touchegg PUBLIC
-  ${Libudev_INCLUDE_DIRS}
-  ${Libinput_INCLUDE_DIRS}
-  ${PugiXML_INCLUDE_DIRS}
-  ${Cairo_INCLUDE_DIRS}
+  ${LIBUDEV_INCLUDE_DIRS}
+  ${LIBINPUT_INCLUDE_DIRS}
+  ${PUGIXML_INCLUDE_DIRS}
+  ${CAIRO_INCLUDE_DIRS}
   ${X11_INCLUDE_DIRS}
-  ${XTest_INCLUDE_DIRS}
-  ${Xrandr_INCLUDE_DIRS}
-  ${XInput_INCLUDE_DIRS}
-  ${GLib_INCLUDE_DIRS}
+  ${XTEST_INCLUDE_DIRS}
+  ${XRANDR_INCLUDE_DIRS}
+  ${XINPUT_INCLUDE_DIRS}
+  ${GLIB_INCLUDE_DIRS}
 )
 target_link_libraries(touchegg
   stdc++fs # std::filesystem
   Threads::Threads # std::thread
-  ${Libudev_LIBRARIES}
-  ${Libinput_LIBRARIES}
-  ${PugiXML_LIBRARIES}
-  ${Cairo_LIBRARIES}
+  ${LIBUDEV_LIBRARIES}
+  ${LIBINPUT_LIBRARIES}
+  ${PUGIXML_LIBRARIES}
+  ${CAIRO_LIBRARIES}
   ${X11_LIBRARIES}
-  ${XTest_LIBRARIES}
-  ${Xrandr_LIBRARIES}
-  ${XInput_LIBRARIES}
-  ${GLib_LIBRARIES}
+  ${XTEST_LIBRARIES}
+  ${XRANDR_LIBRARIES}
+  ${XINPUT_LIBRARIES}
+  ${GLIB_LIBRARIES}
 )
 
 if(NOT DEFINED AUTO_COLORS OR AUTO_COLORS)
-  find_package(Gtk3 REQUIRED)
+  find_package(GTK3 REQUIRED)
   target_include_directories(touchegg PUBLIC ${GTK3_INCLUDE_DIRS})
   target_link_libraries(touchegg ${GTK3_LIBRARIES})
   add_definitions(-DAUTO_COLORS=ON)

diff --git a/cmake/Modules/FindCairo.cmake → cmake/Modules/FindCAIRO.cmake b/cmake/Modules/FindCairo.cmake → cmake/Modules/FindCAIRO.cmake
@@ -2,4 +2,4 @@ find_package(PkgConfig)
 pkg_check_modules(CAIRO REQUIRED cairo)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cairo DEFAULT_MSG CAIRO_FOUND)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CAIRO DEFAULT_MSG CAIRO_FOUND)
diff --git a/cmake/Modules/FindGLib.cmake → cmake/Modules/FindGLIB.cmake b/cmake/Modules/FindGLib.cmake → cmake/Modules/FindGLIB.cmake
@@ -2,4 +2,4 @@ find_package(PkgConfig)
 pkg_check_modules(GLIB REQUIRED glib-2.0)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLib DEFAULT_MSG GLIB_FOUND)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLIB DEFAULT_MSG GLIB_FOUND)
diff --git a/cmake/Modules/FindGtk3.cmake → cmake/Modules/FindGTK3.cmake b/cmake/Modules/FindGtk3.cmake → cmake/Modules/FindGTK3.cmake
@@ -2,4 +2,4 @@ find_package(PkgConfig)
 pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gtk3 DEFAULT_MSG GTK3_FOUND)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3 DEFAULT_MSG GTK3_FOUND)
diff --git a/cmake/Modules/FindLibinput.cmake → cmake/Modules/FindLIBINPUT.cmake b/cmake/Modules/FindLibinput.cmake → cmake/Modules/FindLIBINPUT.cmake
@@ -2,4 +2,4 @@ find_package(PkgConfig)
 pkg_check_modules(LIBINPUT REQUIRED libinput)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Libinput DEFAULT_MSG LIBINPUT_FOUND)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBINPUT DEFAULT_MSG LIBINPUT_FOUND)
diff --git a/cmake/Modules/FindLibudev.cmake → cmake/Modules/FindLIBUDEV.cmake b/cmake/Modules/FindLibudev.cmake → cmake/Modules/FindLIBUDEV.cmake
@@ -2,4 +2,4 @@ find_package(PkgConfig)
 pkg_check_modules(LIBUDEV REQUIRED libudev)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Libudev DEFAULT_MSG LIBUDEV_FOUND)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUDEV DEFAULT_MSG LIBUDEV_FOUND)
diff --git a/cmake/Modules/FindPugiXML.cmake → cmake/Modules/FindPUGIXML.cmake b/cmake/Modules/FindPugiXML.cmake → cmake/Modules/FindPUGIXML.cmake
@@ -2,4 +2,4 @@ find_package(PkgConfig)
 pkg_check_modules(PUGIXML REQUIRED pugixml)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PugiXML DEFAULT_MSG PUGIXML_FOUND)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PUGIXML DEFAULT_MSG PUGIXML_FOUND)
diff --git a/cmake/Modules/FindXInput.cmake → cmake/Modules/FindXINPUT.cmake b/cmake/Modules/FindXInput.cmake → cmake/Modules/FindXINPUT.cmake
@@ -2,4 +2,4 @@ find_package(PkgConfig)
 pkg_check_modules(XINPUT REQUIRED xi)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(XInput DEFAULT_MSG XINPUT_FOUND)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(XINPUT DEFAULT_MSG XINPUT_FOUND)
diff --git a/cmake/Modules/FindXrandr.cmake → cmake/Modules/FindXRANDR.cmake b/cmake/Modules/FindXrandr.cmake → cmake/Modules/FindXRANDR.cmake
@@ -2,4 +2,4 @@ find_package(PkgConfig)
 pkg_check_modules(XRANDR REQUIRED xrandr)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xrandr DEFAULT_MSG XRANDR_FOUND)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(XRANDR DEFAULT_MSG XRANDR_FOUND)
diff --git a/cmake/Modules/FindXTest.cmake → cmake/Modules/FindXTEST.cmake b/cmake/Modules/FindXTest.cmake → cmake/Modules/FindXTEST.cmake
@@ -2,4 +2,4 @@ find_package(PkgConfig)
 pkg_check_modules(XTEST REQUIRED xtst)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(XTest DEFAULT_MSG XTEST_FOUND)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(XTEST DEFAULT_MSG XTEST_FOUND)