File tree Expand file tree Collapse file tree 5 files changed +20
-20
lines changed
Expand file tree Collapse file tree 5 files changed +20
-20
lines changed Original file line number Diff line number Diff line change @@ -24,6 +24,9 @@ if(_7BIT_DI_BUILD_DOCS)
2424endif ()
2525
2626if (_7BIT_DI_BUILD_TESTS)
27+ include (GoogleTest)
28+ enable_testing ()
29+
2730 add_subdirectory (Tests)
2831endif ()
2932
@@ -39,14 +42,14 @@ if(_7BIT_DI_INSTALL)
3942 install (DIRECTORY ${_7BIT_DI_HEADERS_DIR} / DESTINATION include )
4043
4144 export (
42- TARGETS 7BitDI
43- NAMESPACE 7BitDI ::
45+ TARGETS 7bitDI
46+ NAMESPACE 7bitDI ::
4447 FILE ${CONFIG_TARGETS_FILE} )
4548
4649 install (
47- EXPORT 7BitDI
50+ EXPORT 7bitDI
4851 DESTINATION ${EXPORT_DEST_DIR}
49- NAMESPACE 7BitDI ::
52+ NAMESPACE 7bitDI ::
5053 FILE ${CONFIG_TARGETS_FILE} )
5154
5255 include (CMakePackageConfigHelpers)
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ foreach(SOURCE ${SOURCES})
99 )
1010
1111 target_link_libraries (${FILE_NAME}
12- 7BitDI
12+ 7bitDI
1313 )
1414
1515 if (_7BIT_DI_INSTALL)
Original file line number Diff line number Diff line change 77
88#if defined(_WIN32) || defined(_WIN64) || defined(WIN32) || defined(WIN64)
99// Microsoft
10- #ifdef _7BitDI_EXPORTS
10+ #ifdef _7bitDI_EXPORTS
1111/* We are building this library */
1212#define EXPORT __declspec (dllexport)
1313#else
1717
1818#elif defined(__linux__) || defined(UNIX) || defined(__unix__) || defined(LINUX)
1919// GCC
20- #if defined(_7BitDI_EXPORTS )
20+ #if defined(_7bitDI_EXPORTS )
2121#define EXPORT __attribute__ ((visibility(" default" )))
2222#else
2323#define EXPORT
Original file line number Diff line number Diff line change 22include (GenerateExportHeader)
33
44if (_7BIT_DI_BUILD_LIBRARY_TYPE STREQUAL "Shared" )
5- add_library (7BitDI SHARED
5+ add_library (7bitDI SHARED
66 Source .cpp ${_7BIT_DI_ALL_HEADERS}
77 )
88elseif (_7BIT_DI_BUILD_LIBRARY_TYPE STREQUAL "Static" )
9- add_library (7BitDI STATIC
9+ add_library (7bitDI STATIC
1010 Source .cpp ${_7BIT_DI_ALL_HEADERS}
1111 )
1212elseif (_7BIT_DI_BUILD_LIBRARY_TYPE STREQUAL "HeaderOnly" )
13- add_library (7BitDI INTERFACE )
13+ add_library (7bitDI INTERFACE )
1414endif ()
1515
16- add_library (7BitDI::7BitDI ALIAS 7BitDI )
16+ add_library (7bitDI::7bitDI ALIAS 7bitDI )
1717
18- target_include_directories (7BitDI INTERFACE "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR} /Include>"
18+ target_include_directories (7bitDI INTERFACE "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR} /Include>"
1919 "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR} >" )
2020
21- set_target_properties (7BitDI PROPERTIES VERSION ${_7BIT_DI_VERSION} )
22- set_target_properties (7BitDI PROPERTIES DEBUG_POSTFIX d)
21+ set_target_properties (7bitDI PROPERTIES VERSION ${_7BIT_DI_VERSION} )
22+ set_target_properties (7bitDI PROPERTIES DEBUG_POSTFIX d)
2323
2424if (_7BIT_DI_INSTALL)
2525 install (
26- TARGETS 7BitDI
27- EXPORT 7BitDI )
26+ TARGETS 7bitDI
27+ EXPORT 7bitDI )
2828endif ()
Original file line number Diff line number Diff line change 1- include (GoogleTest)
2- enable_testing ()
3-
41find_package (GTest REQUIRED)
52
63file (GLOB_RECURSE SOURCES CONFIGURE_DEPENDS *.cpp)
@@ -15,7 +12,7 @@ target_link_libraries(Tests PUBLIC
1512)
1613
1714target_link_libraries (Tests PUBLIC
18- 7BitDI
15+ 7bitDI
1916)
2017
2118if (_7BIT_DI_INSTALL)
You can’t perform that action at this time.
0 commit comments