Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handlling Python scripts without execution permissions
[modules/gui.git]
/
idl
/
CMakeLists.txt
diff --git
a/idl/CMakeLists.txt
b/idl/CMakeLists.txt
index 7d2a1ccee12508ed83dc14594d789b14569d3994..38bd0204e3986d9f942ec694b77dcb2ab6e04bdc 100755
(executable)
--- a/
idl/CMakeLists.txt
+++ b/
idl/CMakeLists.txt
@@
-22,26
+22,20
@@
INCLUDE(UseOmniORB) # Provided by KERNEL
INCLUDE_DIRECTORIES(
${OMNIORB_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS}
INCLUDE_DIRECTORIES(
${OMNIORB_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS}
- ${CMAKE_CURRENT_BINARY_DIR}
)
SET(SalomeIDLGUI_IDLSOURCES
SalomeApp_Engine.idl
)
)
SET(SalomeIDLGUI_IDLSOURCES
SalomeApp_Engine.idl
)
-SET(
IDL_INCLUDE_DIRS
+SET(
_idl_include_dirs
${CMAKE_CURRENT_SOURCE_DIR}
${KERNEL_ROOT_DIR}/idl/salome
)
${CMAKE_CURRENT_SOURCE_DIR}
${KERNEL_ROOT_DIR}/idl/salome
)
-SET(TYPE SHARED)
-IF(WINDOWS)
- SET(TYPE STATIC)
-ENDIF(WINDOWS)
-
-ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
+SET(_idl_link_flags
+ ${KERNEL_SalomeIDLKernel}
+)
-OMNIORB_ADD_MODULE(SalomeIDLGUI "${SalomeIDLGUI_IDLSOURCES}" "${IDL_INCLUDE_DIRS}" ${TYPE})
-TARGET_LINK_LIBRARIES(SalomeIDLGUI ${CORBA_LIBS})
-
+OMNIORB_ADD_MODULE(SalomeIDLGUI "${SalomeIDLGUI_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}")
INSTALL(TARGETS SalomeIDLGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(TARGETS SalomeIDLGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})