2.1.98

MyxCMake/lib/AddObjectLibrary.cmake

@@ -31,15 +31,11 @@ function(myx_add_object_library TARGET_NAME)
     set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_DIR_BACKPORT})
   endif()
 
-  set(options SAPR)
+  set(options)
   set(oneValueArgs OUTPUT_NAME EXPORT_FILE_NAME EXPORT_BASE_NAME)
   set(multiValueArgs)
   cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-  if(ENABLE_SAPR)
-    set(ARG_SAPR ON)
-  endif()
-
   if(NOT ARG_OUTPUT_NAME)
     set(ARG_OUTPUT_NAME ${TARGET_NAME})
   endif()
@@ -68,7 +64,7 @@ function(myx_add_object_library TARGET_NAME)
       $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
   )
 
-  if(ARG_SAPR)
+  if(ENABLE_SAPR_BLOCK_MODE)
     target_compile_definitions(${TARGET_NAME} PUBLIC BLOCK_TARGET_MARK)
     if(DEFINED ENV{SAPR_PREFIX})
       if(NOT WIN32)
@@ -76,7 +72,7 @@ function(myx_add_object_library TARGET_NAME)
       endif()
       return()
     else()
-      find_package(Python COMPONENTS Interpeter Development)
+      find_package(Python COMPONENTS Interpreter Development)
       find_package(pybind11 CONFIG)
       target_include_directories(${TARGET_NAME}
         PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/thirdparty/sapr>)