Skip to content

Commit ad392ee

Browse files
committed
[dev] Improve cmake-based builds
1 parent b6e2775 commit ad392ee

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

examples/simple-embedding/src/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ project(monilog CXX)
1111
set(CMAKE_VERBOSE_MAKEFILE FALSE)
1212
set(PYBIND11_PYTHON_VERSION 3.8)
1313

14-
find_package(pybind11 REQUIRED)
1514
find_package(Python COMPONENTS Interpreter Development REQUIRED)
15+
set(pybind11_DIR "${Python_SITELIB}/pybind11/share/cmake/pybind11")
16+
find_package(pybind11 REQUIRED)
1617
include_directories(${pybind11_INCLUDE_DIRS} ${Python_SITELIB}/monilog/include)
1718

1819
# EXECUTABLE simpleembedding

src/CMakeLists.txt

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,16 @@ set(CMAKE_CXX_FLAGS "-Wall -Wextra -O3")
1111
project(monilog CXX)
1212
set(CMAKE_VERBOSE_MAKEFILE TRUE)
1313

14-
# CHECK CXX VERSION: must be done after the project() (CMAKE_CXX_COMPILER_ID not defined before)
15-
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
16-
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.1.0")
17-
message(FATAL_ERROR "GCC minimum required version is 9.1.0. Please upgrade.")
18-
endif()
19-
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
20-
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.0.0")
21-
message(FATAL_ERROR "Clang minimum required version is 9.0.0. Please upgrade.")
22-
endif()
23-
endif()
24-
2514
set(PYBIND11_PYTHON_VERSION 3.8)
15+
find_package(Python COMPONENTS Interpreter Development REQUIRED)
16+
set(pybind11_DIR "${Python_SITELIB}/pybind11/share/cmake/pybind11")
2617
find_package(pybind11 REQUIRED)
2718
include_directories(${pybind11_INCLUDE_DIRS} monilog/include)
2819

2920
add_library(monilog SHARED MoniLog.cc)
3021
target_link_libraries(monilog ${PYTHON_LIBRARIES} pybind11::embed)
3122

23+
3224
# Python extension
3325
pybind11_add_module(_monilog monilog_module.cc)
3426
set_target_properties(_monilog PROPERTIES

0 commit comments

Comments
 (0)