File tree Expand file tree Collapse file tree 20 files changed +28
-24
lines changed
swift-tools-support-core/Sources Expand file tree Collapse file tree 20 files changed +28
-24
lines changed Original file line number Diff line number Diff line change @@ -30,7 +30,12 @@ else()
30
30
endif ()
31
31
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} /bin )
32
32
33
- option (BUILD_SHARED_LIBS "Build shared libraryes by default" YES )
33
+ option (BUILD_SHARED_LIBS "Build shared libraries by default" YES )
34
+
35
+ string (COMPARE EQUAL ${CMAKE_SYSTEM_NAME} Windows CMAKE_INSTALL_DEFAULT )
36
+ option (USE_CMAKE_INSTALL
37
+ "Install build products using cmake's install() instead of the bootstrap script's install()"
38
+ ${CMAKE_INSTALL_DEFAULT} )
34
39
35
40
find_package (TSC CONFIG REQUIRED )
36
41
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ target_link_libraries(Build PRIVATE
27
27
set_target_properties (Build PROPERTIES
28
28
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY} )
29
29
30
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
30
+ if (USE_CMAKE_INSTALL )
31
31
install (TARGETS Build
32
32
ARCHIVE DESTINATION lib
33
33
LIBRARY DESTINATION lib
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ endif()
39
39
set_target_properties (Commands PROPERTIES
40
40
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY} )
41
41
42
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
42
+ if (USE_CMAKE_INSTALL )
43
43
install (TARGETS Commands
44
44
ARCHIVE DESTINATION lib
45
45
LIBRARY DESTINATION lib
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ target_link_libraries(LLBuildManifest PUBLIC
21
21
set_target_properties (LLBuildManifest PROPERTIES
22
22
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY} )
23
23
24
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
24
+ if (USE_CMAKE_INSTALL )
25
25
install (TARGETS LLBuildManifest
26
26
ARCHIVE DESTINATION lib
27
27
LIBRARY DESTINATION lib
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ target_link_libraries(PackageGraph PUBLIC
27
27
set_target_properties (PackageGraph PROPERTIES
28
28
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY} )
29
29
30
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
30
+ if (USE_CMAKE_INSTALL )
31
31
install (TARGETS PackageGraph
32
32
ARCHIVE DESTINATION lib
33
33
LIBRARY DESTINATION lib
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ target_link_libraries(PackageLoading PUBLIC
27
27
set_target_properties (PackageLoading PROPERTIES
28
28
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY} )
29
29
30
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
30
+ if (USE_CMAKE_INSTALL )
31
31
install (TARGETS PackageLoading
32
32
ARCHIVE DESTINATION lib
33
33
LIBRARY DESTINATION lib
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ target_link_libraries(PackageModel PUBLIC
25
25
set_target_properties (PackageModel PROPERTIES
26
26
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY} )
27
27
28
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
28
+ if (USE_CMAKE_INSTALL )
29
29
install (TARGETS PackageModel
30
30
ARCHIVE DESTINATION lib
31
31
LIBRARY DESTINATION lib
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ target_link_libraries(SPMBuildCore PUBLIC
21
21
PackageGraph )
22
22
23
23
24
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
24
+ if (USE_CMAKE_INSTALL )
25
25
install (TARGETS SPMBuildCore
26
26
ARCHIVE DESTINATION lib
27
27
LIBRARY DESTINATION lib
Original file line number Diff line number Diff line change @@ -16,8 +16,7 @@ target_link_libraries(SPMLLBuild PUBLIC
16
16
TSCUtility
17
17
llbuildSwift )
18
18
19
-
20
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
19
+ if (USE_CMAKE_INSTALL )
21
20
install (TARGETS SPMLLBuild
22
21
ARCHIVE DESTINATION lib
23
22
LIBRARY DESTINATION lib
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ target_link_libraries(SourceControl PUBLIC
21
21
set_target_properties (SourceControl PROPERTIES
22
22
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY} )
23
23
24
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
24
+ if (USE_CMAKE_INSTALL )
25
25
install (TARGETS SourceControl
26
26
ARCHIVE DESTINATION lib
27
27
LIBRARY DESTINATION lib
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ target_link_libraries(Workspace PUBLIC
29
29
set_target_properties (Workspace PROPERTIES
30
30
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY} )
31
31
32
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
32
+ if (USE_CMAKE_INSTALL )
33
33
install (TARGETS Workspace
34
34
ARCHIVE DESTINATION lib
35
35
LIBRARY DESTINATION lib
Original file line number Diff line number Diff line change @@ -23,8 +23,8 @@ target_link_libraries(XCBuildSupport PUBLIC
23
23
set_target_properties (XCBuildSupport PROPERTIES
24
24
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY} )
25
25
26
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
27
- install (TARGETS XCBuildSupport
26
+ if (USE_CMAKE_INSTALL )
27
+ install (TARGETS XCBuildSupport
28
28
ARCHIVE DESTINATION lib
29
29
LIBRARY DESTINATION lib
30
30
RUNTIME DESTINATION bin )
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ target_link_libraries(Xcodeproj PUBLIC
21
21
set_target_properties (Xcodeproj PROPERTIES
22
22
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY} )
23
23
24
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
24
+ if (USE_CMAKE_INSTALL )
25
25
install (TARGETS Xcodeproj
26
26
ARCHIVE DESTINATION lib
27
27
LIBRARY DESTINATION lib
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ add_executable(swift-build
11
11
target_link_libraries (swift-build PRIVATE
12
12
Commands )
13
13
14
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
15
- install (TARGETS swift-build
16
- DESTINATION bin )
14
+ if (USE_CMAKE_INSTALL )
15
+ install (TARGETS swift-build
16
+ DESTINATION bin )
17
17
endif ()
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ add_executable(swift-package
11
11
target_link_libraries (swift-package PRIVATE
12
12
Commands )
13
13
14
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
14
+ if (USE_CMAKE_INSTALL )
15
15
install (TARGETS swift-package
16
16
RUNTIME DESTINATION bin )
17
17
endif ()
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ add_executable(swift-run
11
11
target_link_libraries (swift-run PRIVATE
12
12
Commands )
13
13
14
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
14
+ if (USE_CMAKE_INSTALL )
15
15
install (TARGETS swift-run
16
16
RUNTIME DESTINATION bin )
17
17
endif ()
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ add_executable(swift-test
11
11
target_link_libraries (swift-test PRIVATE
12
12
Commands )
13
13
14
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
14
+ if (USE_CMAKE_INSTALL )
15
15
install (TARGETS swift-test
16
16
RUNTIME DESTINATION bin )
17
17
endif ()
Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ set_target_properties(TSCBasic PROPERTIES
65
65
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY} )
66
66
67
67
68
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
68
+ if (USE_CMAKE_INSTALL )
69
69
install (TARGETS TSCBasic
70
70
ARCHIVE DESTINATION lib
71
71
LIBRARY DESTINATION lib
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ set_target_properties(TSCLibc PROPERTIES
20
20
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY} )
21
21
22
22
23
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
23
+ if (USE_CMAKE_INSTALL )
24
24
install (TARGETS TSCLibc
25
25
ARCHIVE DESTINATION lib
26
26
LIBRARY DESTINATION lib
Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ endif()
52
52
set_target_properties (TSCUtility PROPERTIES
53
53
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY} )
54
54
55
- if (CMAKE_SYSTEM_NAME STREQUAL Windows )
55
+ if (USE_CMAKE_INSTALL )
56
56
install (TARGETS TSCUtility
57
57
ARCHIVE DESTINATION lib
58
58
LIBRARY DESTINATION lib
You can’t perform that action at this time.
0 commit comments