Work on cmake and qmake install

emericg · Aug 3, 2024 · 47c6b6b · 47c6b6b
1 parent b2a5369
commit 47c6b6b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/minivideo/CMakeLists.txt b/minivideo/CMakeLists.txt
@@ -341,4 +341,4 @@ endif (BUILD_STATIC_LIBS)
 
 # Install headers
 install(FILES ${minivideo_PUBLIC_HEADERS} DESTINATION include/minivideo/)
-install(DIRECTORY src/decoder/ DESTINATION include/minivideo/decoder/ FILES_MATCHING PATTERN "*_parameterset.h")
+install(DIRECTORY src/decoder/ DESTINATION include/minivideo/decoder/ FILES_MATCHING PATTERN "*_parameterset_struct.h")
diff --git a/minivideo/minivideo.pro b/minivideo/minivideo.pro
@@ -99,21 +99,20 @@ win32 {
 unix {
     isEmpty(PREFIX) { PREFIX = /usr/local }
 
-    library.files   += $${DESTDIR}/libminivideo.so
-    library.path     = $${PREFIX}/lib/
-    library_links.extra+= ln -sf libminivideo.so $${PREFIX}/lib/libminivideo.so.$${VER_MAJ};
-    library_links.extra+= ln -sf libminivideo.so $${PREFIX}/lib/libminivideo.so.$${VER_MAJ}.$${VER_MIN};
-    library_links.extra+= ln -sf libminivideo.so $${PREFIX}/lib/libminivideo.so.$${VER_MAJ}.$${VER_MIN}.$${VER_PAT};
-    library_links.path  = $${PREFIX}/lib/
-
-    headers.files   += $${PWD}/src/minivideo*.h
-    headers.path     = $${PREFIX}/include/minivideo/
+    library.files  += $${DESTDIR}/libminivideo.so.$${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+    library.extra  += ln -sf libminivideo.so.$${VER_MAJ}.$${VER_MIN}.$${VER_PAT} $${PREFIX}/lib/libminivideo.so;
+    library.extra  += ln -sf libminivideo.so.$${VER_MAJ}.$${VER_MIN}.$${VER_PAT} $${PREFIX}/lib/libminivideo.so.$${VER_MAJ};
+    library.extra  += ln -sf libminivideo.so.$${VER_MAJ}.$${VER_MIN}.$${VER_PAT} $${PREFIX}/lib/libminivideo.so.$${VER_MAJ}.$${VER_MIN};
+    library.path    = $${PREFIX}/lib/
+
+    headers.files  += $${PWD}/src/minivideo*.h
+    headers.path    = $${PREFIX}/include/minivideo/
     headers_h264.files += $${PWD}/src/decoder/h264/h264_parameterset_struct.h
     headers_h264.path   = $${PREFIX}/include/minivideo/decoder/h264/
     headers_h265.files += $${PWD}/src/decoder/h265/h265_parameterset_struct.h
     headers_h265.path   = $${PREFIX}/include/minivideo/decoder/h265/
     headers_h266.files += $${PWD}/src/decoder/h266/h266_parameterset_struct.h
     headers_h266.path   = $${PREFIX}/include/minivideo/decoder/h266/
 
-    INSTALLS += library library_links headers headers_h264 headers_h265 headers_h266
+    INSTALLS += library headers headers_h264 headers_h265 headers_h266
 }