From fcbb1bbecdab726db84c2738551f761f5e4c719b Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 30 Sep 2022 13:52:33 +0200 Subject: [PATCH] bos #32376: LIBBATCH and spns #32364: PlaneGCS 0.20 --- products/patches/planegcs-0.20.p01.patch | 37 ++++++++++++++++++++++++ products/patches/planegcs-0.20.p02.patch | 11 +++++++ 2 files changed, 48 insertions(+) create mode 100644 products/patches/planegcs-0.20.p01.patch create mode 100644 products/patches/planegcs-0.20.p02.patch diff --git a/products/patches/planegcs-0.20.p01.patch b/products/patches/planegcs-0.20.p01.patch new file mode 100644 index 0000000..33ccd02 --- /dev/null +++ b/products/patches/planegcs-0.20.p01.patch @@ -0,0 +1,37 @@ +--- planegcs-0.20_ref/CMakeLists.txt 2022-09-30 13:30:12.273508312 +0200 ++++ planegcs-0.20_dev/CMakeLists.txt 2022-09-30 13:31:31.379222453 +0200 +@@ -35,15 +35,18 @@ + + + # -------------------------------- Boost -------------------------------- +- +-set(Boost_INCLUDE_DIR "${Boost_DIR}/include/boost-1_67" CACHE PATH "" FORCE) +-set(Boost_LIBRARY_DIR "${Boost_DIR}/lib" CACHE PATH "" FORCE) ++file(TO_CMAKE_PATH "$ENV{BOOST_ROOT_DIR}" BOOST_ROOT_DIR) ++if(EXISTS "${BOOST_ROOT_DIR}") ++ set(BOOST_ROOT "${BOOST_ROOT_DIR}" CACHE PATH "Boost root directory" FORCE) ++endif() ++#set(Boost_INCLUDE_DIR "${Boost_DIR}/include/boost-1_67" CACHE PATH "" FORCE) ++#set(Boost_LIBRARY_DIR "${Boost_DIR}/lib" CACHE PATH "" FORCE) + #set(Boost_GRAPH_LIBRARY_DEBUG "${Boost_LIBRARY_DIR}/boost_graph-vc120-mt-gd-x64-1_66.lib" CACHE FILEPATH "" FORCE) + #set(Boost_GRAPH_LIBRARY_RELEASE "${Boost_LIBRARY_DIR}/boost_graph-vc140-mt-x64-1_66.lib" CACHE FILEPATH "" FORCE) + set(Boost_USE_DEBUG_LIBS OFF) # ignore debug libs and + set(Boost_USE_RELEASE_LIBS ON) # only find release libs + +-find_package(Boost 1.67 REQUIRED COMPONENTS graph) ++find_package(Boost COMPONENTS REQUIRED COMPONENTS graph) + + if(NOT Boost_FOUND) + message(FATAL_ERROR "========================================\n" +@@ -54,8 +57,9 @@ + + # -------------------------------- Eigen -------------------------------- + +-#FILE(TO_CMAKE_PATH "$ENV{EIGEN_ROOT_DIR}" EIGEN_ROOT_DIR) +-set(EIGEN3_INCLUDE_DIR "${Eigen3_DIR}/include/eigen3") ++FILE(TO_CMAKE_PATH "$ENV{EIGEN_ROOT_DIR}" EIGEN_ROOT_DIR) ++set(EIGEN3_INCLUDE_DIR "${EIGEN_ROOT_DIR}/include/eigen3") ++MESSAGE("EIGEN3_INCLUDE_DIR: " ${EIGEN3_INCLUDE_DIR}) + find_package(Eigen3 3.3.4 REQUIRED) + if(NOT EIGEN3_FOUND) + message("====================\n" diff --git a/products/patches/planegcs-0.20.p02.patch b/products/patches/planegcs-0.20.p02.patch new file mode 100644 index 0000000..66c170d --- /dev/null +++ b/products/patches/planegcs-0.20.p02.patch @@ -0,0 +1,11 @@ +--- planegcs-0.20_ref/planegcs/GCS.cpp 2022-09-30 13:30:52.206867543 +0200 ++++ planegcs-0.20_dev/planegcs/GCS.cpp 2022-09-30 13:31:35.938263775 +0200 +@@ -95,7 +95,7 @@ + #define CASE_NOT_IMP(X) case X: { subsystemfile << "//" #X "not yet implemented" << std::endl; break; } + #endif + +-#include ++//#include + #ifdef _GCS_USE_STL_OUTPUT + #include + #else -- 2.39.2