Skip to content

Merge dev. #2

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

Merged
merged 8 commits into from
Nov 30, 2024
Merged

Merge dev. #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9f7bfcc
Optimize the way to import build-aux.
ChenPi11 Aug 24, 2023
7529b6b
Remove langmap files and `build-aux` requirement.
ChenPi11 Nov 30, 2024
fee8fe9
Remove repoutils.
ChenPi11 Nov 30, 2024
28cfa3e
Remove copyright notice and rename `COPYING` to `LICENSE`.
ChenPi11 Nov 30, 2024
483fc21
Add example.
ChenPi11 Nov 30, 2024
6414a08
Update documents.
ChenPi11 Nov 30, 2024
ef55887
Change unknown arch's `__arch_name__` to `Unknown`.
ChenPi11 Nov 30, 2024
8440bb4
Use Rubisco to manage the project.
ChenPi11 Nov 30, 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
Next Next commit
Optimize the way to import build-aux. 
	修改：     CMakeLists.txt
	修改：     ChangeLog
  • Loading branch information
@ChenPi11
ChenPi11 committed Aug 24, 2023
commit 9f7bfcc2772643641a6489e74284dc0e65d8859f
13 changes: 7 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,20 @@ project(cppp-platform VERSION 1.3.0)
# Set C++ standard
set(CMAKE_CXX_STANDARD 11)

# ----------------------------------------------------------------------------------
# Import build-aux subdirectory.
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/build-aux")
set(BUILD_AUX "${CMAKE_CURRENT_SOURCE_DIR}/build-aux")
add_subdirectory("${BUILD_AUX}")
message(STATUS "Using '${BUILD_AUX}' for C++ Plus build-aux directory.")
elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../build-aux")
set(BUILD_AUX "${CMAKE_CURRENT_SOURCE_DIR}/../build-aux")
else()
message(FATAL_ERROR "CMake build-aux directory is not exists, try to execute 'setup.cmd' or './setup.sh' to get it.")
endif()
set(AUX_DIR "${BUILD_AUX}/cmake")

message(STATUS "Using '${BUILD_AUX}' for C++ Plus build-aux directory.")
add_subdirectory("${BUILD_AUX}")

include("${AUX_DIR}/cppp.cmake")
get_filename_component(BUILD_AUX "${BUILD_AUX}" ABSOLUTE)
include("${BUILD_AUX}/cmake/cppp.cmake")
# ----------------------------------------------------------------------------------

# Read source files
file(READ "${srcdir}/src/architectures.h" ARCHITECTURES)
Expand Down
4 changes: 4 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2023-08-24 ChenPi11 <wushengwuxi-msctinoulk@outlook.com>

Optimize the way to import build-aux.

2023-08-09 ChenPi11 <wushengwuxi-msctinoulk@outlook.com>

Add C++ Plus package infomation.
Expand Down