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
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2e97c6..5f5418d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -435,8 +435,9 @@ set(LIBSBML_XML_LIBRARY_LIBS)
if(WITH_EXPAT)
if(NOT TARGET EXPAT::EXPAT)
- find_package(EXPAT REQUIRED)
endif()
+ find_package(EXPAT NAMES expat REQUIRED)
+ set(EXPAT_LIBRARY expat::expat)
add_definitions( -DUSE_EXPAT )
list(APPEND SWIG_EXTRA_ARGS -DUSE_EXPAT)
@@ -457,7 +458,8 @@ endif(WITH_EXPAT)
set(USE_LIBXML OFF)
if(WITH_LIBXML)
- find_package(LIBXML REQUIRED)
+ find_package(LIBXML NAMES LibXml2 REQUIRED)
+ set(LIBXML_LIBRARY LibXml2::LibXml2)
add_definitions( -DUSE_LIBXML )
list(APPEND SWIG_EXTRA_ARGS -DUSE_LIBXML)
@@ -509,7 +511,7 @@ endif()
option(WITH_BZIP2 "Enable the use of bzip2 compression." ${BZIP_INITIAL_VALUE})
set(USE_BZ2 OFF)
if(WITH_BZIP2)
- find_package(BZ2 REQUIRED)
+ find_package(BZip2 REQUIRED)
set(USE_BZ2 ON)
add_definitions( -DUSE_BZ2 )
list(APPEND SWIG_EXTRA_ARGS -DUSE_BZ2)
@@ -535,6 +537,9 @@ Separate multiple directories using semicolons." )
# Locate zlib
#
+if(WITH_ZLIB)
+ find_package(ZLIB REQUIRED)
+endif()
set(ZLIB_INITIAL_VALUE)
if (NOT LIBZ_LIBRARY)
find_library(LIBZ_LIBRARY
@@ -628,7 +633,6 @@ valid. It should contain the file zlib.h, but it does not.")
endif(WITH_ZLIB)
# install find scripts only for used dependencies
-install(FILES ${LIBSBML_FIND_MODULES} DESTINATION share/cmake/Modules)
###############################################################################
#
@@ -685,7 +689,12 @@ if(WITH_CHECK)
enable_testing()
- find_package(CHECK REQUIRED)
+ find_package(CHECK NAMES check REQUIRED)
+ if(BUILD_SHARED_LIBS)
+ add_library(CHECK::CHECK ALIAS Check::checkShared)
+ else()
+ add_library(CHECK::CHECK ALIAS Check::check)
+ endif()
if (UNIX)
# setup valgrind
@@ -1018,18 +1027,29 @@ install(FILES ${DOCUMENTATION_FILES} DESTINATION ${MISC_PREFIX})
# Write libsbml.pc
#
-set (PRIVATE_LIBS "-lstdc++ -lm")
+set(FAKE_CXX_LINKAGE "")
+foreach(lib IN LISTS CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
+ if(lib IN_LIST CMAKE_C_IMPLICIT_LINK_LIBRARIES)
+ continue()
+ elseif(EXISTS "${lib}")
+ string(APPEND FAKE_CXX_LINKAGE " ${CMAKE_LINK_LIBRARY_FILE_FLAG}${lib}")
+ else()
+ string(APPEND FAKE_CXX_LINKAGE " ${CMAKE_LINK_LIBRARY_FLAG}${lib}")
+ endif()
+endforeach()
+set (PRIVATE_LIBS "${FAKE_CXX_LINKAGE}")
+set (PRIVATE_REQUIRES "")
if (WITH_ZLIB)
-set (PRIVATE_LIBS "${LIBZ_LIBRARY} ${PRIVATE_LIBS}")
+ string(APPEND PRIVATE_REQUIRES " zlib")
endif()
if (WITH_BZIP2)
-set (PRIVATE_LIBS "${LIBBZ_LIBRARY} ${PRIVATE_LIBS}")
+ string(APPEND PRIVATE_REQUIRES " bzip2")
endif()
if (WITH_LIBXML)
-set (PRIVATE_LIBS "${LIBXML_LIBRARY} ${PRIVATE_LIBS}")
+ string(APPEND PRIVATE_REQUIRES " libxml-2.0")
endif()
if (WITH_EXPAT)
-set (PRIVATE_LIBS "${LIBEXPAT_LIBRARY} ${PRIVATE_LIBS}")
+ string(APPEND PRIVATE_REQUIRES " expat")
endif()
if (WITH_XERCES)
set (PRIVATE_LIBS "${XERCES_LIBRARY} ${PRIVATE_LIBS}")
@@ -1051,9 +1071,7 @@ if (WITH_XERCES)
file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" "Conflicts: xerces-c = 2.6.0\n")
endif()
-if (WITH_LIBXML)
-file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" "Requires.private: libxml-2.0 >= 2.6.22\n")
-endif()
+file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" "Requires.private: ${PRIVATE_REQUIRES}\n")
if (UNIX OR MINGW)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 79301a6..0957d29 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -311,7 +311,7 @@ if(WITH_BZIP2)
sbml/compress/bzfstream.h
sbml/compress/bzfstream.cpp
)
- set(LIBSBML_LIBS ${LIBSBML_LIBS} BZ2::BZ2)
+ set(LIBSBML_LIBS ${LIBSBML_LIBS} BZip2::BZip2)
endif()
@@ -405,7 +405,7 @@ if(WITH_EXPAT)
sbml/xml/ExpatHandler.h
sbml/xml/ExpatParser.h
)
- set(LIBSBML_LIBS ${LIBSBML_LIBS} EXPAT::EXPAT)
+ set(LIBSBML_LIBS ${LIBSBML_LIBS} expat::expat)
endif(WITH_EXPAT)
@@ -423,7 +423,7 @@ if(WITH_LIBXML)
sbml/xml/LibXMLParser.h
sbml/xml/LibXMLTranscode.h
)
- set(LIBSBML_LIBS ${LIBSBML_LIBS} LIBXML::LIBXML)
+ set(LIBSBML_LIBS ${LIBSBML_LIBS} LibXml2::LibXml2)
endif(WITH_LIBXML)
|
