Skip to content
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.

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

Feature/updated cmake #12589

Merged
merged 42 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
104dc71
fix: Hopefully fixed the build of the cpp-example on windows systems
chrisdutz Aug 17, 2023
0db1a8f
Merge remote-tracking branch 'upstream/master'
chrisdutz Aug 17, 2023
1bdc2cf
Merge remote-tracking branch 'upstream/master'
chrisdutz Aug 18, 2023
0ea9e78
Merge remote-tracking branch 'upstream/master'
chrisdutz Aug 21, 2023
4b79d7a
Merge remote-tracking branch 'upstream/master'
chrisdutz Aug 31, 2023
5e54115
Merge remote-tracking branch 'upstream/master'
chrisdutz Aug 31, 2023
b16c9a0
Merge remote-tracking branch 'upstream/master'
chrisdutz Sep 5, 2023
d162a48
Merge branch 'apache:master' into master
chrisdutz Sep 6, 2023
13ef12e
Merge remote-tracking branch 'upstream/master'
chrisdutz Sep 7, 2023
4f22e11
Merge branch 'apache:master' into master
chrisdutz Sep 8, 2023
bbbf3e3
Merge remote-tracking branch 'upstream/master'
chrisdutz Sep 14, 2023
8a56b00
Merge remote-tracking branch 'upstream/master'
chrisdutz Sep 19, 2023
2ad77a6
Merge remote-tracking branch 'upstream/master'
chrisdutz Oct 17, 2023
383d101
Merge remote-tracking branch 'upstream/master'
chrisdutz Nov 1, 2023
f6f4ac6
Merge remote-tracking branch 'upstream/master'
chrisdutz Nov 7, 2023
e1c6f72
fix: Increase the timeout even more to finally make the build succeed.
chrisdutz Nov 7, 2023
8a18cf3
Merge remote-tracking branch 'upstream/master'
chrisdutz Nov 9, 2023
8b9075a
Merge remote-tracking branch 'upstream/master'
chrisdutz Nov 29, 2023
a6c11a0
Merge remote-tracking branch 'upstream/master'
chrisdutz Nov 29, 2023
18ccb78
Merge remote-tracking branch 'upstream/master'
chrisdutz Jan 3, 2024
1c5d175
Merge remote-tracking branch 'upstream/master'
chrisdutz Jan 8, 2024
d650a88
Merge remote-tracking branch 'upstream/master'
chrisdutz Jan 9, 2024
c84581a
Merge remote-tracking branch 'upstream/master'
chrisdutz Jan 23, 2024
f6e5f1c
Merge remote-tracking branch 'upstream/master'
chrisdutz Jan 30, 2024
bf64c2f
Merge remote-tracking branch 'upstream/master'
chrisdutz Feb 5, 2024
66680d1
Merge remote-tracking branch 'upstream/master'
chrisdutz Mar 13, 2024
9e62ab3
Merge remote-tracking branch 'upstream/master'
chrisdutz Mar 14, 2024
24f7842
fix: Fix the build.
chrisdutz Mar 14, 2024
9012fa9
Merge remote-tracking branch 'refs/remotes/origin/master'
chrisdutz Apr 15, 2024
9e5b39a
Merge remote-tracking branch 'refs/remotes/upstream/master'
chrisdutz Apr 15, 2024
055fc0d
Merge remote-tracking branch 'refs/remotes/upstream/master'
chrisdutz Apr 18, 2024
c08a231
Merge remote-tracking branch 'refs/remotes/upstream/master'
chrisdutz Apr 22, 2024
1134199
Merge remote-tracking branch 'refs/remotes/upstream/master'
chrisdutz May 2, 2024
a835848
Merge remote-tracking branch 'refs/remotes/upstream/master'
chrisdutz May 17, 2024
ac5791a
Merge remote-tracking branch 'refs/remotes/upstream/master'
chrisdutz May 24, 2024
ea945a5
chore: Updated cmake to a version that works on all of our supported …
chrisdutz May 24, 2024
dcd3723
chore: Changed the conditional variable to match that we are now usin…
chrisdutz May 24, 2024
51ab43b
fix: Changed the generator back to the visual studio generator as thi…
chrisdutz May 28, 2024
7380cbb
fix: Changed back in order to hopefully make it compile with mingw (W…
chrisdutz May 28, 2024
19b9cd6
fix: Changed back in order to hopefully make it compile with mingw (W…
chrisdutz May 28, 2024
64e8711
fix: Changed the generator back to the visual studio generator as thi…
chrisdutz May 28, 2024
c169c00
fix: Tried fixing the pthread linking problem on windows.
chrisdutz May 28, 2024
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
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.

distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
4 changes: 3 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1852,7 +1852,7 @@
<plugin>
<groupId>com.googlecode.cmake-maven-project</groupId>
<artifactId>cmake-maven-plugin</artifactId>
<version>3.26.3-b1</version>
<version>3.29.3-b2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -2485,6 +2485,7 @@
</os>
</activation>
<properties>
<!-- The generated code relied on Boost and that relies on VS and can't be built with MinGW -->
<cmake.generator>Visual Studio 17 2022</cmake.generator>
<os.classifier>windows-x86_64</os.classifier>
<thrift.executable>Release/thrift.exe</thrift.executable>
Expand All @@ -2499,6 +2500,7 @@
</os>
</activation>
<properties>
<!-- The generated code relied on Boost and that relies on VS and can't be built with MinGW -->
<cmake.generator>Visual Studio 17 2022</cmake.generator>
<os.classifier>windows-aarch64</os.classifier>
<thrift.executable>Release/thrift.exe</thrift.executable>
Expand Down
Loading