X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGenericObj%2FCMakeLists.txt;h=2ca916026e79179743f3855bad44479031d41eba;hb=910e1b8c12ac2978e64847e9694b080c8381bc60;hp=203be8e0490ff9c73ac7ae04852d2fcf17cd2d1d;hpb=d9904f7ff3e87d82347311c61b53d3127f587fe0;p=modules%2Fkernel.git

diff --git a/src/GenericObj/CMakeLists.txt b/src/GenericObj/CMakeLists.txt
index 203be8e04..2ca916026 100755
--- a/src/GenericObj/CMakeLists.txt
+++ b/src/GenericObj/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012  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
 # 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
@@ -18,18 +18,18 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDE_DIRS}
-  ${PTHREAD_INCLUDE_DIRS}
-  ${CMAKE_BINARY_DIR}/salome_adm
+  ${OMNIORB_INCLUDE_DIR}
+  ${PTHREAD_INCLUDE_DIR}
+  ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
-  ${CMAKE_BINARY_DIR}/idl
+  ${PROJECT_BINARY_DIR}/idl
 )
 
-ADD_LIBRARY(SalomeGenericObj SHARED SALOME_GenericObj_i.cc)
-SET_TARGET_PROPERTIES(SalomeGenericObj PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
+ADD_LIBRARY(SalomeGenericObj SALOME_GenericObj_i.cc)
 TARGET_LINK_LIBRARIES(SalomeGenericObj SALOMELocalTrace SalomeIDLKernel)
-INSTALL(TARGETS SalomeGenericObj DESTINATION ${KERNEL_salomelib_LIBS})
+INSTALL(TARGETS SalomeGenericObj EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-INSTALL(FILES SALOME_GenericObj_i.hh DESTINATION ${KERNEL_salomeinclude_HEADERS})
+INSTALL(FILES SALOME_GenericObj_i.hh SALOME_GenericObj_wrap.hxx DESTINATION ${SALOME_INSTALL_HEADERS})