Skip to content

Commit d6b87dc

Browse files
committed
Apply code review comments
1 parent 73deb5f commit d6b87dc

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ wheelhouse/
1313
unittest-logs/
1414

1515
# Dev
16+
cmake-build-*
1617
compile_commands.json
1718
.mypy_cache

CMakeLists.txt

+11-11
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,20 @@ target_compile_features(${CLP_FFI_PY_LIB_IR} PRIVATE cxx_std_20)
5555

5656
set(CLP_FFI_PY_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
5757
set(CLP_FFI_PY_LIB_SRC_DIR "${CLP_FFI_PY_SRC_DIR}/clp_ffi_py")
58-
set(CLP_CORE_ROOT "${CLP_FFI_PY_SRC_DIR}/clp/components/core")
58+
set(CLP_FFI_PY_CLP_CORE_DIR "${CLP_FFI_PY_SRC_DIR}/clp/components/core")
5959

60-
add_subdirectory(${CLP_CORE_ROOT}/src/clp/string_utils)
60+
add_subdirectory(${CLP_FFI_PY_CLP_CORE_DIR}/src/clp/string_utils)
6161

6262
# NOTE: We don't add headers here since CLP core is technically a library we're using, not a part of
6363
# this project.
6464
set(CLP_FFI_PY_CLP_CORE_SOURCES
65-
${CLP_CORE_ROOT}/src/clp/BufferReader.cpp
66-
${CLP_CORE_ROOT}/src/clp/ffi/ir_stream/decoding_methods.cpp
67-
${CLP_CORE_ROOT}/src/clp/ffi/ir_stream/encoding_methods.cpp
68-
${CLP_CORE_ROOT}/src/clp/ffi/ir_stream/utils.cpp
69-
${CLP_CORE_ROOT}/src/clp/ffi/encoding_methods.cpp
70-
${CLP_CORE_ROOT}/src/clp/ir/parsing.cpp
71-
${CLP_CORE_ROOT}/src/clp/ReaderInterface.cpp
65+
${CLP_FFI_PY_CLP_CORE_DIR}/src/clp/BufferReader.cpp
66+
${CLP_FFI_PY_CLP_CORE_DIR}/src/clp/ffi/ir_stream/decoding_methods.cpp
67+
${CLP_FFI_PY_CLP_CORE_DIR}/src/clp/ffi/ir_stream/encoding_methods.cpp
68+
${CLP_FFI_PY_CLP_CORE_DIR}/src/clp/ffi/ir_stream/utils.cpp
69+
${CLP_FFI_PY_CLP_CORE_DIR}/src/clp/ffi/encoding_methods.cpp
70+
${CLP_FFI_PY_CLP_CORE_DIR}/src/clp/ir/parsing.cpp
71+
${CLP_FFI_PY_CLP_CORE_DIR}/src/clp/ReaderInterface.cpp
7272
)
7373

7474
# NOTE: We include headers to ensure IDEs like CLion load the project properly.
@@ -119,8 +119,8 @@ target_include_directories(
119119
${CLP_FFI_PY_LIB_IR}
120120
SYSTEM
121121
PRIVATE
122-
${CLP_CORE_ROOT}/src
123-
${CLP_CORE_ROOT}/submodules
122+
${CLP_FFI_PY_CLP_CORE_DIR}/src
123+
${CLP_FFI_PY_CLP_CORE_DIR}/submodules
124124
)
125125

126126
target_include_directories(${CLP_FFI_PY_LIB_IR} PRIVATE ${CLP_FFI_PY_SRC_DIR})

pyproject.toml

-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ logging.level = "INFO"
101101
# distribution. This list is to explicitly exclude files not specified in `.gitignore`.
102102
sdist.exclude = [
103103
".*",
104-
"cmake-build-*",
105104
"docs",
106105
"Taskfile.yml",
107106
]

0 commit comments

Comments
 (0)