Skip to content

Commit c0e1691

Browse files
asmaloneyasmaloney
authored
{cmake} Install new version header (asmaloney#198)
Also clean up the extra paths in subdirectories - we don't need them anymore.
1 parent c5905e1 commit c0e1691

File tree

3 files changed

+73
-73
lines changed

3 files changed

+73
-73
lines changed

‎extern/CRCpp/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ target_compile_definitions( ${PROJECT_NAME}
1111

1212
target_sources( ${PROJECT_NAME}
1313
PRIVATE
14-
${CMAKE_CURRENT_LIST_DIR}/inc/CRC.h
14+
inc/CRC.h
1515
)
1616

1717
target_include_directories( ${PROJECT_NAME}
1818
PRIVATE
19-
${CMAKE_CURRENT_LIST_DIR}/inc
19+
inc
2020
)

‎include/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
target_sources( ${PROJECT_NAME}
55
PRIVATE
6-
${CMAKE_CURRENT_LIST_DIR}/E57Exception.h
7-
${CMAKE_CURRENT_LIST_DIR}/E57Format.h
8-
${CMAKE_CURRENT_LIST_DIR}/E57SimpleData.h
9-
${CMAKE_CURRENT_LIST_DIR}/E57SimpleReader.h
10-
${CMAKE_CURRENT_LIST_DIR}/E57SimpleWriter.h
6+
E57Exception.h
7+
E57Format.h
8+
E57SimpleData.h
9+
E57SimpleReader.h
10+
E57SimpleWriter.h
1111
E57Version.h
1212
)
1313

@@ -18,6 +18,7 @@ install(
1818
E57SimpleData.h
1919
E57SimpleReader.h
2020
E57SimpleWriter.h
21+
E57Version.h
2122
DESTINATION
2223
include/E57Format
2324
)
@@ -27,4 +28,3 @@ target_include_directories( ${PROJECT_NAME}
2728
$<INSTALL_INTERFACE:include/E57Format>
2829
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
2930
)
30-

‎src/CMakeLists.txt

+65-65
Original file line numberDiff line numberDiff line change
@@ -4,72 +4,72 @@
44
target_sources( E57Format
55
PRIVATE
66
ASTMVersion.h
7-
${CMAKE_CURRENT_LIST_DIR}/BlobNode.cpp
8-
${CMAKE_CURRENT_LIST_DIR}/BlobNodeImpl.h
9-
${CMAKE_CURRENT_LIST_DIR}/BlobNodeImpl.cpp
10-
${CMAKE_CURRENT_LIST_DIR}/CheckedFile.h
11-
${CMAKE_CURRENT_LIST_DIR}/CheckedFile.cpp
12-
${CMAKE_CURRENT_LIST_DIR}/Common.h
13-
${CMAKE_CURRENT_LIST_DIR}/Common.cpp
14-
${CMAKE_CURRENT_LIST_DIR}/CompressedVectorNode.cpp
15-
${CMAKE_CURRENT_LIST_DIR}/CompressedVectorNodeImpl.h
16-
${CMAKE_CURRENT_LIST_DIR}/CompressedVectorNodeImpl.cpp
17-
${CMAKE_CURRENT_LIST_DIR}/CompressedVectorReader.cpp
18-
${CMAKE_CURRENT_LIST_DIR}/CompressedVectorReaderImpl.h
19-
${CMAKE_CURRENT_LIST_DIR}/CompressedVectorReaderImpl.cpp
20-
${CMAKE_CURRENT_LIST_DIR}/CompressedVectorWriter.cpp
21-
${CMAKE_CURRENT_LIST_DIR}/CompressedVectorWriterImpl.h
22-
${CMAKE_CURRENT_LIST_DIR}/CompressedVectorWriterImpl.cpp
23-
${CMAKE_CURRENT_LIST_DIR}/DecodeChannel.h
24-
${CMAKE_CURRENT_LIST_DIR}/DecodeChannel.cpp
25-
${CMAKE_CURRENT_LIST_DIR}/Decoder.h
26-
${CMAKE_CURRENT_LIST_DIR}/Decoder.cpp
27-
${CMAKE_CURRENT_LIST_DIR}/Encoder.h
28-
${CMAKE_CURRENT_LIST_DIR}/Encoder.cpp
29-
${CMAKE_CURRENT_LIST_DIR}/FloatNode.cpp
30-
${CMAKE_CURRENT_LIST_DIR}/FloatNodeImpl.h
31-
${CMAKE_CURRENT_LIST_DIR}/FloatNodeImpl.cpp
32-
${CMAKE_CURRENT_LIST_DIR}/ImageFile.cpp
33-
${CMAKE_CURRENT_LIST_DIR}/ImageFileImpl.h
34-
${CMAKE_CURRENT_LIST_DIR}/ImageFileImpl.cpp
35-
${CMAKE_CURRENT_LIST_DIR}/IntegerNode.cpp
36-
${CMAKE_CURRENT_LIST_DIR}/IntegerNodeImpl.h
37-
${CMAKE_CURRENT_LIST_DIR}/IntegerNodeImpl.cpp
38-
${CMAKE_CURRENT_LIST_DIR}/Node.cpp
39-
${CMAKE_CURRENT_LIST_DIR}/NodeImpl.h
40-
${CMAKE_CURRENT_LIST_DIR}/NodeImpl.cpp
41-
${CMAKE_CURRENT_LIST_DIR}/Packet.h
42-
${CMAKE_CURRENT_LIST_DIR}/Packet.cpp
43-
${CMAKE_CURRENT_LIST_DIR}/ReaderImpl.h
44-
${CMAKE_CURRENT_LIST_DIR}/ReaderImpl.cpp
45-
${CMAKE_CURRENT_LIST_DIR}/ScaledIntegerNode.cpp
46-
${CMAKE_CURRENT_LIST_DIR}/ScaledIntegerNodeImpl.h
47-
${CMAKE_CURRENT_LIST_DIR}/ScaledIntegerNodeImpl.cpp
48-
${CMAKE_CURRENT_LIST_DIR}/SectionHeaders.h
49-
${CMAKE_CURRENT_LIST_DIR}/SectionHeaders.cpp
50-
${CMAKE_CURRENT_LIST_DIR}/SourceDestBuffer.cpp
51-
${CMAKE_CURRENT_LIST_DIR}/SourceDestBufferImpl.h
52-
${CMAKE_CURRENT_LIST_DIR}/SourceDestBufferImpl.cpp
53-
${CMAKE_CURRENT_LIST_DIR}/StringNode.cpp
54-
${CMAKE_CURRENT_LIST_DIR}/StringFunctions.h
55-
${CMAKE_CURRENT_LIST_DIR}/StringFunctions.cpp
56-
${CMAKE_CURRENT_LIST_DIR}/StringNodeImpl.h
57-
${CMAKE_CURRENT_LIST_DIR}/StringNodeImpl.cpp
58-
${CMAKE_CURRENT_LIST_DIR}/StructureNode.cpp
59-
${CMAKE_CURRENT_LIST_DIR}/StructureNodeImpl.h
60-
${CMAKE_CURRENT_LIST_DIR}/StructureNodeImpl.cpp
61-
${CMAKE_CURRENT_LIST_DIR}/VectorNode.cpp
62-
${CMAKE_CURRENT_LIST_DIR}/VectorNodeImpl.h
63-
${CMAKE_CURRENT_LIST_DIR}/VectorNodeImpl.cpp
64-
${CMAKE_CURRENT_LIST_DIR}/WriterImpl.h
65-
${CMAKE_CURRENT_LIST_DIR}/WriterImpl.cpp
66-
${CMAKE_CURRENT_LIST_DIR}/E57Exception.cpp
67-
${CMAKE_CURRENT_LIST_DIR}/E57SimpleData.cpp
68-
${CMAKE_CURRENT_LIST_DIR}/E57SimpleReader.cpp
69-
${CMAKE_CURRENT_LIST_DIR}/E57SimpleWriter.cpp
7+
BlobNode.cpp
8+
BlobNodeImpl.h
9+
BlobNodeImpl.cpp
10+
CheckedFile.h
11+
CheckedFile.cpp
12+
Common.h
13+
Common.cpp
14+
CompressedVectorNode.cpp
15+
CompressedVectorNodeImpl.h
16+
CompressedVectorNodeImpl.cpp
17+
CompressedVectorReader.cpp
18+
CompressedVectorReaderImpl.h
19+
CompressedVectorReaderImpl.cpp
20+
CompressedVectorWriter.cpp
21+
CompressedVectorWriterImpl.h
22+
CompressedVectorWriterImpl.cpp
23+
DecodeChannel.h
24+
DecodeChannel.cpp
25+
Decoder.h
26+
Decoder.cpp
27+
Encoder.h
28+
Encoder.cpp
29+
FloatNode.cpp
30+
FloatNodeImpl.h
31+
FloatNodeImpl.cpp
32+
ImageFile.cpp
33+
ImageFileImpl.h
34+
ImageFileImpl.cpp
35+
IntegerNode.cpp
36+
IntegerNodeImpl.h
37+
IntegerNodeImpl.cpp
38+
Node.cpp
39+
NodeImpl.h
40+
NodeImpl.cpp
41+
Packet.h
42+
Packet.cpp
43+
ReaderImpl.h
44+
ReaderImpl.cpp
45+
ScaledIntegerNode.cpp
46+
ScaledIntegerNodeImpl.h
47+
ScaledIntegerNodeImpl.cpp
48+
SectionHeaders.h
49+
SectionHeaders.cpp
50+
SourceDestBuffer.cpp
51+
SourceDestBufferImpl.h
52+
SourceDestBufferImpl.cpp
53+
StringNode.cpp
54+
StringFunctions.h
55+
StringFunctions.cpp
56+
StringNodeImpl.h
57+
StringNodeImpl.cpp
58+
StructureNode.cpp
59+
StructureNodeImpl.h
60+
StructureNodeImpl.cpp
61+
VectorNode.cpp
62+
VectorNodeImpl.h
63+
VectorNodeImpl.cpp
64+
WriterImpl.h
65+
WriterImpl.cpp
66+
E57Exception.cpp
67+
E57SimpleData.cpp
68+
E57SimpleReader.cpp
69+
E57SimpleWriter.cpp
7070
E57Version.cpp
71-
${CMAKE_CURRENT_LIST_DIR}/E57XmlParser.cpp
72-
${CMAKE_CURRENT_LIST_DIR}/E57XmlParser.h
71+
E57XmlParser.cpp
72+
E57XmlParser.h
7373
)
7474

7575
target_include_directories( E57Format

0 commit comments

Comments
 (0)