Porting to CMake: some corrections.

diff --git a/adm_local/cmake_files/FindCALCULATOR.cmake b/adm_local/cmake_files/FindCALCULATOR.cmake
index 85a2698ea3ec679c566414fe268118f14a9e7f1c..7b2ae74cc06e110d7dc29856564115ab46cb3ff3 100644 (file)
--- a/adm_local/cmake_files/FindCALCULATOR.cmake
+++ b/adm_local/cmake_files/FindCALCULATOR.cmake
@@ -19,7 +19,8 @@
 #
 
 
-SET(CALCULATOR_CXXFLAGS ${CALCULATOR_ROOT_DIR}/include/salome)
+SET(CALCULATOR_CXXFLAGS -I${CALCULATOR_ROOT_DIR}/include/salome) # to be removed
+SET(CALCULATOR_INCLUDE_DIRS ${CALCULATOR_ROOT_DIR}/include/salome)
 
-FIND_LIBRARY(CALCULATOREngine CALCULATOREngine ${CALCULATOR_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(SalomeIDLCALCULATOR SalomeIDLCALCULATOR ${CALCULATOR_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(CALCULATOR_CALCULATOREngine CALCULATOREngine ${CALCULATOR_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(CALCULATOR_SalomeIDLCALCULATOR SalomeIDLCALCULATOR ${CALCULATOR_ROOT_DIR}/lib/salome)