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

Simplify build workflow #469

Merged
merged 11 commits into from
Jun 26, 2024
Merged

Simplify build workflow #469

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
871911a
Fix typos
s-zanella Apr 30, 2024
84e70aa
Always copy over default config from config/default_config_[msvc].cmake
s-zanella May 1, 2024
84fc1dd
Add CMakePresets.json with presets for x64 Ninja Multi-Config builds …
s-zanella May 1, 2024
a665439
Set flags for MSVC
s-zanella May 7, 2024
95e65ec
Document unified build workflow
s-zanella May 8, 2024
0a8137d
Cosmetics
s-zanella May 8, 2024
b252589
Add newline
s-zanella May 10, 2024
5186585
Add newline
s-zanella May 10, 2024
4a6b53a
Restore default_config.h
s-zanella May 10, 2024
829c842
Fix build
s-zanella May 17, 2024
b825ccf
Merge branch 'dev' into dev
franziskuskiefer Jun 21, 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
Prev Previous commit
Next Next commit
Always copy over default config from config/default_config_[msvc].cmake
  • Loading branch information
@s-zanella
s-zanella committed May 20, 2024
commit 84e70aa46f64ae945fd80cf7e89954661182f773
13 changes: 8 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,16 @@ endif()
set(hacl_VERSION_TWEAK "")

# Load global config from external file.
# This file must be generated before running cmake with ./mach.py --configure
# For a Clang build, this file can be generated before running cmake with
# ./mach.py --configure
# If the build is invoked through ./mach.py, a separate configuration is not
# needed.
# If the file is not present, i.e. cmake was invoked directly, we copy the default
# config from config/default_config.cmake
if(NOT EXISTS ${PROJECT_SOURCE_DIR}/build/config.cmake)
configure_file(${PROJECT_SOURCE_DIR}/config/default_config.cmake ${PROJECT_SOURCE_DIR}/build/config.cmake COPYONLY)
# We copy a default config from config/default_config.cmake or
# config/default_config_msvc.cmake
if(USE_MSVC)
configure_file(${PROJECT_SOURCE_DIR}/config/default_config_msvc.cmake ${PROJECT_SOURCE_DIR}/build/config.cmake COPYONLY)
else()
configure_file(${PROJECT_SOURCE_DIR}/config/default_config.cmake ${PROJECT_SOURCE_DIR}/build/config.cmake COPYONLY)
endif()

# Now include the config.
Expand Down