Initial edits to new CMakeLists.txt

3 files changed, 296 insertions, 263 deletions

diff --git a/sigmodr/CMakeLists.txt b/sigmodr/CMakeLists.txt
index 0f730efc..6ce22902 100644
--- a/sigmodr/CMakeLists.txt
+++ b/sigmodr/CMakeLists.txt
@@ -9,292 +9,39 @@ include_directories(
     ${PROJECT_BINARY_DIR}
 )
 
-set(sigmodr_FORMS
-    gui/ability.ui
-    gui/author.ui
-    gui/badge.ui
-    gui/coinlist.ui
-    gui/coinlistitem.ui
-    gui/egggroup.ui
-    gui/fraction.ui
-    gui/globalscript.ui
-    gui/item.ui
-    gui/itemtype.ui
-    gui/map.ui
-    gui/mapeffect.ui
-    gui/maptrainer.ui
-    gui/maptrainerteammember.ui
-    gui/mapwarp.ui
-    gui/mapwildlist.ui
-    gui/mapwildlistencounter.ui
-    gui/move.ui
-    gui/nature.ui
-    gui/rules.ui
-    gui/script.ui
-    gui/sigmod.ui
-    gui/sigmodr.ui
-    gui/skin.ui
-    gui/sound.ui
-    gui/species.ui
-    gui/speciesmove.ui
-    gui/sprite.ui
-    gui/status.ui
-    gui/store.ui
-    gui/tile.ui
-    gui/time.ui
-    gui/trainer.ui
-    gui/type.ui
-    gui/weather.ui
+set(sigmodrwidgets_FORMS
+    sigmodr.ui
 )
 kde4_add_ui_files(sigmodr_UI_HEADERS ${sigmodr_FORMS})
 set(sigmodr_KCFGC_FILES
     SigmodrPreferences.kcfgc
 )
 kde4_add_kcfg_files(sigmodr_KCFGC_SRCS ${sigmodr_KCFGC_FILES})
-set(sigmodr_WIDGET_HEADERS
-    AbilityUI.h
-    AuthorUI.h
-    BadgeUI.h
-    CoinListUI.h
-    CoinListItemUI.h
-    EggGroupUI.h
-    GlobalScriptUI.h
-    ItemUI.h
-    ItemTypeUI.h
-    MapUI.h
-    MapEffectUI.h
-    MapTrainerUI.h
-    MapTrainerTeamMemberUI.h
-    MapWarpUI.h
-    MapWildListUI.h
-    MapWildListEncounterUI.h
-    MoveUI.h
-    NatureUI.h
-    ObjectUI.h
-    RulesUI.h
-    SigmodUI.h
-    SkinUI.h
-    SoundUI.h
-    SpeciesUI.h
-    SpeciesMoveUI.h
-    SpriteUI.h
-    StatusUI.h
-    StoreUI.h
-    TileUI.h
-    TimeUI.h
-    TrainerUI.h
-    TypeUI.h
-    WeatherUI.h
-)
-set(sigmodr_MODEL_HEADERS
-    models/AbilityGroupModel.h
-    models/AbilityModel.h
-    models/AuthorGroupModel.h
-    models/AuthorModel.h
-    models/BadgeGroupModel.h
-    models/BadgeModel.h
-    models/BaseModel.h
-    models/BaseObjectModel.h
-    models/CoinListGroupModel.h
-    models/CoinListModel.h
-    models/CoinListItemModel.h
-    models/EggGroupGroupModel.h
-    models/EggGroupModel.h
-    models/GlobalScriptGroupModel.h
-    models/GlobalScriptModel.h
-    models/Grouping.h
-    models/GroupModel.h
-    models/GroupObjectModel.h
-    models/ItemGroupModel.h
-    models/ItemModel.h
-    models/ItemTypeGroupModel.h
-    models/ItemTypeModel.h
-    models/MapGroupModel.h
-    models/MapModel.h
-    models/MapEffectGroupModel.h
-    models/MapEffectModel.h
-    models/MapTrainerGroupModel.h
-    models/MapTrainerModel.h
-    models/MapTrainerTeamMemberModel.h
-    models/MapWarpGroupModel.h
-    models/MapWarpModel.h
-    models/MapWildListGroupModel.h
-    models/MapWildListModel.h
-    models/MapWildListEncounterModel.h
-    models/MoveGroupModel.h
-    models/MoveModel.h
-    models/NatureGroupModel.h
-    models/NatureModel.h
-    models/ObjectModel.h
-    models/RootModel.h
-    models/RulesModel.h
-    models/SigmodModel.h
-    models/SkinGroupModel.h
-    models/SkinModel.h
-    models/SoundGroupModel.h
-    models/SoundModel.h
-    models/SpeciesGroupModel.h
-    models/SpeciesModel.h
-    models/SpeciesMoveModel.h
-    models/SpriteGroupModel.h
-    models/SpriteModel.h
-    models/StatusGroupModel.h
-    models/StatusModel.h
-    models/StoreGroupModel.h
-    models/StoreModel.h
-    models/TileGroupModel.h
-    models/TileModel.h
-    models/TimeGroupModel.h
-    models/TimeModel.h
-    models/TrainerGroupModel.h
-    models/TrainerModel.h
-    models/TypeGroupModel.h
-    models/TypeModel.h
-    models/WeatherGroupModel.h
-    models/WeatherModel.h
-)
 set(sigmodr_MAIN_HEADERS
     EffectItem.h
-    FractionWidget.h
     MapEditor.h
     MapScene.h
-    ScriptWidget.h
-    SigmodTree.h
-    SigmodTreeModel.h
     SigmodrPreferencesWidget.h
     SigmodrUI.h
     TileItem.h
     TrainerItem.h
-    TypechartModel.h
-    ValidationDialog.h
     WarpItem.h
 )
 set(sigmodr_HEADERS
-    ${sigmodr_WIDGET_HEADERS}
-    ${sigmodr_MODEL_HEADERS}
     ${sigmodr_MAIN_HEADERS}
 )
-set(sigmodr_WIDGET_SRCS
-    AbilityUI.cpp
-    AuthorUI.cpp
-    BadgeUI.cpp
-    CoinListUI.cpp
-    CoinListItemUI.cpp
-    EggGroupUI.cpp
-    GlobalScriptUI.cpp
-    ItemUI.cpp
-    ItemTypeUI.cpp
-    MapUI.cpp
-    MapEffectUI.cpp
-    MapTrainerUI.cpp
-    MapTrainerTeamMemberUI.cpp
-    MapWarpUI.cpp
-    MapWildListUI.cpp
-    MapWildListEncounterUI.cpp
-    MoveUI.cpp
-    NatureUI.cpp
-    ObjectUI.cpp
-    RulesUI.cpp
-    SigmodUI.cpp
-    SkinUI.cpp
-    SoundUI.cpp
-    SpeciesUI.cpp
-    SpeciesMoveUI.cpp
-    SpriteUI.cpp
-    StatusUI.cpp
-    StoreUI.cpp
-    TileUI.cpp
-    TimeUI.cpp
-    TrainerUI.cpp
-    TypeUI.cpp
-    WeatherUI.cpp
-)
-set(sigmodr_MODEL_SRCS
-    models/AbilityGroupModel.cpp
-    models/AbilityModel.cpp
-    models/AuthorGroupModel.cpp
-    models/AuthorModel.cpp
-    models/BadgeGroupModel.cpp
-    models/BadgeModel.cpp
-    models/BaseModel.cpp
-    models/BaseObjectModel.cpp
-    models/CoinListGroupModel.cpp
-    models/CoinListModel.cpp
-    models/CoinListItemModel.cpp
-    models/EggGroupGroupModel.cpp
-    models/EggGroupModel.cpp
-    models/GlobalScriptGroupModel.cpp
-    models/GlobalScriptModel.cpp
-    models/Grouping.cpp
-    models/GroupModel.cpp
-    models/GroupObjectModel.cpp
-    models/ItemGroupModel.cpp
-    models/ItemModel.cpp
-    models/ItemTypeGroupModel.cpp
-    models/ItemTypeModel.cpp
-    models/MapGroupModel.cpp
-    models/MapModel.cpp
-    models/MapEffectGroupModel.cpp
-    models/MapEffectModel.cpp
-    models/MapTrainerGroupModel.cpp
-    models/MapTrainerModel.cpp
-    models/MapTrainerTeamMemberModel.cpp
-    models/MapWarpGroupModel.cpp
-    models/MapWarpModel.cpp
-    models/MapWildListGroupModel.cpp
-    models/MapWildListModel.cpp
-    models/MapWildListEncounterModel.cpp
-    models/MoveGroupModel.cpp
-    models/MoveModel.cpp
-    models/NatureGroupModel.cpp
-    models/NatureModel.cpp
-    models/ObjectModel.cpp
-    models/RootModel.cpp
-    models/RulesModel.cpp
-    models/SigmodModel.cpp
-    models/SkinGroupModel.cpp
-    models/SkinModel.cpp
-    models/SoundGroupModel.cpp
-    models/SoundModel.cpp
-    models/SpeciesGroupModel.cpp
-    models/SpeciesModel.cpp
-    models/SpeciesMoveModel.cpp
-    models/SpriteGroupModel.cpp
-    models/SpriteModel.cpp
-    models/StatusGroupModel.cpp
-    models/StatusModel.cpp
-    models/StoreGroupModel.cpp
-    models/StoreModel.cpp
-    models/TileGroupModel.cpp
-    models/TileModel.cpp
-    models/TimeGroupModel.cpp
-    models/TimeModel.cpp
-    models/TrainerGroupModel.cpp
-    models/TrainerModel.cpp
-    models/TypeGroupModel.cpp
-    models/TypeModel.cpp
-    models/WeatherGroupModel.cpp
-    models/WeatherModel.cpp
-)
 set(sigmodr_MAIN_SRCS
     EffectItem.cpp
-    FractionWidget.cpp
     MapEditor.cpp
     MapScene.cpp
-    ScriptWidget.cpp
-    SigmodTree.cpp
-    SigmodTreeModel.cpp
     Sigmodr.cpp
     SigmodrPreferencesWidget.cpp
     SigmodrUI.cpp
     TileItem.cpp
     TrainerItem.cpp
-    TypechartModel.cpp
-    ValidationDialog.cpp
     WarpItem.cpp
 )
 set(sigmodr_SRCS
-    ${sigmodr_WIDGET_SRCS}
     ${sigmodr_MODEL_SRCS}
     ${sigmodr_MAIN_SRCS}
 )
@@ -311,6 +58,9 @@ set(sigmodr_DESKTOP_FILES
     sigmodr.desktop
 )
 
+add_subdirectory(widgets)
+add_subdirectory(tree)
+
 kde4_add_executable(sigmodr
     ${sigmodr_SRCS}
     ${sigmodr_UI_HEADERS}
@@ -321,19 +71,13 @@ set_target_properties(sigmodr
         LINK_INTERFACE_LIBRARIES ""
 )
 target_link_libraries(sigmodr
-    ${QT_QTCORE_LIBRARY}
-    ${QT_QTGUI_LIBRARY}
     ${QT_QTXML_LIBRARY}
-    ${PHONON_LIBRARY}
-    ${KDE4_KDECORE_LIBRARY}
     ${KDE4_KDEUI_LIBRARY}
     ${KDE4_KIO_LIBRARY}
-    ${KDE4_KFILE_LIBRARY}
-    ${KDE4_KROSSCORE_LIBRARY}
-    ${KDE4_KTEXTEDITOR_LIBRARY}
     ${KDE4_KNEWSTUFF2_LIBRARY}
-    sigcore
     sigmod
+    sigmodrwidgets
+    sigmodrtree
 )
 
 add_subdirectory(doc)
diff --git a/sigmodr/tree/CMakeLists.txt b/sigmodr/tree/CMakeLists.txt
new file mode 100644
index 00000000..4c786ee4
--- /dev/null
+++ b/sigmodr/tree/CMakeLists.txt
@@ -0,0 +1,140 @@
+project(sigmodrtree)
+
+set(sigmodrtree_HEADERS
+    AbilityGroupModel.h
+    AbilityModel.h
+    AuthorGroupModel.h
+    AuthorModel.h
+    BadgeGroupModel.h
+    BadgeModel.h
+    BaseModel.h
+    BaseObjectModel.h
+    CoinListGroupModel.h
+    CoinListModel.h
+    CoinListItemModel.h
+    EggGroupGroupModel.h
+    EggGroupModel.h
+    GlobalScriptGroupModel.h
+    GlobalScriptModel.h
+    Grouping.h
+    GroupModel.h
+    GroupObjectModel.h
+    ItemGroupModel.h
+    ItemModel.h
+    ItemTypeGroupModel.h
+    ItemTypeModel.h
+    MapGroupModel.h
+    MapModel.h
+    MapEffectGroupModel.h
+    MapEffectModel.h
+    MapTrainerGroupModel.h
+    MapTrainerModel.h
+    MapTrainerTeamMemberModel.h
+    MapWarpGroupModel.h
+    MapWarpModel.h
+    MapWildListGroupModel.h
+    MapWildListModel.h
+    MapWildListEncounterModel.h
+    MoveGroupModel.h
+    MoveModel.h
+    NatureGroupModel.h
+    NatureModel.h
+    ObjectModel.h
+    RootModel.h
+    RulesModel.h
+    SigmodModel.h
+    SigmodrTree.h
+    SigmodrTreeModel.h
+    SkinGroupModel.h
+    SkinModel.h
+    SoundGroupModel.h
+    SoundModel.h
+    SpeciesGroupModel.h
+    SpeciesModel.h
+    SpeciesMoveModel.h
+    SpriteGroupModel.h
+    SpriteModel.h
+    StatusGroupModel.h
+    StatusModel.h
+    StoreGroupModel.h
+    StoreModel.h
+    TileGroupModel.h
+    TileModel.h
+    TimeGroupModel.h
+    TimeModel.h
+    TrainerGroupModel.h
+    TrainerModel.h
+    TypeGroupModel.h
+    TypeModel.h
+    WeatherGroupModel.h
+    WeatherModel.h
+)
+set(sigmodrtree_SRCS
+    AbilityGroupModel.cpp
+    AbilityModel.cpp
+    AuthorGroupModel.cpp
+    AuthorModel.cpp
+    BadgeGroupModel.cpp
+    BadgeModel.cpp
+    BaseModel.cpp
+    BaseObjectModel.cpp
+    CoinListGroupModel.cpp
+    CoinListModel.cpp
+    CoinListItemModel.cpp
+    EggGroupGroupModel.cpp
+    EggGroupModel.cpp
+    GlobalScriptGroupModel.cpp
+    GlobalScriptModel.cpp
+    Grouping.cpp
+    GroupModel.cpp
+    GroupObjectModel.cpp
+    ItemGroupModel.cpp
+    ItemModel.cpp
+    ItemTypeGroupModel.cpp
+    ItemTypeModel.cpp
+    MapGroupModel.cpp
+    MapModel.cpp
+    MapEffectGroupModel.cpp
+    MapEffectModel.cpp
+    MapTrainerGroupModel.cpp
+    MapTrainerModel.cpp
+    MapTrainerTeamMemberModel.cpp
+    MapWarpGroupModel.cpp
+    MapWarpModel.cpp
+    MapWildListGroupModel.cpp
+    MapWildListModel.cpp
+    MapWildListEncounterModel.cpp
+    MoveGroupModel.cpp
+    MoveModel.cpp
+    NatureGroupModel.cpp
+    NatureModel.cpp
+    ObjectModel.cpp
+    RootModel.cpp
+    RulesModel.cpp
+    SigmodModel.cpp
+    SigmodrTree.cpp
+    SigmodrTreeModel.cpp
+    SkinGroupModel.cpp
+    SkinModel.cpp
+    SoundGroupModel.cpp
+    SoundModel.cpp
+    SpeciesGroupModel.cpp
+    SpeciesModel.cpp
+    SpeciesMoveModel.cpp
+    SpriteGroupModel.cpp
+    SpriteModel.cpp
+    StatusGroupModel.cpp
+    StatusModel.cpp
+    StoreGroupModel.cpp
+    StoreModel.cpp
+    TileGroupModel.cpp
+    TileModel.cpp
+    TimeGroupModel.cpp
+    TimeModel.cpp
+    TrainerGroupModel.cpp
+    TrainerModel.cpp
+    TypeGroupModel.cpp
+    TypeModel.cpp
+    WeatherGroupModel.cpp
+    WeatherModel.cpp
+)
diff --git a/sigmodr/widgets/CMakeLists.txt b/sigmodr/widgets/CMakeLists.txt
new file mode 100644
index 00000000..aa8e121a
--- /dev/null
+++ b/sigmodr/widgets/CMakeLists.txt
@@ -0,0 +1,149 @@
+project(sigmodrwidgets)
+
+include_directories(
+    ${PROJECT_SOURCE_DIR}
+    ${PROJECT_BINARY_DIR}
+)
+
+set(sigmodrwidgets_FORMS
+    gui/ability.ui
+    gui/author.ui
+    gui/badge.ui
+    gui/coinlist.ui
+    gui/coinlistitem.ui
+    gui/egggroup.ui
+    gui/fraction.ui
+    gui/globalscript.ui
+    gui/item.ui
+    gui/itemtype.ui
+    gui/map.ui
+    gui/mapeffect.ui
+    gui/maptrainer.ui
+    gui/maptrainerteammember.ui
+    gui/mapwarp.ui
+    gui/mapwildlist.ui
+    gui/mapwildlistencounter.ui
+    gui/move.ui
+    gui/nature.ui
+    gui/rules.ui
+    gui/script.ui
+    gui/sigmod.ui
+    gui/skin.ui
+    gui/sound.ui
+    gui/species.ui
+    gui/speciesmove.ui
+    gui/sprite.ui
+    gui/status.ui
+    gui/store.ui
+    gui/tile.ui
+    gui/time.ui
+    gui/trainer.ui
+    gui/type.ui
+    gui/weather.ui
+)
+kde4_add_ui_files(sigmodrwidgets_UI_HEADERS ${sigmodrwidgets_FORMS})
+set(sigmodrwidgets_HEADERS
+    AbilityUI.h
+    AuthorUI.h
+    BadgeUI.h
+    CoinListUI.h
+    CoinListItemUI.h
+    EggGroupUI.h
+    FractionWidget.h
+    GlobalScriptUI.h
+    ItemUI.h
+    ItemTypeUI.h
+    MapUI.h
+    MapEffectUI.h
+    MapTrainerUI.h
+    MapTrainerTeamMemberUI.h
+    MapWarpUI.h
+    MapWildListUI.h
+    MapWildListEncounterUI.h
+    MoveUI.h
+    NatureUI.h
+    ObjectUI.h
+    RulesUI.h
+    ScriptWidget.h
+    SigmodUI.h
+    SkinUI.h
+    SoundUI.h
+    SpeciesUI.h
+    SpeciesMoveUI.h
+    SpriteUI.h
+    StatusUI.h
+    StoreUI.h
+    TileUI.h
+    TimeUI.h
+    TrainerUI.h
+    TypechartModel.h
+    TypeUI.h
+    ValidationDialog.h
+    WeatherUI.h
+)
+set(sigmodrwidgets_SRCS
+    AbilityUI.cpp
+    AuthorUI.cpp
+    BadgeUI.cpp
+    CoinListUI.cpp
+    CoinListItemUI.cpp
+    EggGroupUI.cpp
+    FractionWidget.cpp
+    GlobalScriptUI.cpp
+    ItemUI.cpp
+    ItemTypeUI.cpp
+    MapUI.cpp
+    MapEffectUI.cpp
+    MapTrainerUI.cpp
+    MapTrainerTeamMemberUI.cpp
+    MapWarpUI.cpp
+    MapWildListUI.cpp
+    MapWildListEncounterUI.cpp
+    MoveUI.cpp
+    NatureUI.cpp
+    ObjectUI.cpp
+    RulesUI.cpp
+    ScriptWidget.cpp
+    SigmodUI.cpp
+    SkinUI.cpp
+    SoundUI.cpp
+    SpeciesUI.cpp
+    SpeciesMoveUI.cpp
+    SpriteUI.cpp
+    StatusUI.cpp
+    StoreUI.cpp
+    TileUI.cpp
+    TimeUI.cpp
+    TrainerUI.cpp
+    TypechartModel.cpp
+    TypeUI.cpp
+    ValidationDialog.cpp
+    WeatherUI.cpp
+)
+kde4_add_library(sigmodrwidgets
+    SHARED
+    ${sigmodrwidgets_UI_HEADERS}
+    ${sigmodrwidgets_SRCS}
+)
+set_target_properties(sigmodrwidgets
+    PROPERTIES
+        VERSION ${SIGEN_VERSION}
+        SOVERSION ${SIGEN_SOVERSION}
+)
+target_link_libraries(sigmodrwidgets
+    ${QT_QTCORE_LIBRARY}
+    ${QT_QTGUI_LIBRARY}
+    ${KDE4_KDECORE_LIBRARY}
+    ${KDE4_KDEUI_LIBRARY}
+    ${KDE4_KFILE_LIBRARY}
+    ${KDE4_KTEXTEDITOR_LIBRARY}
+    ${PHONON_LIBRARY}
+    sigcore
+    sigmod
+)
+target_link_libraries(sigmodrwidgets LINK_INTERFACE_LIBRARIES
+    ${QT_QTGUI_LIBRARY}
+    sigmod
+)
+
+