blob: 2d63ebae888c6166e7fa9f7c3cc7eab122e95eda (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -83,16 +83,6 @@
INSTALL(TARGETS scr DESTINATION ${CMAKE_INSTALL_LIBDIR})
ENDIF()
-ADD_LIBRARY(scr-static STATIC $<TARGET_OBJECTS:scr_o>)
-IF(SCR_LINK_STATIC)
- SET_TARGET_PROPERTIES(scr-static PROPERTIES LINK_SEARCH_START_STATIC 1)
- SET_TARGET_PROPERTIES(scr-static PROPERTIES LINK_SEARCH_END_STATIC 1)
-ENDIF(SCR_LINK_STATIC)
-TARGET_LINK_LIBRARIES(scr-static ${SCR_EXTERNAL_LIBS})
-
-SET_TARGET_PROPERTIES(scr-static PROPERTIES OUTPUT_NAME scr CLEAN_DIRECT_OUTPUT 1)
-INSTALL(TARGETS scr-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
# Non-MPI library for CLI
ADD_LIBRARY(cliscr_noMPI_o OBJECT ${cliscr_noMPI_srcs})
@@ -103,16 +93,6 @@
INSTALL(TARGETS scr_base DESTINATION ${CMAKE_INSTALL_LIBDIR})
ENDIF(BUILD_SHARED_LIBS)
-ADD_LIBRARY(scr_base-static STATIC $<TARGET_OBJECTS:cliscr_noMPI_o>)
-IF(SCR_LINK_STATIC)
- SET_TARGET_PROPERTIES(scr_base-static PROPERTIES LINK_SEARCH_START_STATIC 1)
- SET_TARGET_PROPERTIES(scr_base-static PROPERTIES LINK_SEARCH_END_STATIC 1)
-ENDIF(SCR_LINK_STATIC)
-TARGET_LINK_LIBRARIES(scr_base-static ${SCR_EXTERNAL_SERIAL_LIBS})
-
-SET_TARGET_PROPERTIES(scr_base-static PROPERTIES OUTPUT_NAME scr_base CLEAN_DIRECT_OUTPUT 1)
-INSTALL(TARGETS scr_base-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
# Fortran
IF(ENABLE_FORTRAN)
IF(BUILD_SHARED_LIBS)
@@ -121,17 +101,6 @@
SET_TARGET_PROPERTIES(scrf PROPERTIES OUTPUT_NAME scrf CLEAN_DIRECT_OUTPUT 1)
INSTALL(TARGETS scrf DESTINATION ${CMAKE_INSTALL_LIBDIR})
ENDIF()
-
- ADD_LIBRARY(scrf-static STATIC scrf.c $<TARGET_OBJECTS:scr_o>)
- IF(SCR_LINK_STATIC)
- SET_TARGET_PROPERTIES(scrf-static PROPERTIES LINK_SEARCH_START_STATIC 1)
- SET_TARGET_PROPERTIES(scrf-static PROPERTIES LINK_SEARCH_END_STATIC 1)
- TARGET_LINK_LIBRARIES(scrf-static ${SCR_EXTERNAL_LIBS})
- ENDIF(SCR_LINK_STATIC)
- TARGET_LINK_LIBRARIES(scrf-static ${SCR_EXTERNAL_LIBS})
-
- SET_TARGET_PROPERTIES(scrf-static PROPERTIES OUTPUT_NAME scrf CLEAN_DIRECT_OUTPUT 1)
- INSTALL(TARGETS scrf-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
ENDIF(ENABLE_FORTRAN)
###########
@@ -164,21 +133,13 @@
# Build and install C binaries
FOREACH(bin IN ITEMS ${cliscr_c_bins})
ADD_EXECUTABLE(${bin} ${bin}.c)
- IF(SCR_LINK_STATIC)
- TARGET_LINK_LIBRARIES(${bin} scr_base-static)
- ELSE(SCR_LINK_STATIC)
TARGET_LINK_LIBRARIES(${bin} scr_base)
- ENDIF(SCR_LINK_STATIC)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${bin} DESTINATION ${CMAKE_INSTALL_BINDIR})
ENDFOREACH(bin IN ITEMS ${cliscr_c_bins})
# Build and install CLI binaries that link full SCR library
FOREACH(bin IN ITEMS ${cliscr_scr_bins})
ADD_EXECUTABLE(${bin} ${bin}.c)
- IF(SCR_LINK_STATIC)
- TARGET_LINK_LIBRARIES(${bin} scr-static)
- ELSE(SCR_LINK_STATIC)
TARGET_LINK_LIBRARIES(${bin} scr)
- ENDIF(SCR_LINK_STATIC)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${bin} DESTINATION ${CMAKE_INSTALL_BINDIR})
ENDFOREACH(bin IN ITEMS ${cliscr_scr_bins})
|
GitWeb
