Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WIN32 compilation of the SMESH module:
[modules/smesh.git]
/
src
/
StdMeshers_I
/
CMakeLists.txt
diff --git
a/src/StdMeshers_I/CMakeLists.txt
b/src/StdMeshers_I/CMakeLists.txt
index e1a00be7fc0c403696f116f5ae4aece7b2d33c9e..be2903f916235c82798f1df30befff7078c341e3 100644
(file)
--- a/
src/StdMeshers_I/CMakeLists.txt
+++ b/
src/StdMeshers_I/CMakeLists.txt
@@
-29,7
+29,6
@@
INCLUDE_DIRECTORIES(
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/src/SMESHImpl
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/src/SMESHImpl
- ${PROJECT_SOURCE_DIR}/src/MEFISTO2
${PROJECT_SOURCE_DIR}/src/SMESH
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMESH_I
${PROJECT_SOURCE_DIR}/src/SMESH
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMESH_I
@@
-40,6
+39,12
@@
INCLUDE_DIRECTORIES(
${PROJECT_BINARY_DIR}/idl
)
${PROJECT_BINARY_DIR}/idl
)
+IF(SALOME_SMESH_ENABLE_MEFISTO)
+ INCLUDE_DIRECTORIES(
+ ${PROJECT_SOURCE_DIR}/src/MEFISTO2
+ )
+ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
+
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${CAS_DEFINITIONS}
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${CAS_DEFINITIONS}
@@
-47,6
+52,11
@@
ADD_DEFINITIONS(
${OMNIORB_DEFINITIONS}
)
${OMNIORB_DEFINITIONS}
)
+# To avoid GetObject macro definition on WIN32
+IF(WIN32)
+ ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
+
# libraries to link to
SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace}
# libraries to link to
SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace}
@@
-79,7
+89,6
@@
SET(StdMeshersEngine_HEADERS
StdMeshers_NotConformAllowed_i.hxx
StdMeshers_Regular_1D_i.hxx
StdMeshers_Quadrangle_2D_i.hxx
StdMeshers_NotConformAllowed_i.hxx
StdMeshers_Regular_1D_i.hxx
StdMeshers_Quadrangle_2D_i.hxx
- StdMeshers_MEFISTO_2D_i.hxx
StdMeshers_Hexa_3D_i.hxx
StdMeshers_AutomaticLength_i.hxx
StdMeshers_QuadranglePreference_i.hxx
StdMeshers_Hexa_3D_i.hxx
StdMeshers_AutomaticLength_i.hxx
StdMeshers_QuadranglePreference_i.hxx
@@
-111,7
+120,9
@@
SET(StdMeshersEngine_HEADERS
StdMeshers_CartesianParameters3D_i.hxx
StdMeshers_Cartesian_3D_i.hxx
)
StdMeshers_CartesianParameters3D_i.hxx
StdMeshers_Cartesian_3D_i.hxx
)
-
+IF(SALOME_SMESH_ENABLE_MEFISTO)
+ SET(StdMeshersEngine_HEADERS ${StdMeshersEngine_HEADERS} StdMeshers_MEFISTO_2D_i.hxx)
+ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
# --- sources ---
# sources / static
# --- sources ---
# sources / static
@@
-129,8
+140,7
@@
SET(StdMeshersEngine_SOURCES
StdMeshers_MaxElementVolume_i.cxx
StdMeshers_NotConformAllowed_i.cxx
StdMeshers_Regular_1D_i.cxx
StdMeshers_MaxElementVolume_i.cxx
StdMeshers_NotConformAllowed_i.cxx
StdMeshers_Regular_1D_i.cxx
- StdMeshers_Quadrangle_2D_i.cxx
- StdMeshers_MEFISTO_2D_i.cxx
+ StdMeshers_Quadrangle_2D_i.cxx
StdMeshers_Hexa_3D_i.cxx
StdMeshers_AutomaticLength_i.cxx
StdMeshers_QuadranglePreference_i.cxx
StdMeshers_Hexa_3D_i.cxx
StdMeshers_AutomaticLength_i.cxx
StdMeshers_QuadranglePreference_i.cxx
@@
-162,6
+172,10
@@
SET(StdMeshersEngine_SOURCES
StdMeshers_Cartesian_3D_i.cxx
)
StdMeshers_Cartesian_3D_i.cxx
)
+IF(SALOME_SMESH_ENABLE_MEFISTO)
+ SET(StdMeshersEngine_SOURCES ${StdMeshersEngine_SOURCES} StdMeshers_MEFISTO_2D_i.cxx)
+ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
+
# --- rules ---
ADD_LIBRARY(StdMeshersEngine ${StdMeshersEngine_SOURCES})
# --- rules ---
ADD_LIBRARY(StdMeshersEngine ${StdMeshersEngine_SOURCES})