[localeq] De-cruft CMakeLists
- Remove commented-out code - Fix layout - Update to modern CMake approach
This commit is contained in:
parent
ba8811c628
commit
463435db68
@ -6,37 +6,24 @@ if( DEBUG_TIMEZONES )
|
|||||||
add_definitions( -DDEBUG_TIMEZONES )
|
add_definitions( -DDEBUG_TIMEZONES )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Because we're sharing sources with the regular locale module
|
||||||
set( _locale ${CMAKE_CURRENT_SOURCE_DIR}/../locale )
|
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
|
calamares_add_plugin( localeq
|
||||||
TYPE viewmodule
|
TYPE viewmodule
|
||||||
EXPORT_MACRO PLUGINDLLEXPORT_PRO
|
EXPORT_MACRO PLUGINDLLEXPORT_PRO
|
||||||
SOURCES
|
SOURCES
|
||||||
${geoip_src}
|
|
||||||
LocaleQmlViewStep.cpp
|
LocaleQmlViewStep.cpp
|
||||||
${_locale}/LocaleConfiguration.cpp
|
${_locale}/LocaleConfiguration.cpp
|
||||||
${_locale}/Config.cpp
|
${_locale}/Config.cpp
|
||||||
${_locale}/SetTimezoneJob.cpp
|
${_locale}/SetTimezoneJob.cpp
|
||||||
${_locale}/timezonewidget/localeglobal.cpp
|
${_locale}/timezonewidget/localeglobal.cpp
|
||||||
RESOURCES
|
RESOURCES
|
||||||
${_locale}/locale.qrc
|
${_locale}/locale.qrc
|
||||||
LINK_PRIVATE_LIBRARIES
|
LINK_PRIVATE_LIBRARIES
|
||||||
calamaresui
|
calamaresui
|
||||||
Qt5::Network
|
Qt5::Network
|
||||||
${geoip_libs}
|
|
||||||
${YAMLCPP_LIBRARY}
|
|
||||||
SHARED_LIB
|
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 )
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user