Browse Source

work towards porting EM3D over to new Lemma

master
Trevor Irons 6 years ago
parent
commit
b13b84c16c
3 changed files with 25 additions and 4 deletions
  1. 10
    3
      CMakeLists.txt
  2. 14
    0
      examples/CMakeLists.txt
  3. 1
    1
      include/EMSchur3D.h

+ 10
- 3
CMakeLists.txt View File

1
+# Configure EMSchur3D 
2
+set(EMSCHUR3D_VERSION_MAJOR "0")
3
+set(EMSCHUR3D_VERSION_MINOR "0")
4
+set(EMSCHUR3D_VERSION_PATCH "1")
5
+set(EMSCHUR3D_VERSION "\"${EMSCHUR3D_VERSION_MAJOR}.${EMSCHUR3D_VERSION_MINOR}.${EMSCHUR3D_VERSION_PATCH}\"")
6
+set(EMSCHUR3D_VERSION_NOQUOTES "${EMSCHUR3D_VERSION_MAJOR}.${EMSCHUR3D_VERSION_MINOR}.${EMSCHUR3D_VERSION_PATCH}")
7
+
1
 add_subdirectory("src")
8
 add_subdirectory("src")
2
 add_library( emschur3d ${EMSCHUR3DSOURCE} )  
9
 add_library( emschur3d ${EMSCHUR3DSOURCE} )  
3
 target_include_directories( emschur3d PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
10
 target_include_directories( emschur3d PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
4
 
11
 
5
 set_target_properties(emschur3d PROPERTIES 
12
 set_target_properties(emschur3d PROPERTIES 
6
-	VERSION  "${LEMMA_VERSION_NOQUOTES}"
7
-	SOVERSION "${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}"
8
-	PROJECT_LABEL "FDEM1D ${LABEL_SUFFIX}"
13
+	VERSION  "${EMSCHUR3D_VERSION_NOQUOTES}"
14
+	SOVERSION "${EMSCHUR3D_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}"
15
+	PROJECT_LABEL "EMSCHUR3D ${LABEL_SUFFIX}"
9
 )
16
 )
10
 
17
 
11
 # Linking
18
 # Linking

+ 14
- 0
examples/CMakeLists.txt View File

1
+add_executable( EMSchur3D  EMSchur3D.cpp  )
2
+target_link_libraries(  EMSchur3D  "lemmacore" "fdem1d" "emschur3d")
3
+
4
+# Linking
5
+#if ( LEMMA_VTK6_SUPPORT OR LEMMA_VTK7_SUPPORT )
6
+#    target_link_libraries( KernelV0 ${VTK_LIBRARIES})
7
+#    target_link_libraries( KV0-3loops ${VTK_LIBRARIES})
8
+#    target_link_libraries( Coupling ${VTK_LIBRARIES})
9
+#    target_link_libraries( Interference ${VTK_LIBRARIES})
10
+#endif()
11
+
12
+INSTALL_TARGETS( "/share/EMSchur3D/"
13
+    EMSchur3D
14
+)

+ 1
- 1
include/EMSchur3D.h View File

23
 #define  EMSCHUR3D_INC
23
 #define  EMSCHUR3D_INC
24
 
24
 
25
 #include "EMSchur3DBase.h"
25
 #include "EMSchur3DBase.h"
26
-#include "CSymSimplicialCholesky.h"
26
+//#include "CSymSimplicialCholesky.h"
27
 
27
 
28
 namespace Lemma {
28
 namespace Lemma {
29
 
29
 

Loading…
Cancel
Save