From 463435db6872f2e127483d5ecefc812446140aec Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 26 Mar 2020 11:39:04 +0100
Subject: [PATCH] [localeq] De-cruft CMakeLists

- Remove commented-out code
- Fix layout
- Update to modern CMake approach
---
 src/modules/localeq/CMakeLists.txt | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/modules/localeq/CMakeLists.txt b/src/modules/localeq/CMakeLists.txt
index 99fac2a7e..b9ee645fc 100644
--- a/src/modules/localeq/CMakeLists.txt
+++ b/src/modules/localeq/CMakeLists.txt
@@ -6,37 +6,24 @@ if( DEBUG_TIMEZONES )
     add_definitions( -DDEBUG_TIMEZONES )
 endif()
 
+# Because we're sharing sources with the regular locale module
 set( _locale ${CMAKE_CURRENT_SOURCE_DIR}/../locale )
 
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ${CMAKE_CURRENT_SOURCE_DIR}/../../libcalamares ${_locale} )
+include_directories( ${_locale} )
 
 calamares_add_plugin( localeq
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
-        ${geoip_src}
         LocaleQmlViewStep.cpp
-		${_locale}/LocaleConfiguration.cpp
-		${_locale}/Config.cpp
+        ${_locale}/LocaleConfiguration.cpp
+        ${_locale}/Config.cpp
         ${_locale}/SetTimezoneJob.cpp
-		${_locale}/timezonewidget/localeglobal.cpp
+        ${_locale}/timezonewidget/localeglobal.cpp
     RESOURCES
         ${_locale}/locale.qrc
     LINK_PRIVATE_LIBRARIES
         calamaresui
         Qt5::Network
-        ${geoip_libs}
-        ${YAMLCPP_LIBRARY}
     SHARED_LIB
 )
-
-# add_executable( localeqmltest qmlmain.cpp Config.cpp LocaleQmlViewStep.cpp LocaleConfiguration.cpp timezonewidget/localeglobal.cpp SetTimezoneJob.cpp ${geoip_src} )
-# target_link_libraries( localeqmltest PRIVATE calamaresui Qt5::Core Qt5::Network Qt5::DBus ${geoip_libs})
-# set_target_properties( localeqmltest
-#     PROPERTIES
-#         ENABLE_EXPORTS TRUE
-#         RUNTIME_OUTPUT_NAME localeqmltest
-# )
-# calamares_automoc( localeqmltest )
-# calamares_autouic( localeqmltest )
-