Skip to content

Commit

Permalink
bump to C++17 and increase version due to ABI change
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed Feb 18, 2023
1 parent c43bfbd commit 329c8ab
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ set "VS_VERSION=14.0"
set "VS_MAJOR=14"
set "VS_YEAR=2015"
cmake -DBUILD_SHARED_LIBS=ON ^
-DCMAKE_CXX_STANDARD=17 ^
-DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
-G "NMake Makefiles" ^
Expand Down
1 change: 1 addition & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ fi
mkdir build-cmake
pushd build-cmake
cmake ${CMAKE_ARGS} -GNinja \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_PREFIX_PATH=$PREFIX \
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DCMAKE_INSTALL_LIBDIR=lib \
Expand Down
5 changes: 4 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{% set name = "re2" %}
{% set version = "2023-02-01" %}
{% set dotversion = version.replace('-', '.') %}
# switching from C++14 to C++17 unfortunately introduces a different ABI, see #61;
# create a fake version bump so we can migrate the new version safely
{% set abi_bump_version = dotversion.replace('.01', '.02') %}

package:
name: {{ name|lower }}
version: {{ dotversion }}
version: {{ abi_bump_version }}

source:
url: http://github.com/google/{{ name }}/archive/{{ version }}.tar.gz
Expand Down

0 comments on commit 329c8ab

Please sign in to comment.