From 709621320639d9cc14ec014ccaad3db35f5cd856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= Date: Tue, 15 Jul 2014 11:54:09 +0200 Subject: [PATCH] Move partitionmanager code to src/modules/partition --- .gitmodules | 2 +- src/libcalamares/CMakeLists.txt | 4 ---- src/modules/partition/CMakeLists.txt | 2 ++ src/{libcalamares => modules/partition}/partitionmanager | 0 4 files changed, 3 insertions(+), 5 deletions(-) rename src/{libcalamares => modules/partition}/partitionmanager (100%) diff --git a/.gitmodules b/.gitmodules index cb793f994..7fc40128d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "src/libcalamares/partitionmanager"] - path = src/libcalamares/partitionmanager + path = src/modules/partition/partitionmanager url = https://github.com/calamares/partitionmanager.git branch = calamares diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 2675f0726..9845d5b76 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -1,9 +1,5 @@ project( calamareslib ) -if( WITH_PARTITIONMANAGER ) -add_subdirectory( partitionmanager/calamares ) -endif() - add_definitions( ${QT_DEFINITIONS} ) add_definitions( -DQT_SHARED ) add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS ) diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt index 7b96fbe31..b220ed46e 100644 --- a/src/modules/partition/CMakeLists.txt +++ b/src/modules/partition/CMakeLists.txt @@ -1,5 +1,7 @@ if( WITH_PARTITIONMANAGER ) +add_subdirectory( partitionmanager/calamares ) + ## ECM find_package(ECM 0.0.13 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) diff --git a/src/libcalamares/partitionmanager b/src/modules/partition/partitionmanager similarity index 100% rename from src/libcalamares/partitionmanager rename to src/modules/partition/partitionmanager