diff options
| author | nicoo <nicoo@debian.org> | 2020-02-23 14:46:35 +0000 |
|---|---|---|
| committer | nicoo <nicoo@debian.org> | 2020-02-23 14:46:35 +0000 |
| commit | f794345c2d734f593da8ed7754e5dbb5809c688d (patch) | |
| tree | 32889c9b7bd26656242cc5e4b483c8a1deba88e1 /CMakeLists.txt | |
| parent | 28215e6c161c70cb1bcae7d01195fefcffb09d32 (diff) | |
| parent | 400533f0af0b8119c84e574387ed05e500f63861 (diff) | |
Merge branch 'prep-v1.3.1-1' into 'debian/sid'
Prepare upload v1.3.1-1
See merge request auth-team/libfido2!3
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c7c5991..9481c46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -20,7 +20,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) | |||
| 20 | 20 | ||
| 21 | set(FIDO_MAJOR "1") | 21 | set(FIDO_MAJOR "1") |
| 22 | set(FIDO_MINOR "3") | 22 | set(FIDO_MINOR "3") |
| 23 | set(FIDO_PATCH "0") | 23 | set(FIDO_PATCH "1") |
| 24 | set(FIDO_VERSION ${FIDO_MAJOR}.${FIDO_MINOR}.${FIDO_PATCH}) | 24 | set(FIDO_VERSION ${FIDO_MAJOR}.${FIDO_MINOR}.${FIDO_PATCH}) |
| 25 | 25 | ||
| 26 | add_definitions(-D_FIDO_MAJOR=${FIDO_MAJOR}) | 26 | add_definitions(-D_FIDO_MAJOR=${FIDO_MAJOR}) |
| @@ -322,7 +322,7 @@ elseif(NOT MSVC) | |||
| 322 | endif() | 322 | endif() |
| 323 | else() | 323 | else() |
| 324 | string(CONCAT CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} | 324 | string(CONCAT CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} |
| 325 | " /def:${CMAKE_CURRENT_SOURCE_DIR}/src/export.msvc") | 325 | " /def:\"${CMAKE_CURRENT_SOURCE_DIR}/src/export.msvc\"") |
| 326 | endif() | 326 | endif() |
| 327 | 327 | ||
| 328 | include_directories(${CMAKE_SOURCE_DIR}/src) | 328 | include_directories(${CMAKE_SOURCE_DIR}/src) |