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.

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

Jump to bottom

Use Cmake #17

Merged
merged 62 commits into from
Nov 10, 2023
Merged

Use Cmake #17

merged 62 commits into from
Nov 10, 2023

Conversation

TheoPannetier
Copy link
Member

@TheoPannetier TheoPannetier commented Nov 9, 2023 •
edited
Loading

Fix

  • Try out building RangeShifter with CMake #15

  • Add build instructions #18

  • RangeShifter now builds with CMake. This means devs should now be able to build RangeShifter on most architectures with cmake; cmake --build (provided they have CMake installed).

  • Reduced size of generic tests to complete more quickly

  • Generic tests now run on GitHub Action on Windows and Mac in addition to ubuntu

JetteReeg and others added 30 commits September 29, 2023 10:21
@JetteReeg
Bugfix for R package (RS_RCPP macro)
f3f2214
@TheoPannetier
Minimal working CMakeLists#15
35719f3
@TheoPannetier
RScore as a linked library
7c36ff7
@TheoPannetier
progress #15, cannot rm Version.h yet
bcde1db
@TheoPannetier
Version.h replaced with cmake target_compile_definition
c90225a
@TheoPannetier
ignore CMakeLists
63b920f
@TheoPannetier
include Version.h obsolete in batch with cmake
91ec5e6
@TheoPannetier
switch RScore branch
e559dce
@TheoPannetier
Add 'src/RScore/' from commit '91ec5e6ca0ee72b5ec4aed52e68c99769294c467'
13eabc0 
git-subtree-dir: src/RScore
git-subtree-mainline: e559dce
git-subtree-split: 91ec5e6
@TheoPannetier
don't ignore CMakeList after all
233898d
@TheoPannetier
Merge commit '233898d9a1bc54c120744b4fb8baae0616e1361f' into cmake
9d2bd55
@TheoPannetier
can compile without Version.h?
41f4271
@TheoPannetier
can I rm BATCH def + others?
954ac29
@TheoPannetier
try out matrix for GHA
15f8c41
@TheoPannetier
fix typo
37b4957
@TheoPannetier
fix yaml
51b120d
@TheoPannetier
deprecated directive
281fe45
@TheoPannetier
Merge branch 'ci' of https://github.com/RangeShifter/RangeShifter_bat…
70f1352 
…ch_dev into ci
@TheoPannetier
simplified test project
f5009fc
@TheoPannetier
paths in output files uniform across platforms
2ba3e6a
@TheoPannetier
had missed some files
6ad8e29
@TheoPannetier
investigating why macos differs
178e2fe
@TheoPannetier
what os does gha run jobs on?
d379108
@TheoPannetier
disable macos build for a short bit
b12f793
@TheoPannetier
separate set of expectations for macos
f00631d
@TheoPannetier
build with cmake msvc
3bb09e4
@TheoPannetier
solve merge conflict with ci
08bb790
@TheoPannetier
build cmake on gha, only windows for now
4cb4f39
@TheoPannetier
fix broken path
71ff979
@TheoPannetier
Merge branch 'ci' into cmake
554c392
TheoPannetier and others added 24 commits October 31, 2023 17:58
@TheoPannetier
set explicit paths in CMake
0ca3288
@TheoPannetier
whereami
6b18c37
@TheoPannetier
i insist
dd2658e
@TheoPannetier
what do you not see
0de751e
@TheoPannetier
disable tests to see if builds on win/mac
3e90430
@TheoPannetier
what's up GHA windows?
f344273
@TheoPannetier
attempt with GHA matrix
97304b9
@TheoPannetier
is this better, yaml?
9199dfe
@TheoPannetier
how this
2a12728
@TheoPannetier
npm example
d71e78d
@TheoPannetier
hows this then
ceed1b3
@TheoPannetier
or that
e10e2dd
@TheoPannetier
this good?
fe546ea
@TheoPannetier
do we like
e0f50c5
@TheoPannetier
work with me
e54fae4
@TheoPannetier
enable output check again
47c2e57
@TheoPannetier
don't diff BatchLog, ignore input file names
99e0ded
@TheoPannetier
drop BatchLog comparison, ignore input filenames in comparisons
c0f02ec
@TheoPannetier
forgot to update expectation path
b406129
@TheoPannetier
we do need different expectations for macos
60b35ea
@TheoPannetier
strip unused macros
3764f7a
@TheoPannetier
update subtree with RScore branch cmake_batch
d8d1f6d
@TheoPannetier
Add 'src/RScore/' from commit '3764f7aaaaf9a6624af0037511077a42bbb6ad4e'
f2d0fee 
git-subtree-dir: src/RScore
git-subtree-mainline: d8d1f6d
git-subtree-split: 3764f7a
@TheoPannetier
rm drop_wd_prefix()
769e6f7
@TheoPannetier TheoPannetier mentioned this pull request Nov 10, 2023
Closed
@TheoPannetier TheoPannetier merged commit ec24cfe into develop Nov 10, 2023
3 checks passed
@TheoPannetier TheoPannetier deleted the cmake branch November 10, 2023 12:05
TheoPannetier added a commit that referenced this pull request Apr 22, 2024
@TheoPannetier
Merge pull request #17 from RangeShifter/cmake
acbbb13 
Use Cmake
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@TheoPannetier @JetteReeg