Browse Source

Fix for installing so files. versioning bug before.

enhancement_3
Trevor Irons 8 years ago
parent
commit
ccbfb75d4f

+ 2
- 0
CMakeLists.txt View File

200
 set(LEMMA_VERSION_MINOR "1")
200
 set(LEMMA_VERSION_MINOR "1")
201
 set(LEMMA_VERSION_PATCH "1")
201
 set(LEMMA_VERSION_PATCH "1")
202
 set(LEMMA_VERSION "\"${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}.${LEMMA_VERSION_PATCH}\"")
202
 set(LEMMA_VERSION "\"${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}.${LEMMA_VERSION_PATCH}\"")
203
+set(LEMMA_VERSION_NOQUOTES "${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}.${LEMMA_VERSION_PATCH}")
203
 
204
 
204
 configure_file (
205
 configure_file (
205
 	"${PROJECT_SOURCE_DIR}/config/LemmaConfig.h.in"
206
 	"${PROJECT_SOURCE_DIR}/config/LemmaConfig.h.in"
206
 	"${PROJECT_BINARY_DIR}/include/LemmaConfig.h"
207
 	"${PROJECT_BINARY_DIR}/include/LemmaConfig.h"
207
 )
208
 )
209
+install ( FILES  ${PROJECT_BINARY_DIR}/include/LemmaConfig.h   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/Lemma/ )
208
 
210
 
209
 include_directories("${PROJECT_BINARY_DIR}/include")
211
 include_directories("${PROJECT_BINARY_DIR}/include")
210
 include_directories ("${CMAKE_INSTALL_PREFIX}/include/")
212
 include_directories ("${CMAKE_INSTALL_PREFIX}/include/")

+ 6
- 1
Modules/FDEM1D/CMakeLists.txt View File

3
 target_include_directories( fdem1d PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
3
 target_include_directories( fdem1d PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
4
 
4
 
5
 set_target_properties(fdem1d PROPERTIES 
5
 set_target_properties(fdem1d PROPERTIES 
6
-	VERSION  "${LEMMA_VERSION}"
6
+	VERSION  "${LEMMA_VERSION_NOQUOTES}"
7
 	SOVERSION "${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}"
7
 	SOVERSION "${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}"
8
 	PROJECT_LABEL "FDEM1D ${LABEL_SUFFIX}"
8
 	PROJECT_LABEL "FDEM1D ${LABEL_SUFFIX}"
9
 )
9
 )
23
 
23
 
24
 # Install
24
 # Install
25
 install ( TARGETS fdem1d DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
25
 install ( TARGETS fdem1d DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
26
+install ( FILES include/FDEM1D  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/Lemma/ ) 
27
+install ( DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/Lemma/  FILES_MATCHING PATTERN "*.h")
28
+
29
+#install ( DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/Lemma/  FILES_MATCHING PATTERN "FDEM1D")
30
+#install ( DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/Lemma/FDEM1D  FILES_MATCHING PATTERN "*.h")
26
 
31
 
27
 # Examples
32
 # Examples
28
 if (LEMMA_BUILD_EXAMPLES)
33
 if (LEMMA_BUILD_EXAMPLES)

+ 1
- 1
Modules/FDEM1D/examples/PolygonalWireAntenna.cpp View File

32
     std::cout << *wire << std::endl;
32
     std::cout << *wire << std::endl;
33
 
33
 
34
     auto wire2 = wire->Clone();
34
     auto wire2 = wire->Clone();
35
-    std::cout << *wire2 << std::endl;
35
+    std::cout << "copy\n" << *wire2 << std::endl;
36
 }
36
 }

+ 4
- 2
Modules/LemmaCore/CMakeLists.txt View File

3
 target_include_directories( lemmacore PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
3
 target_include_directories( lemmacore PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
4
 
4
 
5
 set_target_properties(lemmacore PROPERTIES 
5
 set_target_properties(lemmacore PROPERTIES 
6
-	VERSION  "${LEMMA_VERSION}"
6
+	VERSION  "${LEMMA_VERSION_NOQUOTES}"
7
 	SOVERSION "${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}"
7
 	SOVERSION "${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}"
8
 	PROJECT_LABEL "LemmaCore ${LABEL_SUFFIX}"
8
 	PROJECT_LABEL "LemmaCore ${LABEL_SUFFIX}"
9
 )
9
 )
31
 endif()
31
 endif()
32
 
32
 
33
 # Install
33
 # Install
34
-install ( TARGETS lemmacore DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
34
+install (  TARGETS lemmacore DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
35
+install ( FILES include/LemmaCore  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/Lemma/ ) 
36
+install ( DIRECTORY include/       DESTINATION ${CMAKE_INSTALL_PREFIX}/include/Lemma/  FILES_MATCHING PATTERN "*.h" )
35
 
37
 
36
 # Examples
38
 # Examples
37
 if (LEMMA_BUILD_EXAMPLES)
39
 if (LEMMA_BUILD_EXAMPLES)

Loading…
Cancel
Save