-# Copyright (C) 2012 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2015 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
# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
INCLUDE_DIRECTORIES(
- ${PTHREAD_INCLUDE_DIRS}
+ ${PTHREAD_INCLUDE_DIR}
${CPPUNIT_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
- ${CMAKE_BINARY_DIR}/salome_adm
+ ${PROJECT_BINARY_DIR}/salome_adm
${CMAKE_CURRENT_SOURCE_DIR}/../../NamingService
${CMAKE_CURRENT_SOURCE_DIR}/../../Basics
${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace
${CMAKE_CURRENT_SOURCE_DIR}/../../Utils
${CMAKE_CURRENT_SOURCE_DIR}/../../LifeCycleCORBA
- ${CMAKE_BINARY_DIR}/idl
+ ${PROJECT_BINARY_DIR}/idl
${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace/Test
${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMETraceCollector/Test
${CMAKE_CURRENT_SOURCE_DIR}/../../Utils/Test
# This local variable defines the list of dependant libraries common to all target in this package.
SET(COMMON_LIBS
- ${CPPUNIT_LIBS}
+ ${CPPUNIT_LIBRARIES}
SalomeNS
SalomeLifeCycleCORBA
${OMNIORB_LIBRARIES}
ADD_LIBRARY(NamingServiceTest NamingServiceTest.cxx)
TARGET_LINK_LIBRARIES(NamingServiceTest ${COMMON_LIBS})
-INSTALL(TARGETS NamingServiceTest DESTINATION ${KERNEL_salomelib_LIBS})
+INSTALL(TARGETS NamingServiceTest DESTINATION ${SALOME_INSTALL_LIBS})
SET(TestNamingService_LIBS
NamingServiceTest
ADD_EXECUTABLE(TestNamingService TestNamingService.cxx)
TARGET_LINK_LIBRARIES(TestNamingService ${TestNamingService_LIBS})
-INSTALL(TARGETS TestNamingService DESTINATION ${KERNEL_salomebin_BINS})
+INSTALL(TARGETS TestNamingService DESTINATION ${SALOME_INSTALL_BINS})
# Executable scripts to be installed
-SALOME_INSTALL_SCRIPTS(TestNamingService.py ${KERNEL_salomescript_PYTHON})
+SALOME_INSTALL_SCRIPTS(TestNamingService.py ${SALOME_INSTALL_SCRIPT_PYTHON})
FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
-INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${KERNEL_salomeinclude_HEADERS})
+INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})