| 1 | Install shared libraries into "lib". Do not create symbolic links to static
|
| 2 | libraries since only shared libraries are built.
|
| 3 |
|
| 4 | |
| 5 | |
| 6 | @@ -6,10 +6,7 @@ bde_prefixed_override(ufid project_setup_install_opts)
|
| 7 | function(ufid_project_setup_install_opts proj)
|
| 8 | bde_assert_no_extra_args()
|
| 9 |
|
| 10 | - set(libPath "bin/so")
|
| 11 | - if (${bde_ufid_is_64})
|
| 12 | - string(APPEND libPath "/64")
|
| 13 | - endif()
|
| 14 | + set(libPath "lib")
|
| 15 |
|
| 16 | bde_struct_create(
|
| 17 | installOpts
|
| 18 | @@ -86,13 +83,6 @@ function(bde_create_ufid_symlink uor installOpts)
|
| 19 | "${symlinkPrefix}/${symlinkDir}/${libLinkName}"
|
| 20 | )
|
| 21 |
|
| 22 | - install(
|
| 23 | - CODE
|
| 24 | - "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \
|
| 25 | - ${symlinkVal} ${symlinkFile})"
|
| 26 | - COMPONENT "${component}-symlinks"
|
| 27 | - )
|
| 28 | -
|
| 29 | # This code creates compatibility symlinks
|
| 30 | # WARNING: This is custom logic that has nothing to do with our build system.
|
| 31 | # Some external build systems expect to find a variaty of ufids in dpkg.
|
| 32 | @@ -110,14 +100,6 @@ function(bde_create_ufid_symlink uor installOpts)
|
| 33 | symlinkFile
|
| 34 | "${symlinkPrefix}/${symlinkDir}/${libLinkName}"
|
| 35 | )
|
| 36 | -
|
| 37 | - # IMPORTANT: symlinkFile is the same as above!
|
| 38 | - install(
|
| 39 | - CODE
|
| 40 | - "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \
|
| 41 | - ${symlinkVal} ${symlinkFile})"
|
| 42 | - COMPONENT "${component}-symlinks"
|
| 43 | - )
|
| 44 | endif()
|
| 45 |
|
| 46 | if (${bde_ufid_is_pic})
|
| 47 | @@ -134,14 +116,6 @@ function(bde_create_ufid_symlink uor installOpts)
|
| 48 | "${symlinkPrefix}/${symlinkDir}/${libLinkName}"
|
| 49 | )
|
| 50 |
|
| 51 | - # IMPORTANT: symlinkFile is the same as above!
|
| 52 | - install(
|
| 53 | - CODE
|
| 54 | - "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \
|
| 55 | - ${symlinkVal} ${symlinkFile})"
|
| 56 | - COMPONENT "${component}-pic-symlink-hack"
|
| 57 | - )
|
| 58 | -
|
| 59 | # And another one for "64" - remove "pic", add "64"
|
| 60 | if (${bde_ufid_is_64})
|
| 61 | set(temp_ufid_flags ${install_ufid_flags})
|
| 62 | @@ -157,14 +131,6 @@ function(bde_create_ufid_symlink uor installOpts)
|
| 63 | symlinkFile
|
| 64 | "${symlinkPrefix}/${symlinkDir}/${libLinkName}"
|
| 65 | )
|
| 66 | -
|
| 67 | - # IMPORTANT: symlinkFile is the same as above!
|
| 68 | - install(
|
| 69 | - CODE
|
| 70 | - "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \
|
| 71 | - ${symlinkVal} ${symlinkFile})"
|
| 72 | - COMPONENT "${component}-pic-symlink-hack"
|
| 73 | - )
|
| 74 | endif()
|
| 75 | endif()
|
| 76 |
|
| 77 | @@ -177,18 +143,5 @@ function(bde_create_ufid_symlink uor installOpts)
|
| 78 | symlinkReleaseFile
|
| 79 | "${symlinkPrefix}/${symlinkDir}/${libReleaseLinkName}"
|
| 80 | )
|
| 81 | - install(
|
| 82 | - CODE
|
| 83 | - "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \
|
| 84 | - ${symlinkVal} ${symlinkReleaseFile})"
|
| 85 | - COMPONENT "${component}-release-symlink"
|
| 86 | - )
|
| 87 | - install(
|
| 88 | - CODE
|
| 89 | - "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \
|
| 90 | - ${symlinkVal} ${symlinkReleaseFile})"
|
| 91 | - COMPONENT "release-symlink"
|
| 92 | - EXCLUDE_FROM_ALL
|
| 93 | - )
|
| 94 | endif()
|
| 95 | endfunction()
|