Merge branch 'param' into iteration

Author: langmm

CMakeLists.txt

@@ -75,6 +75,7 @@ endif("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${PROJECT_SOURCE_DIR}/cmake")
 
 include(SearchTools)
+include(AddYggInterface)
 find_package_python(REQUIRED COMPONENTS Interpreter VERBOSE)
 
 option(BUILD_CXX "Build CXX library & executable." ON)
@@ -318,7 +319,6 @@ if(WITH_YGGDRASIL)
     if(YggInterface_FOUND)
         set(BUILD_WITH_YGGINTERFACE OFF)
     else()
-        include(AddYggInterface)
         set(YGGDRASIL_ARGS)
         set(SKBUILD_ISOLATED)
         if(SKBUILD)
@@ -349,14 +349,14 @@ if(WITH_YGGDRASIL)
             ${YGGDRASIL_ARGS}
           )
           transfer_interface_properties(
-            yggPhoto DEST_PREFIX ePhoto_
+            yggPhoto DEST_PREFIX ePhoto_ VERBOSE
             EXCLUDE_REGEX_LINK_LIBRARIES "Python::Python"
             DESTLIST_LINK_LIBRARIES ePhoto_PRIVATE_LIBRARIES_Python
             PROPERTIES SOURCES INCLUDE_DIRECTORIES COMPILE_OPTIONS
             LINK_LIBRARIES
           )
           transfer_interface_properties(
-            yggPhoto++ DEST_PREFIX ePhoto_
+            yggPhoto++ DEST_PREFIX ePhoto_ VERBOSE
             PROPERTIES SOURCES INCLUDE_DIRECTORIES COMPILE_OPTIONS
           )
           # TODO: Try building YggInterface::CXX in ePhotosynthesis?

cmake/AddYggInterface.cmake

@@ -653,6 +653,8 @@ function(add_yggdrasil_interfaces_backwards)
   find_package_python(COMPONENTS Interpreter NumPy Development)
   if(Python_FOUND)
     list(APPEND C_DEPENDENCIES Python)
+    list(APPEND C_INCLUDE_DIRECTORIES
+         ${Python_INCLUDE_DIRS} ${Python_NumPy_INCLUDE_DIRS})
     if(ARGS_EXCLUDE_PYTHON)
       list(APPEND C_PUBLIC_LIBRARIES Python::NumPy)
     else()
@@ -1057,6 +1059,12 @@ function(import_yggdrasil_interface_library LANGUAGE)
     INCLUDE_PREFIXES I
     REMOVE_PREFIX
   )
+  # sysconfig on newer versions includes relative paths
+  select_flags(
+    INCLUDE_DIRECTORIES FLAGS ${INCLUDE_DIRECTORIES}
+    INCLUDE_PREFIXES /
+    EXCLUDE_FLAG_CHAR
+  )
   select_flags(
     COMPILE_DEFINITIONS FLAGS ${YGG_CCFLAGS}
     INCLUDE_PREFIXES D
@@ -1074,11 +1082,19 @@ function(import_yggdrasil_interface_library LANGUAGE)
   )
   set(LINK_LIBRARIES)
   foreach(lib ${LINKED_LIBRARIES})
-    if((NOT lib MATCHES "^ygg")
-       AND (NOT (ARGS_EXCLUDE_PYTHONLIB AND (lib MATCHES "^python"))))
+    set(IDX_LIBRARY -1)
+    if(lib MATCHES "^ygg")
+      string(FIND ${LIBRARY_NAME} ${lib} IDX_LIBRARY)
+    endif()
+    if((IDX_LIBRARY EQUAL -1)
+        AND (NOT (ARGS_EXCLUDE_PYTHONLIB AND (lib MATCHES "^python"))))
       find_library(${lib} ${lib} HINTS ${LIBRARY_DIRECTORIES})
       if(${lib} STREQUAL "${lib}-NOTFOUND")
-        message(WARNING "Could not find yggdrasil dependency \"${lib}\"")
+        if(lib MATCHES "^ygg")
+          message(ERROR "Could not find yggdrasil dependency \"${lib}\"")
+        else()
+          message(WARNING "Could not find yggdrasil dependency \"${lib}\"")
+        endif()
       else()
         list(APPEND LINK_LIBRARIES ${${lib}})
       endif()
@@ -1146,18 +1162,29 @@ function(import_yggdrasil_interface_library LANGUAGE)
 endfunction()
 
 function(remove_flag_prefix FLAG PREFIX OUTPUT_VARIABLE)
-  string(REGEX REPLACE "^[\/\-]${PREFIX}" "" ${OUTPUT_VARIABLE} ${FLAG})
+  set(oneValueArgs PREFIX_REGEX)
+  cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+  if(NOT ARGS_PREFIX_REGEX)
+    set(ARGS_PREFIX_REGEX "^[\/\-]${PREFIX}")
+  endif()
+  string(REGEX REPLACE ${ARGS_PREFIX_REGEX} "" ${OUTPUT_VARIABLE} ${FLAG})
   set(${OUTPUT_VARIABLE} ${${OUTPUT_VARIABLE}} PARENT_SCOPE)
 endfunction()
 
 function(flag_matches FLAG PREFIX)
-    set(options REMOVE_PREFIX)
+    set(options REMOVE_PREFIX EXCLUDE_FLAG_CHAR)
     set(oneValueArgs OUTPUT_VARIABLE)
     cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    string(REGEX MATCH "^[\/\-]${PREFIX}" RESULT ${FLAG})
+    if(ARGS_EXCLUDE_FLAG_CHAR)
+      set(PREFIX_REGEX "^${PREFIX}")
+    else()
+      set(PREFIX_REGEX "^[\/\-]${PREFIX}")
+    endif()
+    string(REGEX MATCH ${PREFIX_REGEX} RESULT ${FLAG})
     if(ARGS_OUTPUT_VARIABLE)
       if(ARGS_REMOVE_PREFIX AND RESULT)
-        remove_flag_prefix(${FLAG} ${PREFIX} RESULT)
+        remove_flag_prefix(${FLAG} ${PREFIX} RESULT
+                           PREFIX_REGEX ${PREFIX_REGEX})
       endif()
       set(${ARGS_OUTPUT_VARIABLE} ${RESULT} PARENT_SCOPE)
     elseif(NOT RESULT)
@@ -1189,14 +1216,17 @@ function(find_flag OUTPUT_VARIABLE)
 endfunction()
 
 function(flag_matches_any FLAG)
-    set(options REMOVE_PREFIX)
+    set(options REMOVE_PREFIX EXCLUDE_FLAG_CHAR)
     set(oneValueArgs OUTPUT_VARIABLE)
     set(multiValueArgs PREFIXES)
     cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
     set(FLAG_ARGS)
     if(ARGS_REMOVE_PREFIX)
       list(APPEND FLAG_ARGS REMOVE_PREFIX)
     endif()
+    if(ARGS_EXCLUDE_FLAG_CHAR)
+      list(APPEND FLAG_ARGS EXCLUDE_FLAG_CHAR)
+    endif()
     foreach(prefix ${ARGS_PREFIXES})
       set(iRESULT)
       flag_matches(${FLAG} ${prefix} OUTPUT_VARIABLE iRESULT ${FLAG_ARGS})
@@ -1215,14 +1245,17 @@ function(flag_matches_any FLAG)
 endfunction()
 
 function(select_flags OUTPUT_VARIABLE)
-    set(options REMOVE_PREFIX)
+    set(options REMOVE_PREFIX EXCLUDE_FLAG_CHAR)
     set(multiValueArgs FLAGS INCLUDE_PREFIXES EXCLUDE_PREFIXES)
     cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
     set(${OUTPUT_VARIABLE})
     set(FLAG_ARGS)
     if(ARGS_REMOVE_PREFIX)
       list(APPEND FLAG_ARGS REMOVE_PREFIX)
     endif()
+    if(ARGS_EXCLUDE_FLAG_CHAR)
+      list(APPEND FLAG_ARGS EXCLUDE_FLAG_CHAR)
+    endif()
     foreach(flag ${ARGS_FLAGS})
       set(iINCLUDE)
       set(iEXCLUDE)

recipe/bld_cpp.bat

@@ -4,24 +4,17 @@ set CONFIGURATION=Release
 mkdir conda_build
 cd conda_build
 
-rem Call cmake
-rem -GNinja ^
-rem -D CMAKE_BUILD_TYPE=%CONFIGURATION% ^
-rem -D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
 cmake -G "Ninja" ^
       -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON ^
       -D WITH_YGGDRASIL:BOOL=ON ^
-      -D "Python_EXECUTABLE:FILEPATH=%PYTHON%" ..
+      -D "Python_EXECUTABLE:FILEPATH=%PYTHON%" ^
+      ..
 if errorlevel 1 exit 1
 
 rem Build all, run tests, then install
 cmake --build . --config %CONFIGURATION%
 cmake --install .
 
-rem Using ninja
-rem ninja all
-rem ninja install
-
 rem Run tests
 if errorlevel 1 exit 1
 ctest -C "%Configuration%" -V

recipe/build_cpp.sh

@@ -1,25 +1,20 @@
 #!/bin/sh
 set -euo pipefail
 
-# Using cmake
 if [ ! -d conda_build ]; then
     mkdir conda_build
 fi
 cd conda_build
-# -D CMAKE_BUILD_TYPE=Release \
-# -D CMAKE_INSTALL_PREFIX=$PREFIX \
 cmake ${CMAKE_ARGS} \
-    -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-    -D WITH_YGGDRASIL:BOOL=ON ..
+      -G "Ninja" \
+      -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+      -D WITH_YGGDRASIL:BOOL=ON \
+      ..
 
 # Build all, run tests, then install
 cmake --build . --config Release
 ctest -V
-cmake --install .
 
-# Make all, run tests, then install
-# make all VERBOSE=1
-# ctest -V
-# make install
+cmake --install .
 
 cd ..

recipe/conda_build_config.yaml

@@ -0,0 +1,7 @@
+c_stdlib:
+  - sysroot                     # [linux]
+  - macosx_deployment_target    # [osx]
+  - vs                          # [win]
+c_stdlib_version:
+  - 2.17                        # [linux]
+  - 11                          # [osx]

recipe/meta.yaml

@@ -31,15 +31,17 @@ outputs:
       license_file: LICENSE.md
     requirements:
       build:
-        - cmake
+        - cmake                                  # [build_platform != target_platform]
         - cross-python_{{ target_platform }}     # [build_platform != target_platform]
-        - make  # [unix]
-        - ninja  # [win]
+        - ninja                                  # [build_platform != target_platform]
         - python                                 # [build_platform != target_platform]
+        - {{ stdlib('c') }}
         - {{ compiler('c') }}
         - {{ compiler('cxx') }}
         - yggdrasil
       host:
+        - cmake
+        - ninja
         - python
         - sundials >=5.7.0
         - yggdrasil
@@ -70,19 +72,21 @@ outputs:
       license_file: LICENSE.md
     requirements:
       build:
-        - cmake
+        - cmake                                  # [build_platform != target_platform]
         - cross-python_{{ target_platform }}     # [build_platform != target_platform]
-        - make  # [unix]
-        - ninja  # [win]
+        - ninja                                  # [build_platform != target_platform]
         - python                                 # [build_platform != target_platform]
         - scikit-build-core
         - setuptools_scm
+        - {{ stdlib('c') }}
         - {{ compiler('c') }}
         - {{ compiler('cxx') }}
         - yggdrasil
       host:
+        - cmake
         - libboost-devel >=1.36.0
         - libboost-python-devel >=1.36.0
+        - ninja
         - python
         - scikit-build-core
         - setuptools_scm
@@ -96,7 +100,7 @@ outputs:
         - yggdrasil
     test:
       imports:
-        - pyPhotosynthesis
+        - ePhotosynthesis
 
 
 about: