Use DXF_ROOT_DIR to detect DXF library

diff --git a/CMakeCommon/FindDXF.cmake b/CMakeCommon/FindDXF.cmake
index 71c7c97081e1aab0829542b60dcbd751f701a73f..9fea86aa567bda9ddc0cabac0f04ed5e43bedec4 100644 (file)
--- a/CMakeCommon/FindDXF.cmake
+++ b/CMakeCommon/FindDXF.cmake
@@ -14,7 +14,7 @@
 #
 
 #path to DXF component dir
-set(DXF_DIR "D:/C/SALOME-master/W64/DXF")
+SET(DXF_DIR $ENV{DXF_ROOT_DIR})
 
 if(EXISTS ${DXF_DIR})
   set(CMAKE_PREFIX_PATH ${DXF_DIR}/cmake ${CMAKE_PREFIX_PATH})

diff --git a/src/DXFPlugin/CMakeLists.txt b/src/DXFPlugin/CMakeLists.txt
index 94e8463838ffcba2cf83c3e3cb46675e4fcc0ad8..6d23d998d10a2a973e8c7d2f00bcef1f3c4168b8 100644 (file)
--- a/src/DXFPlugin/CMakeLists.txt
+++ b/src/DXFPlugin/CMakeLists.txt
@@ -40,7 +40,7 @@ SET(XML_RESOURCES
     plugin-DXF.xml
 )
 
-MESSAGE(STATUS "${DXF_DIR} CHHHHHEEE")
+MESSAGE(STATUS "DXF component found: ${DXF_DIR}")
 INCLUDE_DIRECTORIES(
     ../Config
     ../Events
@@ -53,9 +53,7 @@ INCLUDE_DIRECTORIES(
     ../SketchAPI
     ../SketchPlugin
     ${OpenCASCADE_INCLUDE_DIR}
-    #${PRODUCTS_INCLUDE_DIR}
-    #${DXF_DIR}/include/products
-    D:/C/SALOME-master/W64/DXF/inc
+    ${DXF_DIR}/include/products
 )
 
 SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES})
@@ -66,12 +64,11 @@ SET(PROJECT_LIBRARIES
     GeomAPI
     GeomAlgoAPI
     Locale
-    #${DXF_DIR}/lib
-    D:/C/SALOME-master/W64/DXF/win64/vc14/lib/TKXSDRAWDXF.lib
-    D:/C/SALOME-master/W64/DXF/win64/vc14/lib/TKXDEDXF.lib
-    D:/C/SALOME-master/W64/DXF/win64/vc14/lib/TKDXF.lib
-    D:/C/SALOME-master/W64/DXF/win64/vc14/lib/TKXDEACIS.lib
-    D:/C/SALOME-master/W64/DXF/win64/vc14/lib/TKACIS.lib
+    ${DXF_DIR}/lib/libTKXSDRAWDXF.so
+    ${DXF_DIR}/lib/libTKXDEDXF.so
+    ${DXF_DIR}/lib/libTKDXF.so
+    ${DXF_DIR}/lib/libTKXDEACIS.so
+    ${DXF_DIR}/lib/libTKACIS.so
 )
 
 ADD_DEFINITIONS(-DDXFPLUGIN_EXPORTS)