Commit b4a1b4b5 authored by Gabi Melman's avatar Gabi Melman

Updated verion.rc and CMakeLists.txt for dll build

parent b309a88b
......@@ -122,8 +122,12 @@ if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
list(APPEND SPDLOG_SRCS src/fmt.cpp)
endif()
if(WIN32 AND SPDLOG_BUILD_SHARED)
list(APPEND SPDLOG_SRCS ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
endif()
if (SPDLOG_BUILD_SHARED)
add_library(spdlog SHARED ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
add_library(spdlog SHARED ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS})
target_compile_definitions(spdlog PUBLIC SPDLOG_SHARED_LIB)
if(WIN32)
target_compile_options(spdlog PUBLIC /wd4251 /wd4275)
......
......@@ -22,12 +22,12 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "spdlog dll"
VALUE "FileVersion", "@SPDLOG_VERSION@.0"
VALUE "InternalName", "spdlog.dll"
VALUE "LegalCopyright", "Copyright (C) spdlog"
VALUE "ProductName", "spdlog"
VALUE "ProductVersion", "@SPDLOG_VERSION@.0"
VALUE "FileDescription", "spdlog dll\0"
VALUE "FileVersion", "@SPDLOG_VERSION@.0\0"
VALUE "InternalName", "spdlog.dll\0"
VALUE "LegalCopyright", "Copyright (C) spdlog\0"
VALUE "ProductName", "spdlog\0"
VALUE "ProductVersion", "@SPDLOG_VERSION@.0\0"
END
END
BLOCK "VarFileInfo"
......
{
"configurations" :
[
{
"directories" :
[
{
"build" : ".",
"childIndexes" :
[
1,
2
],
"hasInstallRule" : true,
"minimumCMakeVersion" :
{
"string" : "3.2"
},
"projectIndex" : 0,
"source" : ".",
"targetIndexes" :
[
1
]
},
{
"build" : "example",
"minimumCMakeVersion" :
{
"string" : "3.1"
},
"parentIndex" : 0,
"projectIndex" : 1,
"source" : "example",
"targetIndexes" :
[
0
]
},
{
"build" : "tests",
"minimumCMakeVersion" :
{
"string" : "3.2"
},
"parentIndex" : 0,
"projectIndex" : 2,
"source" : "tests",
"targetIndexes" :
[
2
]
}
],
"name" : "Debug",
"projects" :
[
{
"childIndexes" :
[
1,
2
],
"directoryIndexes" :
[
0
],
"name" : "spdlog",
"targetIndexes" :
[
1
]
},
{
"directoryIndexes" :
[
1
],
"name" : "spdlog_examples",
"parentIndex" : 0,
"targetIndexes" :
[
0
]
},
{
"directoryIndexes" :
[
2
],
"name" : "spdlog_utests",
"parentIndex" : 0,
"targetIndexes" :
[
2
]
}
],
"targets" :
[
{
"directoryIndex" : 1,
"id" : "example::@70983d692f648185febe",
"jsonFile" : "target-example-Debug-2de1719d268d7c2e63a2.json",
"name" : "example",
"projectIndex" : 1
},
{
"directoryIndex" : 0,
"id" : "spdlog::@6890427a1f51a3e7e1df",
"jsonFile" : "target-spdlog-Debug-21e5be96c52e9f8540ea.json",
"name" : "spdlog",
"projectIndex" : 0
},
{
"directoryIndex" : 2,
"id" : "spdlog-utests::@a44f0ac069e85531cdee",
"jsonFile" : "target-spdlog-utests-Debug-2d48a2f3516d0eeb0bbd.json",
"name" : "spdlog-utests",
"projectIndex" : 2
}
]
}
],
"kind" : "codemodel",
"paths" :
{
"build" : "C:/devel/spdlog/out/build/x64-Debug",
"source" : "C:/devel/spdlog"
},
"version" :
{
"major" : 2,
"minor" : 0
}
}
{
"cmake" :
{
"generator" :
{
"name" : "Ninja"
},
"paths" :
{
"cmake" : "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe",
"cpack" : "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe",
"ctest" : "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe",
"root" : "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.15"
},
"version" :
{
"isDirty" : false,
"major" : 3,
"minor" : 15,
"patch" : 19101501,
"string" : "3.15.19101501-MSVC_2",
"suffix" : ""
}
},
"objects" :
[
{
"jsonFile" : "codemodel-v2-652fecc897c1be9b5385.json",
"kind" : "codemodel",
"version" :
{
"major" : 2,
"minor" : 0
}
},
{
"jsonFile" : "cache-v2-881185b6b6c12f781e9f.json",
"kind" : "cache",
"version" :
{
"major" : 2,
"minor" : 0
}
},
{
"jsonFile" : "cmakeFiles-v1-e731e878bbc150c81804.json",
"kind" : "cmakeFiles",
"version" :
{
"major" : 1,
"minor" : 0
}
}
],
"reply" :
{
"client-MicrosoftVS" :
{
"query.json" :
{
"requests" :
[
{
"kind" : "cache",
"version" : 2
},
{
"kind" : "cmakeFiles",
"version" : 1
},
{
"kind" : "codemodel",
"version" : 2
}
],
"responses" :
[
{
"jsonFile" : "cache-v2-881185b6b6c12f781e9f.json",
"kind" : "cache",
"version" :
{
"major" : 2,
"minor" : 0
}
},
{
"jsonFile" : "cmakeFiles-v1-e731e878bbc150c81804.json",
"kind" : "cmakeFiles",
"version" :
{
"major" : 1,
"minor" : 0
}
},
{
"jsonFile" : "codemodel-v2-652fecc897c1be9b5385.json",
"kind" : "codemodel",
"version" :
{
"major" : 2,
"minor" : 0
}
}
]
}
}
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment