X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FControls%2FCMakeLists.txt;h=8f48ab1f2db96b41649d928b92657f786378e686;hb=f0354b9d849838668be5de74ee19014b1290e3e9;hp=be31cb1048e20f959633c1dc9b5339ebd5d43d34;hpb=7a65c9fad427b1ccba6b9ccae612296e5092a324;p=modules%2Fsmesh.git diff --git a/src/Controls/CMakeLists.txt b/src/Controls/CMakeLists.txt index be31cb104..8f48ab1f2 100644 --- a/src/Controls/CMakeLists.txt +++ b/src/Controls/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,7 +20,7 @@ # --- options --- # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} @@ -31,19 +31,16 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES ${VTK_LIBRARIES} - ${CAS_TKernel} - ${CAS_TKBRep} - ${CAS_TKG3d} - ${CAS_TKTopAlgo} - ${CAS_TKGeomBase} - ${CAS_TKGeomAlgo} + ${OpenCASCADE_FoundationClasses_LIBRARIES} + ${OpenCASCADE_ModelingData_LIBRARIES} + ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} SMDS SMESHDS SMESHUtils