Skip to content

Commit b3644c1

Browse files
author
Richard Musil
committed
Adapted for conan builds.
1 parent 49ecef7 commit b3644c1

File tree

3 files changed

+30
-25
lines changed

3 files changed

+30
-25
lines changed

‎CMakeLists.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Set the minimum required version of CMake for this project.
2-
cmake_minimum_required(VERSION 2.8)
2+
cmake_minimum_required(VERSION 3.15)
33

44
# Set project name.
55
project(OpenVRSDK)
@@ -22,7 +22,7 @@ string(REGEX REPLACE "${VERSION_BUILD_REGEX}" "\\1" VERSION_BUILD ${VERSION_BUIL
2222
set(OPENVR_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}")
2323

2424
# Setup some options.
25-
option(BUILD_SHARED "Builds the library as shared library" OFF)
25+
option(BUILD_SHARED_LIBS "Builds the library as shared library" OFF)
2626
option(BUILD_FRAMEWORK "Builds the library as an apple Framework" OFF)
2727
option(BUILD_UNIVERSAL "Builds the shared or framework as a universal (fat, 32- & 64-bit) binary" ON)
2828
option(BUILD_OSX_I386 "Builds the shared or framework as a 32-bit binary, even on a 64-bit platform" OFF)
@@ -42,7 +42,7 @@ endif()
4242
# Get platform.
4343
if(WIN32)
4444
set(PLATFORM_NAME "win")
45-
if(NOT BUILD_SHARED)
45+
if(NOT BUILD_SHARED_LIBS)
4646
add_definitions(-DOPENVR_BUILD_STATIC)
4747
endif()
4848
elseif(UNIX AND NOT APPLE)
@@ -68,9 +68,9 @@ elseif(APPLE)
6868
endif()
6969

7070
# Set output folder for static and shared libraries
71-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${PLATFORM_NAME}${PROCESSOR_ARCH})
72-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${PLATFORM_NAME}${PROCESSOR_ARCH})
73-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${PLATFORM_NAME}${PROCESSOR_ARCH})
71+
#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${PLATFORM_NAME}${PROCESSOR_ARCH})
72+
#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${PLATFORM_NAME}${PROCESSOR_ARCH})
73+
#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${PLATFORM_NAME}${PROCESSOR_ARCH})
7474

7575
# Enable some properties.
7676
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
@@ -80,7 +80,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
8080
# Set custom libc++ usage here
8181
if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND USE_LIBCXX)
8282
if(USE_CUSTOM_LIBCXX)
83-
if(BUILD_SHARED)
83+
if(BUILD_SHARED_LIBS)
8484
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++")
8585
endif()
8686
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc++")

‎CMakeSettings.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"inheritEnvironments": [ "msvc_x64_x64" ],
88
"buildRoot": "${projectDir}\\out\\build\\${name}",
99
"installRoot": "${projectDir}\\out\\install\\${name}",
10-
"cmakeCommandArgs": "-DBUILD_SHARED=ON -DCMAKE_DEBUG_POSTFIX=d -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
10+
"cmakeCommandArgs": "-DBUILD_SHARED_LIBS=ON -DCMAKE_DEBUG_POSTFIX=d -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
1111
"buildCommandArgs": "-v",
1212
"ctestCommandArgs": ""
1313
},
@@ -18,7 +18,7 @@
1818
"inheritEnvironments": [ "msvc_x86" ],
1919
"buildRoot": "${projectDir}\\out\\build\\${name}",
2020
"installRoot": "${projectDir}\\out\\install\\${name}",
21-
"cmakeCommandArgs": "-DBUILD_SHARED=ON -DCMAKE_DEBUG_POSTFIX=d -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
21+
"cmakeCommandArgs": "-DBUILD_SHARED_LIBS=ON -DCMAKE_DEBUG_POSTFIX=d -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
2222
"buildCommandArgs": "-v",
2323
"ctestCommandArgs": ""
2424
},
@@ -29,7 +29,7 @@
2929
"inheritEnvironments": [ "msvc_x64_x64" ],
3030
"buildRoot": "${projectDir}\\out\\build\\${name}",
3131
"installRoot": "${projectDir}\\out\\install\\${name}",
32-
"cmakeCommandArgs": "-DBUILD_SHARED=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
32+
"cmakeCommandArgs": "-DBUILD_SHARED_LIBS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
3333
"buildCommandArgs": "-v",
3434
"ctestCommandArgs": ""
3535
},
@@ -40,7 +40,7 @@
4040
"inheritEnvironments": [ "msvc_x86" ],
4141
"buildRoot": "${projectDir}\\out\\build\\${name}",
4242
"installRoot": "${projectDir}\\out\\install\\${name}",
43-
"cmakeCommandArgs": "-DBUILD_SHARED=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
43+
"cmakeCommandArgs": "-DBUILD_SHARED=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
4444
"buildCommandArgs": "-v",
4545
"ctestCommandArgs": ""
4646
},
@@ -51,7 +51,7 @@
5151
"inheritEnvironments": [ "msvc_x64_x64" ],
5252
"buildRoot": "${projectDir}\\out\\build\\${name}",
5353
"installRoot": "${projectDir}\\out\\install\\${name}",
54-
"cmakeCommandArgs": "-DCMAKE_DEBUG_POSTFIX=d -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>\"",
54+
"cmakeCommandArgs": "-DCMAKE_DEBUG_POSTFIX=d -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>\"",
5555
"buildCommandArgs": "-v",
5656
"ctestCommandArgs": ""
5757
},
@@ -62,7 +62,7 @@
6262
"inheritEnvironments": [ "msvc_x64_x64" ],
6363
"buildRoot": "${projectDir}\\out\\build\\${name}",
6464
"installRoot": "${projectDir}\\out\\install\\${name}",
65-
"cmakeCommandArgs": "-DCMAKE_DEBUG_POSTFIX=d -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
65+
"cmakeCommandArgs": "-DCMAKE_DEBUG_POSTFIX=d -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
6666
"buildCommandArgs": "-v",
6767
"ctestCommandArgs": ""
6868
},
@@ -73,7 +73,7 @@
7373
"inheritEnvironments": [ "msvc_x86" ],
7474
"buildRoot": "${projectDir}\\out\\build\\${name}",
7575
"installRoot": "${projectDir}\\out\\install\\${name}",
76-
"cmakeCommandArgs": "-DCMAKE_DEBUG_POSTFIX=d -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>\"",
76+
"cmakeCommandArgs": "-DCMAKE_DEBUG_POSTFIX=d -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>\"",
7777
"buildCommandArgs": "-v",
7878
"ctestCommandArgs": ""
7979
},
@@ -84,7 +84,7 @@
8484
"inheritEnvironments": [ "msvc_x64_x64" ],
8585
"buildRoot": "${projectDir}\\out\\build\\${name}",
8686
"installRoot": "${projectDir}\\out\\install\\${name}",
87-
"cmakeCommandArgs": "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>\"",
87+
"cmakeCommandArgs": "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>\"",
8888
"buildCommandArgs": "-v",
8989
"ctestCommandArgs": ""
9090
},
@@ -95,7 +95,7 @@
9595
"inheritEnvironments": [ "msvc_x64_x64" ],
9696
"buildRoot": "${projectDir}\\out\\build\\${name}",
9797
"installRoot": "${projectDir}\\out\\install\\${name}",
98-
"cmakeCommandArgs": "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
98+
"cmakeCommandArgs": "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
9999
"buildCommandArgs": "-v",
100100
"ctestCommandArgs": ""
101101
},
@@ -106,7 +106,7 @@
106106
"inheritEnvironments": [ "msvc_x86" ],
107107
"buildRoot": "${projectDir}\\out\\build\\${name}",
108108
"installRoot": "${projectDir}\\out\\install\\${name}",
109-
"cmakeCommandArgs": "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>\"",
109+
"cmakeCommandArgs": "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>\"",
110110
"buildCommandArgs": "-v",
111111
"ctestCommandArgs": ""
112112
},
@@ -116,7 +116,7 @@
116116
"configurationType": "Debug",
117117
"buildRoot": "${projectDir}\\out\\build\\${name}",
118118
"installRoot": "${projectDir}\\out\\install\\${name}",
119-
"cmakeCommandArgs": "-DBUILD_SHARED=ON -DCMAKE_DEBUG_POSTFIX=cd -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
119+
"cmakeCommandArgs": "-DBUILD_SHARED_LIBS=ON -DCMAKE_DEBUG_POSTFIX=cd -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
120120
"buildCommandArgs": "-v",
121121
"ctestCommandArgs": "",
122122
"inheritEnvironments": [ "clang_cl_x64" ],
@@ -139,7 +139,7 @@
139139
"configurationType": "Release",
140140
"buildRoot": "${projectDir}\\out\\build\\${name}",
141141
"installRoot": "${projectDir}\\out\\install\\${name}",
142-
"cmakeCommandArgs": "-DBUILD_SHARED=ON -DCMAKE_RELEASE_POSTFIX=c -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
142+
"cmakeCommandArgs": "-DBUILD_SHARED_LIBS=ON -DCMAKE_RELEASE_POSTFIX=c -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\"",
143143
"buildCommandArgs": "-v",
144144
"ctestCommandArgs": "",
145145
"inheritEnvironments": [ "clang_cl_x64" ],
@@ -162,7 +162,7 @@
162162
"configurationType": "Debug",
163163
"buildRoot": "${projectDir}\\out\\build\\${name}",
164164
"installRoot": "${projectDir}\\out\\install\\${name}",
165-
"cmakeCommandArgs": "-DCMAKE_DEBUG_POSTFIX=cd -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>\"",
165+
"cmakeCommandArgs": "-DCMAKE_DEBUG_POSTFIX=cd -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>\"",
166166
"buildCommandArgs": "-v",
167167
"ctestCommandArgs": "",
168168
"inheritEnvironments": [ "clang_cl_x64" ],
@@ -185,7 +185,7 @@
185185
"configurationType": "Release",
186186
"buildRoot": "${projectDir}\\out\\build\\${name}",
187187
"installRoot": "${projectDir}\\out\\install\\${name}",
188-
"cmakeCommandArgs": "-DCMAKE_RELEASE_POSTFIX=c -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>\"",
188+
"cmakeCommandArgs": "-DCMAKE_RELEASE_POSTFIX=c -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=\"MultiThreaded$<$<CONFIG:Debug>:Debug>\"",
189189
"buildCommandArgs": "-v",
190190
"ctestCommandArgs": "",
191191
"inheritEnvironments": [ "clang_cl_x64" ],

‎src/CMakeLists.txt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ if(APPLE)
1010
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
1111
set_source_files_properties(vrcommon/pathtools_public.cpp vrcommon/vrpathregistry_public.cpp PROPERTIES COMPILE_FLAGS "-x objective-c++")
1212
endif()
13-
if(BUILD_SHARED OR BUILD_FRAMEWORK)
13+
if(BUILD_SHARED_LIBS OR BUILD_FRAMEWORK)
1414
find_library(FOUNDATION_FRAMEWORK Foundation)
1515
mark_as_advanced(FOUNDATION_FRAMEWORK)
1616
set(EXTRA_LIBS ${EXTRA_LIBS} ${FOUNDATION_FRAMEWORK})
17-
endif(BUILD_SHARED OR BUILD_FRAMEWORK)
17+
endif(BUILD_SHARED_LIBS OR BUILD_FRAMEWORK)
1818
elseif(WIN32)
1919
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
2020
add_definitions( -DWIN64 )
@@ -66,7 +66,7 @@ source_group("VRCommon" FILES
6666
)
6767

6868
# Build the library.
69-
if(BUILD_SHARED)
69+
if(BUILD_SHARED_LIBS)
7070
add_library(${LIBNAME} SHARED ${SOURCE_FILES})
7171
elseif(BUILD_FRAMEWORK)
7272
set( LIBNAME "OpenVR" )
@@ -101,7 +101,12 @@ endif()
101101
target_link_libraries(${LIBNAME} ${EXTRA_LIBS} ${CMAKE_DL_LIBS})
102102
target_include_directories(${LIBNAME} PUBLIC ${OPENVR_HEADER_DIR})
103103

104-
install(TARGETS ${LIBNAME} DESTINATION lib)
104+
install(TARGETS ${LIBNAME}
105+
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
106+
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
107+
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
108+
)
109+
105110
install(FILES ${PUBLIC_HEADER_FILES} DESTINATION include/openvr)
106111

107112
# Generate a .pc file for linux environments

0 commit comments

Comments
 (0)