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
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7d2451..f8cc1ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,11 +66,7 @@ if(NOT MSVC)
"Set to ON|OFF (default) to build GEOS with assert() macro enabled" OFF)
endif()
-option(GEOS_BUILD_STATIC
- "Set to OFF|ON (default) to build GEOS static libraries" ON)
-
-option(GEOS_BUILD_SHARED
- "Set to OFF|ON (default) to build GEOS shared libraries" ON)
+option(BUILD_SHARED_LIBS "Build GEOS as a shared library" ON)
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
option(GEOS_ENABLE_FLOATSTORE
diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt
index 0607b16..877d611 100644
--- a/capi/CMakeLists.txt
+++ b/capi/CMakeLists.txt
@@ -21,17 +21,25 @@ set(geos_c_SOURCES
file(GLOB geos_capi_HEADERS ${CMAKE_BINARY_DIR}/capi/*.h) # fix source_group issue
-if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK AND GEOS_BUILD_SHARED)
+if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK)
# if building OS X framework or only building static libs, CAPI built into C++ library)
- add_library(geos_c SHARED ${geos_c_SOURCES})
+ add_library(geos_c ${geos_c_SOURCES})
target_link_libraries(geos_c geos)
if (WIN32)
- set_target_properties(geos_c
- PROPERTIES
- VERSION ${CAPI_VERSION}
- CLEAN_DIRECT_OUTPUT 1)
+ if(BUILD_SHARED_LIBS)
+ set_target_properties(geos_c
+ PROPERTIES
+ VERSION ${CAPI_VERSION}
+ CLEAN_DIRECT_OUTPUT 1)
+ else()
+ set_target_properties(geos_c
+ PROPERTIES
+ OUTPUT_NAME "geos_c"
+ PREFIX "lib"
+ CLEAN_DIRECT_OUTPUT 1)
+ endif()
else()
set_target_properties(geos_c
PROPERTIES
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3894a56..f86d823 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,7 +24,7 @@ if(GEOS_ENABLE_MACOSX_FRAMEWORK)
# also 1 binary, so include CAPI here
# and, make name all caps
- add_library(GEOS SHARED ${geos_SOURCES} ${geos_c_SOURCES})
+ add_library(GEOS ${geos_SOURCES} ${geos_c_SOURCES})
math(EXPR CVERSION "${VERSION_MAJOR} + 1")
# VERSION = current version, SOVERSION = compatibility version
@@ -62,38 +62,27 @@ if(GEOS_ENABLE_MACOSX_FRAMEWORK)
else()
- if(GEOS_BUILD_SHARED)
- add_library(geos SHARED ${geos_SOURCES} ${geos_ALL_HEADERS})
+ add_library(geos ${geos_SOURCES} ${geos_ALL_HEADERS})
+ if(BUILD_SHARED_LIBS)
set_target_properties(geos
PROPERTIES
DEFINE_SYMBOL GEOS_DLL_EXPORT
VERSION ${VERSION}
CLEAN_DIRECT_OUTPUT 1)
-
- install(TARGETS geos
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
- endif()
-
- if(GEOS_BUILD_STATIC)
- file(GLOB geos_capi_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../capi/*.h) # fix source_group issue
- add_library(geos-static STATIC ${geos_SOURCES} ${geos_c_SOURCES} ${geos_ALL_HEADERS} ${geos_capi_HEADERS})
-
- set_target_properties(geos-static
+ else()
+ set_target_properties(geos
PROPERTIES
OUTPUT_NAME "geos"
PREFIX "lib"
CLEAN_DIRECT_OUTPUT 1)
-
- install(TARGETS geos-static
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
-
endif()
+ install(TARGETS geos
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)
+
endif() # (GEOS_ENABLE_MACOSX_FRAMEWORK)
# if(APPLE)
|
