Commit 1ef5ec7 1 parent 7545059 commit 1ef5ec7 Copy full SHA for 1ef5ec7
File tree 2 files changed +3
-2
lines changed
2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -123,7 +123,7 @@ if(NOT DEFINED CMAKE_GENERATOR AND UNIX)
123
123
set (CMAKE_GENERATOR "Unix Makefiles" )
124
124
endif ()
125
125
126
- # If using MSVC, always enable multi-process compiling for all targets.1
126
+ # If using MSVC, always enable multi-process compiling for all targets.
127
127
# Note that this setting is repeated for rerun_sdk's CMakeLists.txt since it should also work stand-alone.
128
128
if (MSVC )
129
129
add_compile_options ("/MP" )
Original file line number Diff line number Diff line change @@ -126,6 +126,7 @@ if(MSVC AND BUILD_SHARED_LIBS)
126
126
# in CMake the behavior of Linux/macOS. However, it does not cover
127
127
# static variables.
128
128
set_property (TARGET rerun_sdk PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS ON )
129
+
129
130
# For exporting static variables in shared libraries in Windows, it
130
131
# is not possible to just use WINDOWS_EXPORT_ALL_SYMBOLS, we need instead
131
132
# to manually annotate with the appropriate storage-class attributes
@@ -196,7 +197,7 @@ include(CMakePackageConfigHelpers)
196
197
197
198
# Extract the version from rerun.h.
198
199
# Intentionally only grab major.minor.patch, not the full version, since version file can't handle it otherwise.
199
- file (READ "${CMAKE_CURRENT_SOURCE_DIR} /src/rerun/c/rerun .h" RERUN_H_CONTENTS)
200
+ file (READ "${CMAKE_CURRENT_SOURCE_DIR} /src/rerun/c/sdk_info .h" RERUN_H_CONTENTS)
200
201
string (REGEX MATCH "\n #define RERUN_SDK_HEADER_VERSION \" ([0-9]+.[0-9]+.[0-9]+)" _ ${RERUN_H_CONTENTS} )
201
202
set (RERUN_INSTALL_VERSION ${CMAKE_MATCH_1} )
202
203
message (STATUS "Rerun SDK install version: ${RERUN_INSTALL_VERSION} " )
You can’t perform that action at this time.
0 commit comments