Skip to content

Commit 1ba55b8

Browse files
committed
fix merge
1 parent 9471e33 commit 1ba55b8

File tree

1 file changed

+14
-20
lines changed

1 file changed

+14
-20
lines changed

Source/CMakeLists.txt

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,22 @@ include(GenerateExportHeader)
33

44
if(_7BIT_DI_BUILD_LIBRARY_TYPE STREQUAL "Shared")
55
add_library(7bitDI SHARED
6-
add_library(7bitDI SHARED
76
Source.cpp ${_7BIT_DI_ALL_HEADERS}
8-
)
9-
elseif(_7BIT_DI_BUILD_LIBRARY_TYPE STREQUAL "Static")
10-
add_library(7bitDI STATIC
11-
add_library(7bitDI STATIC
7+
)
8+
elseif(_7BIT_DI_BUILD_LIBRARY_TYPE STREQUAL "Static")
9+
add_library(7bitDI STATIC
1210
Source.cpp ${_7BIT_DI_ALL_HEADERS}
13-
)
14-
elseif(_7BIT_DI_BUILD_LIBRARY_TYPE STREQUAL "HeaderOnly")
15-
add_library(7bitDI INTERFACE)
16-
add_library(7bitDI INTERFACE)
17-
endif()
11+
)
12+
elseif(_7BIT_DI_BUILD_LIBRARY_TYPE STREQUAL "HeaderOnly")
13+
add_library(7bitDI INTERFACE)
14+
endif()
1815

19-
add_library(7bitDI::7bitDI ALIAS 7bitDI)
20-
add_library(7bitDI::7bitDI ALIAS 7bitDI)
16+
add_library(7bitDI::7bitDI ALIAS 7bitDI)
2117

22-
target_include_directories(
23-
7bitDI INTERFACE
24-
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Include>
25-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
18+
target_include_directories(
19+
7bitDI INTERFACE
20+
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Include>
21+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
2622

27-
set_target_properties(7bitDI PROPERTIES VERSION ${_7BIT_DI_VERSION})
28-
set_target_properties(7bitDI PROPERTIES DEBUG_POSTFIX d)
29-
set_target_properties(7bitDI PROPERTIES VERSION ${_7BIT_DI_VERSION})
30-
set_target_properties(7bitDI PROPERTIES DEBUG_POSTFIX d)
23+
set_target_properties(7bitDI PROPERTIES VERSION ${_7BIT_DI_VERSION})
24+
set_target_properties(7bitDI PROPERTIES DEBUG_POSTFIX d)

0 commit comments

Comments
 (0)