blob: 62b1466c96132850fb77ddd3b9a98a72e36c45ed (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
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()
|
