From edbd823cc97209c4836465b49d7ec53edd3e3fb9 Mon Sep 17 00:00:00 2001 From: inv Date: Thu, 17 Oct 2013 17:11:01 +0000 Subject: [PATCH] Synchronize adm files --- .../cmake_files/FindGraphviz.cmake | 18 ++++++++++++++++-- .../cmake_files/FindSalomeBoost.cmake | 4 ++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/adm_local_without_kernel/cmake_files/FindGraphviz.cmake b/adm_local_without_kernel/cmake_files/FindGraphviz.cmake index b62d7d815..625a0f9a2 100644 --- a/adm_local_without_kernel/cmake_files/FindGraphviz.cmake +++ b/adm_local_without_kernel/cmake_files/FindGraphviz.cmake @@ -34,8 +34,22 @@ FIND_PROGRAM(GRAPHVIZ_EXECUTABLE dot) FIND_PATH(GRAPHVIZ_INCLUDE_DIR NAMES graphviz/graph.h) SET(GRAPHVIZ_INCLUDE_DIR ${GRAPHVIZ_INCLUDE_DIR}/graphviz) -FIND_LIBRARY(GRAPHVIZ_graph_LIBRARY NAMES graph) -SET(GRAPHVIZ_LIBRARIES ${GRAPHVIZ_graph_LIBRARY}) +FIND_LIBRARY(GRAPHVIZ_cdt_LIBRARY NAMES cdt) +FIND_LIBRARY(GRAPHVIZ_cgraph_LIBRARY NAMES cgraph) +FIND_LIBRARY(GRAPHVIZ_graph_LIBRARY NAMES graph) +FIND_LIBRARY(GRAPHVIZ_gvc_LIBRARY NAMES gvc) +FIND_LIBRARY(GRAPHVIZ_gvpr_LIBRARY NAMES gvpr) +FIND_LIBRARY(GRAPHVIZ_pathplan_LIBRARY NAMES pathplan) +FIND_LIBRARY(GRAPHVIZ_xdot_LIBRARY NAMES xdot) +SET(GRAPHVIZ_LIBRARIES + ${GRAPHVIZ_cdt_LIBRARY} + ${GRAPHVIZ_cgraph_LIBRARY} + ${GRAPHVIZ_graph_LIBRARY} + ${GRAPHVIZ_gvc_LIBRARY} + ${GRAPHVIZ_gvpr_LIBRARY} + ${GRAPHVIZ_pathplan_LIBRARY} + ${GRAPHVIZ_xdot_LIBRARY} + ) # Handle the standard arguments of the find_package() command: INCLUDE(FindPackageHandleStandardArgs) diff --git a/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake b/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake index f93a88afa..5deff116d 100644 --- a/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake +++ b/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake @@ -27,7 +27,7 @@ SET(Boost_USE_STATIC_LIBS OFF) SET(Boost_USE_MULTITHREADED ON) SET(Boost_USE_STATIC_RUNTIME OFF) SET(Boost_NO_BOOST_CMAKE ON) -SET(SalomeBoost_FIND_COMPONENTS filesystem regex signals system thread) +SET(SalomeBoost_FIND_COMPONENTS filesystem regex signals system thread date_time chrono) IF(WIN32) # Under windows, one extra sub-directory in the boost installation hierarchy: @@ -42,7 +42,7 @@ ENDIF() ## Specific definitions: IF(WIN32) - SET(BOOST_DEFINITIONS -DBOOST_DISABLE_ASSERTS) + SET(BOOST_DEFINITIONS -DBOOST_DISABLE_ASSERTS -DBOOST_ALL_DYN_LINK) ENDIF() SALOME_ACCUMULATE_HEADERS(Boost_INCLUDE_DIRS) -- 2.39.2