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

CMake: drop meta-include CalamaresUse

Browse Source
This commit is contained in:
Adriaan de Groot 2017-07-05 10:37:49 -04:00
parent 2c97f393bc
commit db105079ba
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -216,7 +216,6 @@ install(
FILES FILES
"${PROJECT_BINARY_DIR}/CalamaresConfig.cmake" "${PROJECT_BINARY_DIR}/CalamaresConfig.cmake"
"${PROJECT_BINARY_DIR}/CalamaresConfigVersion.cmake" "${PROJECT_BINARY_DIR}/CalamaresConfigVersion.cmake"
"${PROJECT_BINARY_DIR}/CalamaresUse.cmake"
"CmakeModules/CalamaresAddPlugin.cmake" "CmakeModules/CalamaresAddPlugin.cmake"
"CmakeModules/CalamaresAddModuleSubdirectory.cmake" "CmakeModules/CalamaresAddModuleSubdirectory.cmake"
"CmakeModules/CalamaresAddLibrary.cmake" "CmakeModules/CalamaresAddLibrary.cmake"

12
CalamaresUse.cmake.in
View File

@ -1,12 +0,0 @@
#FIXME: this duplicates top level cmakelists: how can we reduce code duplication?
find_package( Qt5 5.3.0 CONFIG REQUIRED Core Gui Widgets LinguistTools )
if(NOT CALAMARES_CMAKE_DIR)
set(CALAMARES_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR})
endif()
include( "${CALAMARES_CMAKE_DIR}/CalamaresAddLibrary.cmake" )
include( "${CALAMARES_CMAKE_DIR}/CalamaresAddModuleSubdirectory.cmake" )
include( "${CALAMARES_CMAKE_DIR}/CalamaresAddPlugin.cmake" )
include( "${CALAMARES_CMAKE_DIR}/CalamaresAddBrandingSubdirectory.cmake" )

5
src/CMakeLists.txt
View File

@ -1,4 +1,7 @@
include( ${PROJECT_BINARY_DIR}/CalamaresUse.cmake ) include( CalamaresAddPlugin )
include( CalamaresAddModuleSubdirectory )
include( CalamaresAddLibrary )
include( CalamaresAddBrandingSubdirectory )
include_directories( ${CMAKE_CURRENT_BINARY_DIR}/libcalamares ) include_directories( ${CMAKE_CURRENT_BINARY_DIR}/libcalamares )
include_directories( ${CMAKE_CURRENT_LIST_DIR}/libcalamares ) include_directories( ${CMAKE_CURRENT_LIST_DIR}/libcalamares )