Salome HOME
merge from master
[tools/sat_salome.git] / products / patches / planegcs-0.20.p01.patch
1 --- planegcs-0.20_ref/CMakeLists.txt    2022-09-30 13:30:12.273508312 +0200
2 +++ planegcs-0.20_dev/CMakeLists.txt    2022-09-30 13:31:31.379222453 +0200
3 @@ -35,15 +35,18 @@
4  
5  
6  # -------------------------------- Boost --------------------------------
7 -
8 -set(Boost_INCLUDE_DIR "${Boost_DIR}/include/boost-1_67" CACHE PATH "" FORCE)
9 -set(Boost_LIBRARY_DIR "${Boost_DIR}/lib" CACHE PATH "" FORCE)
10 +file(TO_CMAKE_PATH "$ENV{BOOST_ROOT_DIR}" BOOST_ROOT_DIR)
11 +if(EXISTS "${BOOST_ROOT_DIR}")
12 +  set(BOOST_ROOT "${BOOST_ROOT_DIR}" CACHE PATH "Boost root directory" FORCE)
13 +endif()
14 +#set(Boost_INCLUDE_DIR "${Boost_DIR}/include/boost-1_67" CACHE PATH "" FORCE)
15 +#set(Boost_LIBRARY_DIR "${Boost_DIR}/lib" CACHE PATH "" FORCE)
16  #set(Boost_GRAPH_LIBRARY_DEBUG "${Boost_LIBRARY_DIR}/boost_graph-vc120-mt-gd-x64-1_66.lib" CACHE FILEPATH "" FORCE)
17  #set(Boost_GRAPH_LIBRARY_RELEASE "${Boost_LIBRARY_DIR}/boost_graph-vc140-mt-x64-1_66.lib" CACHE FILEPATH "" FORCE)
18  set(Boost_USE_DEBUG_LIBS   OFF) # ignore debug libs and
19  set(Boost_USE_RELEASE_LIBS ON)  # only find release libs
20  
21 -find_package(Boost 1.67 REQUIRED COMPONENTS graph)
22 +find_package(Boost COMPONENTS REQUIRED COMPONENTS graph)
23  
24  if(NOT Boost_FOUND)
25    message(FATAL_ERROR "========================================\n"
26 @@ -54,8 +57,9 @@
27  
28  # -------------------------------- Eigen --------------------------------
29  
30 -#FILE(TO_CMAKE_PATH "$ENV{EIGEN_ROOT_DIR}" EIGEN_ROOT_DIR)
31 -set(EIGEN3_INCLUDE_DIR "${Eigen3_DIR}/include/eigen3")
32 +FILE(TO_CMAKE_PATH "$ENV{EIGEN_ROOT_DIR}" EIGEN_ROOT_DIR)
33 +set(EIGEN3_INCLUDE_DIR "${EIGEN_ROOT_DIR}/include/eigen3")
34 +MESSAGE("EIGEN3_INCLUDE_DIR: " ${EIGEN3_INCLUDE_DIR})
35  find_package(Eigen3 3.3.4 REQUIRED)
36  if(NOT EIGEN3_FOUND)
37    message("====================\n"