Skip to content

Commit 5c65fb4

Browse files
authored
Merge pull request #9 from cschreib/line-endings
Fix mismatched line endings
2 parents aac9c06 + 9f14f5f commit 5c65fb4

File tree

4 files changed

+1841
-1838
lines changed

4 files changed

+1841
-1838
lines changed

.gitattributes

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
* text=auto
2+
3+
*.bat eol=crlf

CMakeLists.txt

+46-46
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
cmake_minimum_required(VERSION 3.8)
2-
3-
# Setup main project
4-
project(oup LANGUAGES CXX VERSION 1.0)
5-
6-
# Create library (header-only)
7-
add_library(oup INTERFACE)
8-
add_library(oup::oup ALIAS oup)
9-
set_target_properties(oup PROPERTIES EXPORT_NAME oup::oup)
10-
11-
target_sources(oup INTERFACE
12-
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/oup/observable_unique_ptr.hpp>
13-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/oup/observable_unique_ptr.hpp>)
14-
target_include_directories(oup INTERFACE
15-
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
16-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>)
17-
target_compile_features(oup INTERFACE cxx_std_17)
18-
19-
# Setup install target and exports
20-
install(FILES ${PROJECT_SOURCE_DIR}/include/oup/observable_unique_ptr.hpp
21-
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/oup)
22-
install(TARGETS oup EXPORT oup-targets)
23-
24-
install(EXPORT oup-targets
25-
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/oup COMPONENT Development)
26-
27-
export(EXPORT oup-targets)
28-
29-
# Setup CMake config file
30-
include(CMakePackageConfigHelpers)
31-
configure_package_config_file(
32-
"${PROJECT_SOURCE_DIR}/cmake/oup-config.cmake.in"
33-
"${PROJECT_BINARY_DIR}/oup-config.cmake"
34-
INSTALL_DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
35-
NO_CHECK_REQUIRED_COMPONENTS_MACRO
36-
NO_SET_AND_CHECK_MACRO)
37-
38-
install(FILES
39-
"${PROJECT_BINARY_DIR}/oup-config.cmake"
40-
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/oup COMPONENT Development)
41-
42-
# Setup tests
43-
if (OUP_DO_TEST)
44-
enable_testing()
45-
add_subdirectory(tests)
46-
endif()
1+
cmake_minimum_required(VERSION 3.8)
2+
3+
# Setup main project
4+
project(oup LANGUAGES CXX VERSION 1.0)
5+
6+
# Create library (header-only)
7+
add_library(oup INTERFACE)
8+
add_library(oup::oup ALIAS oup)
9+
set_target_properties(oup PROPERTIES EXPORT_NAME oup::oup)
10+
11+
target_sources(oup INTERFACE
12+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/oup/observable_unique_ptr.hpp>
13+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/oup/observable_unique_ptr.hpp>)
14+
target_include_directories(oup INTERFACE
15+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
16+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>)
17+
target_compile_features(oup INTERFACE cxx_std_17)
18+
19+
# Setup install target and exports
20+
install(FILES ${PROJECT_SOURCE_DIR}/include/oup/observable_unique_ptr.hpp
21+
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/oup)
22+
install(TARGETS oup EXPORT oup-targets)
23+
24+
install(EXPORT oup-targets
25+
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/oup COMPONENT Development)
26+
27+
export(EXPORT oup-targets)
28+
29+
# Setup CMake config file
30+
include(CMakePackageConfigHelpers)
31+
configure_package_config_file(
32+
"${PROJECT_SOURCE_DIR}/cmake/oup-config.cmake.in"
33+
"${PROJECT_BINARY_DIR}/oup-config.cmake"
34+
INSTALL_DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
35+
NO_CHECK_REQUIRED_COMPONENTS_MACRO
36+
NO_SET_AND_CHECK_MACRO)
37+
38+
install(FILES
39+
"${PROJECT_BINARY_DIR}/oup-config.cmake"
40+
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/oup COMPONENT Development)
41+
42+
# Setup tests
43+
if (OUP_DO_TEST)
44+
enable_testing()
45+
add_subdirectory(tests)
46+
endif()

0 commit comments

Comments
 (0)