diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-09-24 20:29:25 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-09-24 22:25:49 +0000 |
commit | bfd288c196cfacda78d4b702c1540a0172ef5521 (patch) | |
tree | aa7f42b97abd62f583f8eefc0e07741009671ca3 /cmake/ModulePackage.cmake | |
parent | d5d6e3f60f22aee2735cb80db407c201a00e357b (diff) |
Revert "Improve cmake build for MSVC."
This reverts commit f87f8719d02a9adbc9413256fe22958267cfefee.
Diffstat (limited to 'cmake/ModulePackage.cmake')
-rw-r--r-- | cmake/ModulePackage.cmake | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/cmake/ModulePackage.cmake b/cmake/ModulePackage.cmake index a02fdb86..77911b1d 100644 --- a/cmake/ModulePackage.cmake +++ b/cmake/ModulePackage.cmake | |||
@@ -47,24 +47,18 @@ function(install_module lib) | |||
47 | VERSION ${SOVERSION} | 47 | VERSION ${SOVERSION} |
48 | SOVERSION ${SOVERSION_MAJOR} | 48 | SOVERSION ${SOVERSION_MAJOR} |
49 | ) | 49 | ) |
50 | install(TARGETS ${lib}_shared EXPORT ${lib}Targets | 50 | install(TARGETS ${lib}_shared |
51 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | 51 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
52 | LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | 52 | LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
53 | ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) | 53 | ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
54 | endif() | 54 | endif() |
55 | if(ENABLE_STATIC) | 55 | if(ENABLE_STATIC) |
56 | install(TARGETS ${lib}_static EXPORT ${lib}Targets | 56 | install(TARGETS ${lib}_static |
57 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | 57 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
58 | LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | 58 | LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
59 | ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) | 59 | ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
60 | endif() | 60 | endif() |
61 | 61 | ||
62 | install(EXPORT ${lib}Targets | ||
63 | FILE ${lib}Targets.cmake | ||
64 | NAMESPACE ${lib}:: | ||
65 | DESTINATION lib/cmake/${lib} | ||
66 | ) | ||
67 | |||
68 | string(REPLACE ";" " " ${lib}_PKGCONFIG_LIBS "${${lib}_PKGCONFIG_LIBS}") | 62 | string(REPLACE ";" " " ${lib}_PKGCONFIG_LIBS "${${lib}_PKGCONFIG_LIBS}") |
69 | string(REPLACE ";" " " ${lib}_PKGCONFIG_REQUIRES "${${lib}_PKGCONFIG_REQUIRES}") | 63 | string(REPLACE ";" " " ${lib}_PKGCONFIG_REQUIRES "${${lib}_PKGCONFIG_REQUIRES}") |
70 | 64 | ||