From 6e97e0bbfa5b7ebdecf0dc424f487db9193fd151 Mon Sep 17 00:00:00 2001 From: Jaewook Lee Date: Fri, 26 Jul 2024 17:24:25 +0200 Subject: [PATCH] fix typos and add src/python --- CMakeLists.txt | 20 ++++---------------- src/python/CMakeLists.txt | 8 ++++---- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ca8559..535c1fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,9 +9,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) endif() # options -option(BUILD_EXAMPLES "build examples" ON) -option(BUILD_FORTRAN_MODULE "build fortran module" ON) -option(SPLINEPY_EXT "add splinepy extension" ON) +option(NAPF_BUILD_PYTHON "build python module" ON) # config set(exe_dest "bin") @@ -49,19 +47,9 @@ else() endif() target_compile_features(napf INTERFACE cxx_std_11) -if(BUILD_FORTRAN_MODULE) - message("*** building additional fortran module ***") - message("*** ------ NOT IMPLEMENTED ----------- ***") -endif(BUILD_FORTRAN_MODULE) - -if(BUILD_EXAMPLES) - message("*** building examples ***") - message("*** ------ NOT IMPLEMENTED ----------- ***") -endif(BUILD_EXAMPLES) - -if(SPLINEPY_EXT) - target_compile_definitions(napf INTERFACE -DSPLINEPYEXT) -endif(SPLINEPY_EXT) +if(NAPF_BUILD_PYTHON) + add_subdirectory(src/python) +endif() # configure config files include(CMakePackageConfigHelpers) diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index a2aa959..bbdf10d 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -7,12 +7,12 @@ find_package(Python REQUIRED COMPONENTS Interpreter Development.Module) find_package(pybind11 CONFIG REQUIRED) python_add_library(_napf MODULE ${NAPF_SOURCES}) -target_link_libraries(_napf PRIVATE pybind11::headers) -target_compile_definitions(_napf PRIVATE $<$>:NDEBUG) +target_link_libraries(_napf PRIVATE pybind11::headers napf) +target_compile_definitions(_napf PRIVATE $<$>:NDEBUG>) if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - target_compile_options(funi PRIVATE $<$>:-O3>) + target_compile_options(_napf PRIVATE $<$>:-O3>) elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSCV") - target_compile_options(funi PRIVATE $<$>:/O2>) + target_compile_options(_napf PRIVATE $<$>:/O2>) endif() install(