diff --git a/ci.nix b/ci.nix index 027336ed..be5bc4f1 100644 --- a/ci.nix +++ b/ci.nix @@ -59,6 +59,8 @@ in xo-pyreactor xo-websock xo-pywebsock + xo-process + xo-pyprocess xo-userenv ; } diff --git a/shells.nix b/shells.nix index 361be73b..d13a5289 100644 --- a/shells.nix +++ b/shells.nix @@ -367,13 +367,13 @@ in pyreactor = pkgs.xo-pyreactor; websock = pkgs.xo-websock; pywebsock = pkgs.xo-pywebsock; + process = pkgs.xo-process; + pyprocess = pkgs.xo-pyprocess; statistics = pkgs.xo-statistics; distribution = pkgs.xo-distribution; pydistribution = pkgs.xo-pydistribution; simulator = pkgs.xo-simulator; pysimulator = pkgs.xo-pysimulator; - process = pkgs.xo-process; - pyprocess = pkgs.xo-pyprocess; kalmanfilter = pkgs.xo-kalmanfilter; pykalmanfilter = pkgs.xo-pykalmanfilter; }; diff --git a/xo-process/cmake/xo-bootstrap-macros.cmake b/xo-process/cmake/xo-bootstrap-macros.cmake index aba31169..592272c0 100644 --- a/xo-process/cmake/xo-bootstrap-macros.cmake +++ b/xo-process/cmake/xo-bootstrap-macros.cmake @@ -19,7 +19,13 @@ endif() message(STATUS "XO_CMAKE_CONFIG_EXECUTABLE=${XO_CMAKE_CONFIG_EXECUTABLE}") -if (NOT XO_SUBMODULE_BUILD) +if (XO_SUBMODULE_BUILD) + if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix)) + # local version of xo-cmake macros + set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/xo-cmake/cmake") + message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}") + endif() +else() if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix)) # default to typical install location for xo-project-macros execute_process(COMMAND ${XO_CMAKE_CONFIG_EXECUTABLE} --cmake-module-path OUTPUT_VARIABLE CMAKE_MODULE_PATH) diff --git a/xo-pyprocess/cmake/xo-bootstrap-macros.cmake b/xo-pyprocess/cmake/xo-bootstrap-macros.cmake index aba31169..592272c0 100644 --- a/xo-pyprocess/cmake/xo-bootstrap-macros.cmake +++ b/xo-pyprocess/cmake/xo-bootstrap-macros.cmake @@ -19,7 +19,13 @@ endif() message(STATUS "XO_CMAKE_CONFIG_EXECUTABLE=${XO_CMAKE_CONFIG_EXECUTABLE}") -if (NOT XO_SUBMODULE_BUILD) +if (XO_SUBMODULE_BUILD) + if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix)) + # local version of xo-cmake macros + set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/xo-cmake/cmake") + message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}") + endif() +else() if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix)) # default to typical install location for xo-project-macros execute_process(COMMAND ${XO_CMAKE_CONFIG_EXECUTABLE} --cmake-module-path OUTPUT_VARIABLE CMAKE_MODULE_PATH) diff --git a/xo.nix b/xo.nix index bbd1a271..08f18841 100644 --- a/xo.nix +++ b/xo.nix @@ -72,13 +72,13 @@ let xo-pyreactor = callPackage pkgs/xo-pyreactor.nix { stdenv = jitStdenv; }; xo-websock = callPackage pkgs/xo-websock.nix { stdenv = jitStdenv; }; xo-pywebsock = callPackage pkgs/xo-pywebsock.nix { stdenv = jitStdenv; }; + xo-process = callPackage pkgs/xo-process.nix { stdenv = jitStdenv; }; + xo-pyprocess = callPackage pkgs/xo-pyprocess.nix { stdenv = jitStdenv; }; xo-statistics = callPackage pkgs/xo-statistics.nix {}; xo-distribution = callPackage pkgs/xo-distribution.nix {}; xo-pydistribution = callPackage pkgs/xo-pydistribution.nix {}; xo-simulator = callPackage pkgs/xo-simulator.nix {}; xo-pysimulator = callPackage pkgs/xo-pysimulator.nix {}; - xo-process = callPackage pkgs/xo-process.nix {}; - xo-pyprocess = callPackage pkgs/xo-pyprocess.nix {}; xo-kalmanfilter = callPackage pkgs/xo-kalmanfilter.nix {}; xo-pykalmanfilter = callPackage pkgs/xo-pykalmanfilter.nix {}; xo-userenv = callPackage pkgs/xo-userenv.nix {};