Merge from V6_main 11/02/2013

[modules/kernel.git] / src / UnitTests / CMakeLists.txt

diff --git a/src/UnitTests/CMakeLists.txt b/src/UnitTests/CMakeLists.txt
index 11545cfff63aec6a81cf382cb1636545931e1a55..bc824a803686b2276d7f33458515885f0a84d1f3 100755 (executable)
--- a/src/UnitTests/CMakeLists.txt
+++ b/src/UnitTests/CMakeLists.txt
@@ -18,7 +18,6 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIRS}
   ${CPPUNIT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
@@ -38,7 +37,8 @@ SALOME_INSTALL_SCRIPTS(UnitTests.py ${KERNEL_salomescript_SCRIPTS})
 # Executables targets
 # ===============================================================
 
-SET(COMMON_FLAGS "${CPPUNIT_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
+ADD_DEFINITIONS(${CPPUNIT_DEFINITIONS})
+
 SET(COMMON_LIBS
   ${CPPUNIT_LIBS}
   SALOMEBasics
@@ -46,9 +46,9 @@ SET(COMMON_LIBS
   SALOMELocalTraceTest
 )
 
-IF(CORBA_GEN)
+IF(SALOME_USE_CORBA)
   INCLUDE_DIRECTORIES(
-    ${OMNIORB_INCLUDE_DIRS}
+    ${OMNIORB_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMETraceCollector
     ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMETraceCollector/Test
     ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService
@@ -66,7 +66,7 @@ IF(CORBA_GEN)
     ${CMAKE_CURRENT_SOURCE_DIR}/../Notification
     ${CMAKE_CURRENT_SOURCE_DIR}/../ResourcesManager
   )
-  SET(COMMON_FLAGS "${COMMON_FLAGS} -DWITH_CORBA ${OMNIORB_DEFINITIONS}")
+  ADD_DEFINITIONS(-DWITH_CORBA ${OMNIORB_DEFINITIONS})
 
   SET(COMMON_LIBS
     ${COMMON_LIBS}
@@ -86,11 +86,10 @@ IF(CORBA_GEN)
     SalomeDS
     SALOMEDSTest
     SalomeIDLKernel
-    ${OMNIORB_LIBS}
+    ${OMNIORB_LIBRARIES}
   )
-ENDIF(CORBA_GEN)
+ENDIF(SALOME_USE_CORBA)
 
 ADD_EXECUTABLE(UnitTests UnitTests.cxx)
-SET_TARGET_PROPERTIES(UnitTests PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
 TARGET_LINK_LIBRARIES(UnitTests ${COMMON_LIBS})
 INSTALL(TARGETS UnitTests DESTINATION ${KERNEL_salomebin_BINS})