diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-04-04 22:02:03 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-04-04 22:33:58 -0700 |
| commit | 7be962bfc2879a72c32ff67518731347dcdff6de (patch) | |
| tree | d05bf7ab234a448ee37a15b608e2b939f2285d07 /CMakeLists.txt | |
| parent | 2d760a7bff71c46c5aeba37c40d236ea16eefea2 (diff) | |
| download | subsurface-7be962bfc2879a72c32ff67518731347dcdff6de.tar.gz | |
Move subsurface-core to core and qt-mobile to mobile-widgets
Having subsurface-core as a directory name really messes with
autocomplete and is obviously redundant. Simmilarly, qt-mobile caused an
autocomplete conflict and also was inconsistent with the desktop-widget
name for the directory containing the "other" UI.
And while cleaning up the resulting change in the path name for include
files, I decided to clean up those even more to make them consistent
overall.
This could have been handled in more commits, but since this requires a
make clean before the build, it seemed more sensible to do it all in one.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ea6f17e66..cc7db1329 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,10 +115,6 @@ include_directories(. ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/desktop-widgets - desktop-widgets/ - qt-models - desktop-widgets/profile - subsurface-core/ ) # Project Target specific configuration should go here, @@ -212,7 +208,7 @@ qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc) # include translations add_subdirectory(translations) -add_subdirectory(subsurface-core) +add_subdirectory(core) add_subdirectory(qt-models) add_subdirectory(profile-widget) @@ -227,12 +223,12 @@ endif() # create the executables if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") set(MOBILE_SRC - qt-mobile/qmlmanager.cpp - qt-mobile/qmlprofile.cpp + mobile-widgets/qmlmanager.cpp + mobile-widgets/qmlprofile.cpp subsurface-mobile-main.cpp subsurface-mobile-helper.cpp ) - qt5_add_resources(MOBILE_RESOURCES qt-mobile/qml/mobile-resources.qrc) + qt5_add_resources(MOBILE_RESOURCES mobile-widgets/qml/mobile-resources.qrc) # When building the mobile application in Android, link it and Qt will do the rest, when doing the mobile application on Desktop, create an executable. if(ANDROID) add_library(${SUBSURFACE_TARGET} SHARED ${SUBSURFACE_PKG} ${MOBILE_SRC} ${SUBSURFACE_RESOURCES} ${MOBILE_RESOURCES}) |