Merge branch 'update/cmake' into 'develop'

Updating tools cmake for Windows

See merge request njoy/tools!23

Author: whaeck

CMakeLists.txt

@@ -31,7 +31,6 @@ cmake_dependent_option(
   "BUILD_TESTING AND NOT ${subproject}" OFF
 )
 
-
 cmake_dependent_option(
   tools.python
   "Build tools python bindings" ON
@@ -56,11 +55,6 @@ string( CONCAT prefix
   "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
 )
 
-string( CONCAT prefix
-  "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src>"
-  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-)
-
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # tools : library
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

cmake/unit_testing_python.cmake

@@ -6,13 +6,16 @@ enable_testing()
 
 function( add_python_test name source )
 
+  set(PYTHONPATH_PARTS ${TOOLS_PYTHONPATH} $ENV{PYTHONPATH})
+  string( JOIN "${PATH_DELIM}" PYTHONPATH_VALUE ${PYTHONPATH_PARTS})
+
   set( test_name "tools.python.${name}.test" )
   add_test( NAME ${test_name}
             COMMAND ${PYTHON_EXECUTABLE} -m unittest -v test/${source}
             WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/python )
   set_tests_properties( ${test_name}
                         PROPERTIES ENVIRONMENT
-                        PYTHONPATH=${TOOLS_PYTHONPATH}:$ENV{PYTHONPATH})
+                        "PYTHONPATH=${PYTHONPATH_VALUE}")
 
 endfunction()
 

python/CMakeLists.txt

@@ -27,7 +27,14 @@ if(tools.python)
 
     message( STATUS "Building tools' python API" )
 
-    set( TOOLS_PYTHONPATH "${CMAKE_CURRENT_BINARY_DIR}" )
+    set( tools_PYTHONPATH "$<TARGET_FILE_DIR:njoy::tools.python>" )
+
+    # Windows and unix have different delimiter for paths
+    if (WIN32)
+	    set(PATH_DELIM "\;")
+    else()
+	    set(PATH_DELIM ":")
+    endif()
 
     if( tools.tests )
         include( ${PROJECT_SOURCE_DIR}/cmake/unit_testing_python.cmake )
@@ -36,6 +43,9 @@ if(tools.python)
     # generate python stubs if possible
     find_program(pybind11stubgen_exe pybind11-stubgen)
 
+    set(PYTHONPATH_PARTS ${tools_PYTHONPATH} $ENV{PYTHONPATH})
+    string( JOIN "${PATH_DELIM}" PYTHONPATH_VALUE ${PYTHONPATH_PARTS})
+
     set(stubdir "${CMAKE_CURRENT_SOURCE_DIR}/stubs/tools")
     if (pybind11stubgen_exe)
         # the following command executes the pybind11-stubgen executable found via find_program
@@ -45,7 +55,7 @@ if(tools.python)
         # If the stubs fail to generate then this command exits gracefully and allows the build to continue.
         add_custom_command(
             TARGET tools.python POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${tools_PYTHONPATH}:${tools_PYTHONPATH}:$ENV{PYTHONPATH} ${pybind11stubgen_exe} tools -o ${CMAKE_CURRENT_SOURCE_DIR}/stubs &> ${CMAKE_CURRENT_BINARY_DIR}/pybind11-stubgen.log || true
+            COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${PYTHONPATH_VALUE}" ${pybind11stubgen_exe} tools -o ${CMAKE_CURRENT_SOURCE_DIR}/stubs &> ${CMAKE_CURRENT_BINARY_DIR}/pybind11-stubgen.log || true
             COMMAND ${CMAKE_COMMAND} -E rename ${stubdir}/__init__.pyi ${stubdir}/tools.pyi &> /dev/null || true
             COMMAND ${CMAKE_COMMAND} -E copy_directory ${stubdir}/ ${CMAKE_CURRENT_BINARY_DIR}
             COMMENT "Building tools' python stub files via pybind11-stubgen. See pybind11-stubgen.log for details."