Skip to content

Commit a580353

Browse files
committed
CMake: install the libraries in prefix/lib
Libraries are usually not installed in prefix/lib/somename. This matches what the .pc file is saying about the library location: > @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ Signed-off-by: Steve Lhomme <slhomme@matroska.org>
1 parent 8d2e357 commit a580353

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

src/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ if(MSVC)
108108
elseif(UNIX OR MINGW)
109109
if (ARM)
110110
set_property(SOURCE ${NEON} APPEND PROPERTY COMPILE_FLAGS "-flax-vector-conversions")
111-
elseif (X86 OR UNIVERSAL)
111+
elseif (X86 OR UNIVERSAL)
112112
set_property(SOURCE ${SSE} APPEND PROPERTY COMPILE_FLAGS "-msse4.1")
113113
set_property(SOURCE ${AVX} APPEND PROPERTY COMPILE_FLAGS " -mavx2")
114114
endif()
@@ -142,20 +142,20 @@ set(OAPV_PRIVATE_HEADERS "${LIB_BASE_INC}" "${LIB_SSE_INC}" "${LIB_AVX_INC}" "${
142142

143143
# Install static library and public headers
144144
#
145-
# Static library (liboapv.a or oapv.lib) will be installed to <prefix>/lib/oapv
145+
# Static library (liboapv.a or oapv.lib) will be installed to <prefix>/lib
146146
# Public headers will be installed to <prefix>/include/oapv
147147
#
148148
if(OAPV_BUILD_STATIC_LIB)
149149
set_target_properties(${LIB_NAME_BASE} PROPERTIES PUBLIC_HEADER "${OAPV_PUBLIC_HEADERS}")
150150
install(TARGETS ${LIB_NAME_BASE}
151-
ARCHIVE COMPONENT Development DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_NAME_BASE}
151+
ARCHIVE COMPONENT Development DESTINATION ${CMAKE_INSTALL_LIBDIR}
152152
PUBLIC_HEADER COMPONENT Development DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${LIB_NAME_BASE}
153153
)
154154
endif()
155155

156156
# Install shared library
157157
#
158-
# On non-DLL platforms shared library (liboapv.so) will be installed to <prefix>/lib/oapv.
158+
# On non-DLL platforms shared library (liboapv.so) will be installed to <prefix>/lib.
159159
# On DLL platforms the shred DLL (oapv.dll) will be installed to <prefix>/bin and its import library will be installed to <prefix>/lib/oapv/import
160160
#
161161
if(OAPV_BUILD_SHARED_LIB)
@@ -165,7 +165,7 @@ if(OAPV_BUILD_SHARED_LIB)
165165
LIBRARY
166166
COMPONENT Libraries DESTINATION ${CMAKE_INSTALL_LIBDIR}
167167
NAMELINK_COMPONENT Development DESTINATION ${CMAKE_INSTALL_LIBDIR}
168-
ARCHIVE COMPONENT Development DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_NAME_BASE}/import
168+
ARCHIVE COMPONENT Development DESTINATION ${CMAKE_INSTALL_LIBDIR}/import
169169
PUBLIC_HEADER COMPONENT Development DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${LIB_NAME_BASE}
170170
)
171171

0 commit comments

Comments
 (0)