Skip to content

Commit 82f0392

Browse files
committed
cmake: Remove special "connector-static" target that was added in maintainer mode.
It was only used internally to build our binary packages, but we implemented a different mechanism now.
1 parent 5014619 commit 82f0392

File tree

2 files changed

+3
-50
lines changed

2 files changed

+3
-50
lines changed

CMakeLists.txt

Lines changed: 2 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ if(BUILD_STATIC)
204204
set_property(
205205
DIRECTORY .
206206
APPEND PROPERTY COMPILE_DEFINITIONS
207-
$<$<NOT:$<CONFIG:Static>>:CONCPP_BUILD_STATIC>
207+
CONCPP_BUILD_STATIC
208208
)
209209

210210
else()
@@ -227,7 +227,7 @@ else()
227227
set_property(
228228
DIRECTORY .
229229
APPEND PROPERTY COMPILE_DEFINITIONS
230-
$<$<NOT:$<CONFIG:Static>>:CONCPP_BUILD_SHARED>
230+
CONCPP_BUILD_SHARED
231231
)
232232
#add_compile_options($<$<NOT:$<CONFIG:Static>>:-DCONCPP_BUILD_SHARED>)
233233

@@ -237,23 +237,6 @@ else()
237237

238238
endif()
239239

240-
if(MAINTAINER_MODE)
241-
242-
list(APPEND CMAKE_CONFIGURATION_TYPES Static)
243-
244-
set(CMAKE_CXX_FLAGS_STATIC ${CMAKE_CXX_FLAGS_RELEASE})
245-
set(CMAKE_C_FLAGS_STATIC ${CMAKE_C_FLAGS_RELEASE})
246-
set(CMAKE_SHARED_LINKER_FLAGS_STATIC ${CMAKE_SHARED_LINKER_FLAGS_RELEASE})
247-
set(CMAKE_EXE_LINKER_FLAGS_STATIC ${CMAKE_EXE_LINKER_FLAGS_RELEASE})
248-
249-
set_property(
250-
DIRECTORY .
251-
APPEND PROPERTY COMPILE_DEFINITIONS
252-
$<$<CONFIG:Static>:CONCPP_BUILD_STATIC>
253-
)
254-
255-
endif()
256-
257240

258241
add_config_option(WITH_TESTS BOOL ADVANCED DEFAULT OFF
259242
"Build project's unit tests"
@@ -411,13 +394,6 @@ add_subdirectory(devapi)
411394
merge_libraries(connector xapi devapi)
412395
target_include_directories(connector PUBLIC "${PROJECT_SOURCE_DIR}/include")
413396

414-
if(MAINTAINER_MODE)
415-
416-
merge_libraries(connector-static STATIC xapi devapi)
417-
target_include_directories(connector-static PUBLIC "${PROJECT_SOURCE_DIR}/include")
418-
419-
endif()
420-
421397

422398
#
423399
# Embed rpath information in the connector library.
@@ -505,29 +481,6 @@ if(MSVC AND NOT BUILD_STATIC)
505481
endif()
506482

507483

508-
if(TARGET connector-static)
509-
510-
set_property(TARGET connector-static PROPERTY OUTPUT_NAME ${LIB_NAME_STATIC})
511-
512-
set_target_properties(connector-static PROPERTIES
513-
VERSION "${ABI_VERSION_MAJOR}.${CONCPP_VERSION}"
514-
SOVERSION "${ABI_VERSION_MAJOR}"
515-
)
516-
517-
install(TARGETS connector-static
518-
CONFIGURATIONS Static
519-
ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev
520-
RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
521-
LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
522-
)
523-
524-
if(TARGET connector-jdbc-static)
525-
add_dependencies(connector-static connector-jdbc-static)
526-
endif()
527-
528-
endif()
529-
530-
531484
#
532485
# Tests
533486
# =====

jdbc

Submodule jdbc updated 1 file

0 commit comments

Comments
 (0)