From 2c97f393bcf2531bacd400cf7b99f24cf5669124 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 5 Jul 2017 10:32:28 -0400 Subject: [PATCH] CMake: adjust to moved location, drop useless CalamaresUse.cmake --- CMakeLists.txt | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0087d19c0..5dfcf3ac4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,12 +170,7 @@ configure_file( ) # Early configure these files as we need them later on -configure_file( CalamaresUse.cmake.in "${PROJECT_BINARY_DIR}/CalamaresUse.cmake" @ONLY ) -file( COPY CalamaresAddLibrary.cmake DESTINATION "${PROJECT_BINARY_DIR}" ) -file( COPY CalamaresAddModuleSubdirectory.cmake DESTINATION "${PROJECT_BINARY_DIR}" ) -file( COPY CalamaresAddPlugin.cmake DESTINATION "${PROJECT_BINARY_DIR}" ) -file( COPY CalamaresAddBrandingSubdirectory.cmake DESTINATION "${PROJECT_BINARY_DIR}" ) - +set( CALAMARES_CMAKE_DIR "${CMAKE_SOURCE_DIR}/CMakeModules" ) set( CALAMARES_LIBRARIES calamares ) set( THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/thirdparty" ) @@ -222,10 +217,10 @@ install( "${PROJECT_BINARY_DIR}/CalamaresConfig.cmake" "${PROJECT_BINARY_DIR}/CalamaresConfigVersion.cmake" "${PROJECT_BINARY_DIR}/CalamaresUse.cmake" - "${PROJECT_BINARY_DIR}/CalamaresAddPlugin.cmake" - "${PROJECT_BINARY_DIR}/CalamaresAddModuleSubdirectory.cmake" - "${PROJECT_BINARY_DIR}/CalamaresAddLibrary.cmake" - "${PROJECT_BINARY_DIR}/CalamaresAddBrandingSubdirectory.cmake" + "CmakeModules/CalamaresAddPlugin.cmake" + "CmakeModules/CalamaresAddModuleSubdirectory.cmake" + "CmakeModules/CalamaresAddLibrary.cmake" + "CmakeModules/CalamaresAddBrandingSubdirectory.cmake" DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" )