Skip to content

Commit 32c8866

Browse files
committed
build: repair the build on 14.04
CMake 3.4.3 does not support the <files>... <directory> pattern for copy_if_different. Adjust for that.
1 parent df500e2 commit 32c8866

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ if(ENABLE_TESTING)
419419
BYPRODUCTS
420420
${CMAKE_CURRENT_BINARY_DIR}/TestFoundation/xdgTestHelper${CMAKE_EXECUTABLE_SUFFIX}
421421
COMMAND
422-
${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/xdgTestHelper${CMAKE_EXECUTABLE_SUFFIX} ${CMAKE_CURRENT_BINARY_DIR}/TestFoundation
422+
${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/xdgTestHelper${CMAKE_EXECUTABLE_SUFFIX} ${CMAKE_CURRENT_BINARY_DIR}/TestFoundation/xdgTestHelper${CMAKE_EXECUTABLE_SUFFIX}
423423
DEPENDS
424424
TestFoundation
425425
xdgTestHelper)
@@ -457,7 +457,7 @@ install(DIRECTORY
457457
lib/swift/CoreFoundation
458458
FILES_MATCHING PATTERN "*.h")
459459
install(FILES
460-
CoreFoundation/Base.subproj/module.map
460+
CoreFoundation/Base.subproj/module.modulemap
461461
DESTINATION
462462
lib/swift/CoreFoundation)
463463
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module CoreFoundation [extern_c] [system] {
1+
framework module CoreFoundation [extern_c] [system] {
22
umbrella header "CoreFoundation.h"
33
explicit module CFPlugInCOM { header "CFPlugInCOM.h" }
44
}

CoreFoundation/Base.subproj/module.modulemap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
framework module CoreFoundation [extern_c] [system] {
1+
module CoreFoundation [extern_c] [system] {
22
umbrella header "CoreFoundation.h"
33
explicit module CFPlugInCOM { header "CFPlugInCOM.h" }
44

CoreFoundation/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ add_framework(CoreFoundation
4646
FRAMEWORK_DIRECTORY
4747
CoreFoundation_FRAMEWORK_DIRECTORY
4848
MODULE_MAP
49-
Base.subproj/module.modulemap
49+
Base.subproj/module.map
5050
PRIVATE_HEADERS
5151
# Base
5252
Base.subproj/CFAsmMacros.h

0 commit comments

Comments
 (0)