mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 09:19:07 +08:00
ad69a7fc8e
* [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
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
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()
|
|
|