Skip to content

Solved issue #118 "Missing VERSION_INFO when compiling as Windows DLL" #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Solved issue #118 "Missing VERSION_INFO when compiling as Windows DLL" #120

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4ba3c61
Change: CMake, allow the developer to select if Dynamic or Static lib…
Sep 11, 2017
ffbccf4
Revert: Change: CMake, allow the developer to select if Dynamic or St…
Sep 12, 2017
f6c58b9
This solves JuliaLang/utf8proc issue #118 "Missing VERSION_INFO when …
Mar 1, 2018
80238e4
Revert f6c58b9fa98d3f6d6223cb4180d315f876a591e1 and solve it without …
Sep 22, 2018
1ba901c
Merge branch 'master' of https://github.com/JuliaStrings/utf8proc
Sep 22, 2018
bffaa51
CMake Error at CMakeLists.txt:37 (target_compile_definitions): Cannot…
Sep 22, 2018
cce27e2
Merge branch 'master' of https://github.com/JuliaStrings/utf8proc
May 16, 2019
a25b5ba
Update .gitignore
May 18, 2019
88b6a3d
Merge branch 'master' of https://github.com/JuliaStrings/utf8proc
blonder Jul 18, 2019
8e3b625
Refactoring missing VERSION_INFO when compiling as Windows DLL
blonder Jul 18, 2019
8f161ef
Reanme UTF8PROC_VERSION used in win32 .rc to UTF8PROC_VERSION_NUMBER.
blonder Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ test/iterate
test/case
test/custom
/tmp/
/build
17 changes: 14 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,27 @@ project (utf8proc C)
# API version number (defined in utf8proc.h).
# Be sure to also update these in Makefile and MANIFEST!
set(SO_MAJOR 2)
set(SO_MINOR 3)
set(SO_PATCH 1)
set(SO_MINOR 4)
set(SO_PATCH 0)
Copy link
Member

@stevengj stevengj May 18, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the comment in the Makefile says, these numbers indicate ABI compatibility and don't follow the API version number exactly. From 2.3 to 2.4 there was no change in ABI which is why the minor version stayed 3.

Copy link
Member

@stevengj stevengj May 18, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Though it's probably easier for us to just match the API number in the future so that we don't have this discussion repeatedly.

In any case, please don't update these now.


option(UTF8PROC_INSTALL "Enable installation of utf8proc" On)

add_library (utf8proc
set(UTF8PROC_FILES
utf8proc.c
utf8proc.h
)

if (BUILD_SHARED_LIBS AND MSVC)
set(UTF8PROC_WINDLL_SRCS
win32/utf8proc.rc
)
add_definitions(
-DUTF8PROC_VERSION="${SO_MAJOR}.${SO_MINOR}.${SO_PATCH}"
)
endif ()

add_library (utf8proc ${UTF8PROC_FILES} ${UTF8PROC_WINDLL_SRCS})

# expose header path, for when this is part of a larger cmake project
target_include_directories(utf8proc PUBLIC ../utf8proc)

Expand Down
40 changes: 40 additions & 0 deletions win32/utf8proc.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#include <winver.h>
#include "../utf8proc.h"

#ifdef GCC_WINDRES
VS_VERSION_INFO VERSIONINFO
#else
VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
#endif
FILEVERSION UTF8PROC_VERSION_MAJOR,UTF8PROC_VERSION_MINOR,UTF8PROC_VERSION_PATCH,0
PRODUCTVERSION UTF8PROC_VERSION_MAJOR,UTF8PROC_VERSION_MINOR,UTF8PROC_VERSION_PATCH,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS 1
#else
FILEFLAGS 0
#endif
FILEOS VOS__WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE 0 // not used
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
//language ID = U.S. English, char set = Windows, Multilingual
BEGIN
VALUE "FileDescription", "utf8proc library\0"
VALUE "FileVersion", UTF8PROC_VERSION "\0"
VALUE "InternalName", "utf8proc.dll\0"
VALUE "LegalCopyright", "(C) Jan Behrens and the rest of the Public Software Group\0"
VALUE "OriginalFilename", "utf8proc.dll\0"
VALUE "ProductName", "utf8proc\0"
VALUE "ProductVersion", UTF8PROC_VERSION "\0"
VALUE "Comments", "For more information visit https://github.com/JuliaStrings/utf8proc/\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x0409, 1252
END
END