blob: 96559fe320ccf7abe3bbc937986c95e0b85cadae (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
diff --git a/include/BoostInstall.cmake b/include/BoostInstall.cmake
index 1127c6f..91d3a86 100644
--- a/include/BoostInstall.cmake
+++ b/include/BoostInstall.cmake
@@ -67,11 +67,6 @@ function(__boost_install_set_output_name LIB TYPE VERSION)
set(name_debug ${LIB})
set(name_release ${LIB})
- # prefix
- if(WIN32 AND TYPE STREQUAL "STATIC_LIBRARY")
- set_target_properties(${LIB} PROPERTIES PREFIX "lib")
- endif()
-
# toolset
if(BOOST_INSTALL_LAYOUT STREQUAL versioned)
@@ -289,14 +284,6 @@ function(boost_install_target)
set(CONFIG_INSTALL_DIR "${BOOST_INSTALL_CMAKEDIR}/${LIB}-${__VERSION}")
- if(TYPE STREQUAL "SHARED_LIBRARY")
- string(APPEND CONFIG_INSTALL_DIR "-shared")
- endif()
-
- if(TYPE STREQUAL "STATIC_LIBRARY")
- string(APPEND CONFIG_INSTALL_DIR "-static")
- endif()
-
install(TARGETS ${LIB} EXPORT ${LIB}-targets
# explicit destination specification required for 3.13, 3.14 no longer needs it
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
@@ -466,44 +453,6 @@ function(boost_install_target)
endif()
- if("${LIB}" STREQUAL "boost_exception" OR "${LIB}" STREQUAL "boost_test_exec_monitor")
-
- # These two libraries are hardcoded to STATIC
-
- else()
-
- if(TYPE STREQUAL "SHARED_LIBRARY")
-
- file(APPEND "${CONFIG_VERSION_FILE_NAME}"
-
- "\n"
- "# Do not return shared libraries when Boost_USE_STATIC_LIBS is ON\n"
- "if(NOT PACKAGE_VERSION_UNSUITABLE AND Boost_USE_STATIC_LIBS)\n"
- " set(PACKAGE_VERSION_UNSUITABLE TRUE)\n"
- " set(PACKAGE_VERSION \"\${PACKAGE_VERSION} (shared)\")\n"
- " return()\n"
- "endif()\n"
- )
-
- endif()
-
- if(TYPE STREQUAL "STATIC_LIBRARY")
-
- file(APPEND "${CONFIG_VERSION_FILE_NAME}"
-
- "\n"
- "# Do not return static libraries when Boost_USE_STATIC_LIBS is OFF\n"
- "if(NOT PACKAGE_VERSION_UNSUITABLE AND DEFINED Boost_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS)\n"
- " set(PACKAGE_VERSION_UNSUITABLE TRUE)\n"
- " set(PACKAGE_VERSION \"\${PACKAGE_VERSION} (static)\")\n"
- " return()\n"
- "endif()\n"
- )
-
- endif()
-
- endif()
-
install(FILES "${CONFIG_VERSION_FILE_NAME}" DESTINATION "${CONFIG_INSTALL_DIR}")
endfunction()
|
