Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-21 20:10:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake update

Browse Source
This commit is contained in:
PrimedErwin 2025-05-14 23:23:15 +08:00
parent 47484a3b68
commit 322dd67c77
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3rd/math/CMakeLists.txt
View File

@ -8,11 +8,13 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
include_directories(${CMAKE_CURRENT_LIST_DIR}/include) include_directories(${CMAKE_CURRENT_LIST_DIR}/include)
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_LIST_DIR}/src MUSL_LIBC_MATH_SRC) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_LIST_DIR}/src MUSL_LIBC_MATH_SRC)
if(MSVC) if(MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:precise /Od /Oi-") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:precise /Ox /Oi-")
# mute warning C4723: div by 0 because some function returns nan when a input is nan. # mute warning C4723: div by 0 because some function returns nan when a input is nan.
add_compile_options( /wd4723) add_compile_options( /wd4723)
elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang") elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffp-model=strict") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffp-model=strict -O2")
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
endif() endif()
add_library(${PROJECT_NAME} STATIC ${MUSL_LIBC_MATH_SRC}) add_library(${PROJECT_NAME} STATIC ${MUSL_LIBC_MATH_SRC})

8
CMakeLists.txt
View File

@ -45,11 +45,11 @@ if(PK_ENABLE_OS)
add_definitions(-DPK_ENABLE_OS=1) add_definitions(-DPK_ENABLE_OS=1)
endif() endif()
option(USE_MUSL_LIBC_MATH "" OFF) option(PK_ENABLE_DETERMINISTIC_FLOAT "" OFF)
if(USE_MUSL_LIBC_MATH) if(PK_ENABLE_DETERMINISTIC_FLOAT)
add_subdirectory(3rd/math) add_subdirectory(3rd/math)
include_directories(3rd/math) include_directories(3rd/math)
add_definitions(-DUSE_MUSL_LIBC_MATH) add_definitions(-DPK_ENABLE_DETERMINISTIC_FLOAT)
endif() endif()
option(PK_BUILD_MODULE_LZ4 "" OFF) option(PK_BUILD_MODULE_LZ4 "" OFF)
@ -122,6 +122,6 @@ if(PK_BUILD_MODULE_LIBHV)
target_link_libraries(${PROJECT_NAME} libhv_bindings) target_link_libraries(${PROJECT_NAME} libhv_bindings)
endif() endif()
if(USE_MUSL_LIBC_MATH) if(PK_ENABLE_DETERMINISTIC_FLOAT)
target_link_libraries(${PROJECT_NAME} musl_math) target_link_libraries(${PROJECT_NAME} musl_math)
endif() endif()

2
cmake_build.py
View File

@ -20,7 +20,7 @@ assert config in ['Debug', 'Release', 'RelWithDebInfo']
os.chdir("build") os.chdir("build")
code = os.system(f"cmake .. -DPK_ENABLE_OS=ON -DPK_BUILD_MODULE_LZ4=ON -DUSE_MUSL_LIBC_MATH=ON -DCMAKE_BUILD_TYPE={config} {extra_flags}") code = os.system(f"cmake .. -DPK_ENABLE_OS=ON -DPK_BUILD_MODULE_LZ4=OFF -DPK_ENABLE_DETERMINISTIC_FLOAT=ON -DCMAKE_BUILD_TYPE={config} {extra_flags}")
assert code == 0 assert code == 0
code = os.system(f"cmake --build . --config {config} -j 4") code = os.system(f"cmake --build . --config {config} -j 4")
assert code == 0 assert code == 0

2
include/pocketpy/common/math.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#ifndef USE_MUSL_LIBC_MATH #ifndef PK_ENABLE_DETERMINISTIC_FLOAT
#include <math.h> #include <math.h>
#else #else
#include "include/math.h" #include "include/math.h"