From b3ba56a829701d4d4a1ce6036cb5e3953d384f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= Date: Thu, 24 Jul 2014 10:14:42 +0200 Subject: [PATCH] Indeed CMake, a list is not a directory... After testing a Python module, the build was broken because the test created a __pycache__ dir, which CMake tried to install as a file because: a) `if(IS_DIRECTORY foo)` requires a full path to work b) For CMake, `IS_DIRECTORY(foo)` is not the same as `IS_DIRECTORY foo` c) CMake is a pain sometimes --- CalamaresAddModuleSubdirectory.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CalamaresAddModuleSubdirectory.cmake b/CalamaresAddModuleSubdirectory.cmake index f94ef0851..37b10eb1d 100644 --- a/CalamaresAddModuleSubdirectory.cmake +++ b/CalamaresAddModuleSubdirectory.cmake @@ -15,7 +15,7 @@ function( calamares_add_module_subdirectory ) # synced with the bindir structure and installed. file( GLOB MODULE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY} "${SUBDIRECTORY}/*" ) foreach( MODULE_FILE ${MODULE_FILES} ) - if( NOT IS_DIRECTORY( ${MODULE_FILE} ) ) + if( NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${MODULE_FILE} ) configure_file( ${SUBDIRECTORY}/${MODULE_FILE} ${SUBDIRECTORY}/${MODULE_FILE} COPYONLY ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/${MODULE_FILE} DESTINATION ${MODULE_DESTINATION} )