napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move partitionmanager code to src/modules/partition

Browse Source
This commit is contained in:
Aurélien Gâteau 2014-07-15 11:54:09 +02:00
parent cbcd821943
commit 7096213206
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,4 +1,4 @@
[submodule "src/libcalamares/partitionmanager"] [submodule "src/libcalamares/partitionmanager"]
path = src/libcalamares/partitionmanager path = src/modules/partition/partitionmanager
url = https://github.com/calamares/partitionmanager.git url = https://github.com/calamares/partitionmanager.git
branch = calamares branch = calamares

4
src/libcalamares/CMakeLists.txt
View File

@ -1,9 +1,5 @@
project( calamareslib ) project( calamareslib )
if( WITH_PARTITIONMANAGER )
add_subdirectory( partitionmanager/calamares )
endif()
add_definitions( ${QT_DEFINITIONS} ) add_definitions( ${QT_DEFINITIONS} )
add_definitions( -DQT_SHARED ) add_definitions( -DQT_SHARED )
add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS ) add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS )

2
src/modules/partition/CMakeLists.txt
View File

@ -1,5 +1,7 @@
if( WITH_PARTITIONMANAGER ) if( WITH_PARTITIONMANAGER )
add_subdirectory( partitionmanager/calamares )
## ECM ## ECM
find_package(ECM 0.0.13 REQUIRED NO_MODULE) find_package(ECM 0.0.13 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})

0
src/libcalamares/partitionmanager → src/modules/partition/partitionmanager
View File