diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-02-14 09:53:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-13 17:53:23 -0800 |
| commit | ad69a7fc8ee9324b95105cbfd89f2a615ad570af (patch) | |
| tree | c0fdba243bc4b23065c16e7e960a2c8f0c6ea6aa /ports/osg/remove-prefix.patch | |
| parent | 375ea0ec6b9df9a82704f01c3afc1bf3d00b618b (diff) | |
| download | vcpkg-ad69a7fc8ee9324b95105cbfd89f2a615ad570af.tar.gz vcpkg-ad69a7fc8ee9324b95105cbfd89f2a615ad570af.zip | |
[osg]Fix windows-dynamic/linux build. (#8060)
* [osg]Fix dynamic build.
* [sdl1]Fix linux command.
* [osg]Fix linux build: disable present3D and osgstaticview.
* [osg]fix windows build-only for windows.
* [osg]Fix file INSTALL error.
* [osg]Add dependency conditions.
* [osg]disable OSG_USE_UTF8_FILENAME in Linux and OSX.
* [osg]Fix find dependency curl. Replace version num by macro.
* [osg]Add option CMAKE_CXX_STANDARD
* [osg] Remove library prefix.
* [osg] Fix install pdbs
* [osg] Remove usless plugin libs.
* update baseline
* update baseline
* update baseline
* update baseline
Diffstat (limited to 'ports/osg/remove-prefix.patch')
| -rw-r--r-- | ports/osg/remove-prefix.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/ports/osg/remove-prefix.patch b/ports/osg/remove-prefix.patch new file mode 100644 index 000000000..62b1466c9 --- /dev/null +++ b/ports/osg/remove-prefix.patch @@ -0,0 +1,35 @@ +diff --git a/CMakeModules/ModuleInstall.cmake b/CMakeModules/ModuleInstall.cmake +index bb3be63..356edcd 100644 +--- a/CMakeModules/ModuleInstall.cmake ++++ b/CMakeModules/ModuleInstall.cmake +@@ -21,7 +21,7 @@ SOURCE_GROUP( + FILES ${TARGET_H} + ) + +-IF(MSVC AND OSG_MSVC_VERSIONED_DLL) ++IF(0) + HANDLE_MSVC_DLL() + ENDIF() + +@@ -33,7 +33,7 @@ INSTALL( + ) + + IF(MSVC AND DYNAMIC_OPENSCENEGRAPH) +- GET_TARGET_PROPERTY(PREFIX ${LIB_NAME} PREFIX) ++ set(PREFIX "") + INSTALL(FILES ${OUTPUT_BINDIR}/${PREFIX}${LIB_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph CONFIGURATIONS RelWithDebInfo) + INSTALL(FILES ${OUTPUT_BINDIR}/${PREFIX}${LIB_NAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph CONFIGURATIONS Debug) + ENDIF(MSVC AND DYNAMIC_OPENSCENEGRAPH) +diff --git a/src/OpenThreads/win32/CMakeLists.txt b/src/OpenThreads/win32/CMakeLists.txt +index 84550bd..0e816f7 100644 +--- a/src/OpenThreads/win32/CMakeLists.txt ++++ b/src/OpenThreads/win32/CMakeLists.txt +@@ -39,7 +39,7 @@ LINK_DIRECTORIES( + ${CMAKE_CURRENT_BINARY_DIR} + ) + +-IF(MSVC AND OSG_MSVC_VERSIONED_DLL) ++IF(0) + HANDLE_MSVC_DLL(ot ${OPENTHREADS_SOVERSION}) + ENDIF() + |