Skip to content

Commit 71cfb1e

Browse files
committed
update
1 parent 27bcc6d commit 71cfb1e

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

CMakeLists.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,20 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
77
set(CMAKE_CXX_STANDARD 17)
88
set(CMAKE_CXX_STANDARD_REQUIRED ON)
99
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
10-
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Type of build" FORCE)
10+
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Type of build")
1111

1212
# Set the output directory for libraries
1313
set(LOCAL_CXX_DIR "${PROJECT_NAME}/cpp")
1414
set(LOCAL_BIN_DIR "${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/binary")
1515

16-
# Include directories
17-
include_directories("${LOCAL_CXX_DIR}")
18-
1916
# Find dependencies
20-
if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
21-
include_directories("/opt/homebrew/opt/libomp/include") # for if compiler was installed through brew
17+
if(APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
18+
set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp" CACHE STRING "")
19+
set(OpenMP_CXX_LIB_NAMES "omp" CACHE STRING "")
20+
find_library(OpenMP_omp_LIBRARY omp HINTS $ENV{LIBOMP_PREFIX}/lib /opt/homebrew/opt/libomp/lib /usr/local/opt/libomp/lib)
21+
if(OpenMP_omp_LIBRARY)
22+
set(OpenMP_CXX_LIBRARIES "${OpenMP_omp_LIBRARY}" CACHE STRING "")
23+
endif()
2224
endif()
2325

2426
find_package(OpenMP REQUIRED)
@@ -46,4 +48,4 @@ message(STATUS "Binary will be installed in location: ${LOCAL_BIN_DIR}")
4648
add_subdirectory(SuPyMode/cpp/mesh) # mesh
4749
add_subdirectory(SuPyMode/cpp/model_parameters) # model_parameters
4850
add_subdirectory(SuPyMode/cpp/supermode) # supermode
49-
add_subdirectory(SuPyMode/cpp/eigensolver) # eigen_solver
51+
add_subdirectory(SuPyMode/cpp/eigensolver) # eigen_solver

pyproject.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ requires = ["scikit-build-core>=0.3.3", "pybind11", "setuptools_scm[toml]>=8.0"]
33
build-backend = "scikit_build_core.build"
44

55
[tool.scikit-build]
6+
build-dir = ".skbuild/{wheel_tag}"
67
metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
78
logging.level = "INFO"
89
wheel.exclude = ["SuPyMode/cpp"]
@@ -16,6 +17,7 @@ sdist.exclude = [
1617
]
1718

1819
[tool.setuptools_scm]
20+
1921
write_to = "SuPyMode/_version.py"
2022
version_scheme = "only-version"
2123
local_scheme = "no-local-version"
@@ -122,4 +124,4 @@ omit = [
122124
'SuPyMode/special.py'
123125
]
124126
branch = true
125-
relative_files = true
127+
relative_files = true

0 commit comments

Comments
 (0)