Skip to content

Commit 631fe23

Browse files
mlangmlang
committed
Move libbraillemusic related files into lib/
1 parent 500bf5b commit 631fe23

40 files changed

+72
-66
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -38,40 +38,8 @@ include_directories(
3838
${Boost_INCLUDE_DIRS}
3939
)
4040

41-
add_library(braillemusic SHARED
42-
text2braille.cpp
43-
brlsym.cpp music.cpp ast.cpp
44-
numbers.cpp key_signature.cpp time_signature.cpp
45-
partial_voice_sign.cpp simile.cpp tuplet_start.cpp
46-
measure.cpp score.cpp
47-
value_disambiguation.cpp value_disambiguator.cpp
48-
lilypond.cpp musicxml.cpp linebreaking.cpp reformat.cpp
49-
)
50-
set_target_properties(braillemusic
51-
PROPERTIES
52-
VERSION ${bmc_VERSION}
53-
SOVERSION ${bmc_VERSION_MAJOR}.${bmc_VERSION_MINOR}
54-
)
55-
target_link_libraries(braillemusic xsdcxx-musicxml Threads::Threads)
56-
target_compile_features(braillemusic PRIVATE cxx_range_for cxx_final)
57-
add_library(braillemusic-static STATIC
58-
text2braille.cpp
59-
brlsym.cpp music.cpp ast.cpp
60-
numbers.cpp key_signature.cpp time_signature.cpp
61-
partial_voice_sign.cpp simile.cpp tuplet_start.cpp
62-
measure.cpp score.cpp
63-
value_disambiguation.cpp value_disambiguator.cpp
64-
lilypond.cpp musicxml.cpp linebreaking.cpp reformat.cpp
65-
)
66-
67-
target_include_directories(braillemusic-static PUBLIC ${Boost_INCLUDE_DIRS})
68-
target_include_directories(braillemusic PUBLIC ${Boost_INCLUDE_DIRS})
41+
add_subdirectory(lib)
6942

70-
71-
target_link_libraries(braillemusic-static
72-
xsdcxx-musicxml-static Threads::Threads
73-
)
74-
target_compile_features(braillemusic-static PRIVATE cxx_final)
7543
add_executable(bmc bmc.cpp)
7644
target_link_libraries(bmc ${Boost_PROGRAM_OPTIONS_LIBRARY} braillemusic-static)
7745
target_compile_features(bmc PRIVATE cxx_range_for cxx_auto_type)
@@ -180,8 +148,6 @@ add_custom_target(check
180148
)
181149

182150
install(TARGETS bmc DESTINATION bin)
183-
install(TARGETS braillemusic DESTINATION lib)
184-
install(DIRECTORY ${bmc_SOURCE_DIR}/include/bmc DESTINATION include/bmc)
185151

186152
find_package(PkgConfig)
187153
# pkg_search_module(CGICC cgicc)

‎spirit/qi/primitive/brl.hpp renamed to ‎include/bmc/braille/parsing/qi/primitive/brl.hpp

File renamed without changes.

‎lib/CMakeLists.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
add_library(braillemusic SHARED
2+
text2braille.cpp
3+
brlsym.cpp music.cpp ast.cpp
4+
numbers.cpp key_signature.cpp time_signature.cpp
5+
partial_voice_sign.cpp simile.cpp tuplet_start.cpp
6+
measure.cpp score.cpp
7+
value_disambiguation.cpp value_disambiguator.cpp
8+
lilypond.cpp musicxml.cpp linebreaking.cpp reformat.cpp
9+
)
10+
set_target_properties(braillemusic
11+
PROPERTIES
12+
VERSION ${bmc_VERSION}
13+
SOVERSION ${bmc_VERSION_MAJOR}.${bmc_VERSION_MINOR}
14+
)
15+
target_link_libraries(braillemusic xsdcxx-musicxml Threads::Threads)
16+
target_compile_features(braillemusic PRIVATE cxx_range_for cxx_final)
17+
add_library(braillemusic-static STATIC
18+
text2braille.cpp
19+
brlsym.cpp music.cpp ast.cpp
20+
numbers.cpp key_signature.cpp time_signature.cpp
21+
partial_voice_sign.cpp simile.cpp tuplet_start.cpp
22+
measure.cpp score.cpp
23+
value_disambiguation.cpp value_disambiguator.cpp
24+
lilypond.cpp musicxml.cpp linebreaking.cpp reformat.cpp
25+
)
26+
target_include_directories(braillemusic-static PUBLIC ${Boost_INCLUDE_DIRS})
27+
target_include_directories(braillemusic PUBLIC ${Boost_INCLUDE_DIRS})
28+
target_link_libraries(braillemusic-static
29+
xsdcxx-musicxml-static Threads::Threads
30+
)
31+
target_compile_features(braillemusic-static PRIVATE cxx_final)
32+
33+
install(TARGETS braillemusic braillemusic-static
34+
ARCHIVE DESTINATION lib COMPONENT Development
35+
LIBRARY DESTINATION lib COMPONENT Development
36+
)
37+
install(DIRECTORY ${bmc_SOURCE_DIR}/include/bmc DESTINATION include)
38+
39+

‎ast.cpp renamed to ‎lib/ast.cpp

File renamed without changes.

‎brlsym.cpp renamed to ‎lib/brlsym.cpp

File renamed without changes.

‎brlsym.hpp renamed to ‎lib/brlsym.hpp

File renamed without changes.

‎key_signature.cpp renamed to ‎lib/key_signature.cpp

File renamed without changes.

‎key_signature_def.hpp renamed to ‎lib/key_signature_def.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
// (see accompanying file LICENSE.txt or copy at
55
// http://www.gnu.org/licenses/gpl-3.0-standalone.html)
66

7-
#include "bmc/braille/parsing/grammar/key_signature.hpp"
7+
#include <bmc/braille/parsing/grammar/key_signature.hpp>
88
#include <boost/spirit/include/qi_core.hpp>
99
#include <boost/spirit/include/qi_attr.hpp>
1010
#include <boost/spirit/include/qi_eps.hpp>
1111
#include <boost/spirit/include/phoenix_core.hpp>
1212
#include <boost/spirit/include/phoenix_operator.hpp>
1313
#include <boost/spirit/include/phoenix_stl.hpp>
1414
#include "brlsym.hpp"
15-
#include "spirit/qi/primitive/brl.hpp"
15+
#include <bmc/braille/parsing/qi/primitive/brl.hpp>
1616

1717
namespace bmc { namespace braille {
1818

‎lilypond.cpp renamed to ‎lib/lilypond.cpp

File renamed without changes.

‎linebreaking.cpp renamed to ‎lib/linebreaking.cpp

File renamed without changes.

‎measure.cpp renamed to ‎lib/measure.cpp

File renamed without changes.

‎measure_def.hpp renamed to ‎lib/measure_def.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
#ifndef BMC_MEASURE_DEF_HPP
88
#define BMC_MEASURE_DEF_HPP
99

10-
#include "bmc/braille/parsing/grammar/measure.hpp"
11-
#include "bmc/braille/ast/fusion_adapt.hpp"
12-
#include "spirit/qi/primitive/brl.hpp"
10+
#include <bmc/braille/parsing/grammar/measure.hpp>
11+
#include <bmc/braille/ast/fusion_adapt.hpp>
12+
#include <bmc/braille/parsing/qi/primitive/brl.hpp>
1313
#include "brlsym.hpp"
14-
#include "bmc/braille/parsing/error_handler.hpp"
15-
#include "bmc/braille/parsing/annotation.hpp"
14+
#include <bmc/braille/parsing/error_handler.hpp>
15+
#include <bmc/braille/parsing/annotation.hpp>
1616
#include <boost/spirit/include/qi_core.hpp>
1717
#include <boost/spirit/include/qi_eol.hpp>
1818
#include <boost/spirit/include/qi_optional.hpp>

‎music.cpp renamed to ‎lib/music.cpp

File renamed without changes.

‎musicxml.cpp renamed to ‎lib/musicxml.cpp

File renamed without changes.

‎numbers.cpp renamed to ‎lib/numbers.cpp

File renamed without changes.

‎numbers_def.hpp renamed to ‎lib/numbers_def.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
// (see accompanying file LICENSE.txt or copy at
55
// http://www.gnu.org/licenses/gpl-3.0-standalone.html)
66

7-
#include "bmc/braille/parsing/grammar/numbers.hpp"
7+
#include <bmc/braille/parsing/grammar/numbers.hpp>
88
#include <boost/spirit/include/qi_core.hpp>
99
#include <boost/spirit/include/qi_attr.hpp>
1010
#include <boost/spirit/include/qi_eps.hpp>
1111
#include <boost/spirit/include/phoenix_core.hpp>
1212
#include <boost/spirit/include/phoenix_operator.hpp>
1313
#include "brlsym.hpp"
14-
#include "spirit/qi/primitive/brl.hpp"
14+
#include <bmc/braille/parsing/qi/primitive/brl.hpp>
1515

1616
namespace bmc { namespace braille {
1717

‎partial_voice_sign.cpp renamed to ‎lib/partial_voice_sign.cpp

File renamed without changes.

‎partial_voice_sign_def.hpp renamed to ‎lib/partial_voice_sign_def.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
#ifndef BMC_PARTIAL_VOICE_SIGN_DEF_HPP
88
#define BMC_PARTIAL_VOICE_SIGN_DEF_HPP
99

10-
#include "bmc/braille/parsing/grammar/partial_voice_sign.hpp"
11-
#include "bmc/braille/ast/fusion_adapt.hpp"
12-
#include "spirit/qi/primitive/brl.hpp"
10+
#include <bmc/braille/parsing/grammar/partial_voice_sign.hpp>
11+
#include <bmc/braille/ast/fusion_adapt.hpp>
12+
#include <bmc/braille/parsing/qi/primitive/brl.hpp>
1313
#include "brlsym.hpp"
14-
#include "bmc/braille/parsing/error_handler.hpp"
15-
#include "bmc/braille/parsing/annotation.hpp"
14+
#include <bmc/braille/parsing/error_handler.hpp>
15+
#include <bmc/braille/parsing/annotation.hpp>
1616
#include <boost/spirit/include/qi_core.hpp>
1717
#include <boost/spirit/include/qi_attr.hpp>
1818
#include <boost/spirit/include/qi_eol.hpp>

‎reformat.cpp renamed to ‎lib/reformat.cpp

File renamed without changes.

‎score.cpp renamed to ‎lib/score.cpp

File renamed without changes.

‎score_def.hpp renamed to ‎lib/score_def.hpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66

77
#ifndef BMC_SCORE_DEF_HPP
88
#define BMC_SCORE_DEF_HPP
9-
#include "bmc/braille/parsing/grammar/score.hpp"
10-
#include "bmc/braille/ast/fusion_adapt.hpp"
11-
#include "bmc/braille/parsing/annotation.hpp"
12-
#include "spirit/qi/primitive/brl.hpp"
9+
10+
#include <bmc/braille/parsing/grammar/score.hpp>
11+
#include <bmc/braille/ast/fusion_adapt.hpp>
12+
#include <bmc/braille/parsing/annotation.hpp>
13+
#include <bmc/braille/parsing/qi/primitive/brl.hpp>
1314
#include "brlsym.hpp"
1415
#include <boost/spirit/include/qi_core.hpp>
1516
#include <boost/spirit/include/qi_eoi.hpp>

‎simile.cpp renamed to ‎lib/simile.cpp

File renamed without changes.

‎simile_def.hpp renamed to ‎lib/simile_def.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
#ifndef BMC_SIMILE_DEF_HPP
88
#define BMC_SIMILE_DEF_HPP
99

10-
#include "bmc/braille/parsing/grammar/simile.hpp"
11-
#include "bmc/braille/ast/fusion_adapt.hpp"
12-
#include "spirit/qi/primitive/brl.hpp"
10+
#include <bmc/braille/parsing/grammar/simile.hpp>
11+
#include <bmc/braille/ast/fusion_adapt.hpp>
12+
#include <bmc/braille/parsing/qi/primitive/brl.hpp>
1313
#include "brlsym.hpp"
14-
#include "bmc/braille/parsing/error_handler.hpp"
15-
#include "bmc/braille/parsing/annotation.hpp"
14+
#include <bmc/braille/parsing/error_handler.hpp>
15+
#include <bmc/braille/parsing/annotation.hpp>
1616
#include <boost/spirit/include/qi_core.hpp>
1717
#include <boost/spirit/include/qi_eps.hpp>
1818
#include <boost/spirit/include/qi_optional.hpp>

‎spirit/detail/info_wchar_t_io.hpp renamed to ‎lib/spirit/detail/info_wchar_t_io.hpp

File renamed without changes.

‎tables/brf.cpp renamed to ‎lib/tables/brf.cpp

File renamed without changes.

‎tables/de.cpp renamed to ‎lib/tables/de.cpp

File renamed without changes.

‎tables/en_CA.cpp renamed to ‎lib/tables/en_CA.cpp

File renamed without changes.

‎tables/en_GB.cpp renamed to ‎lib/tables/en_GB.cpp

File renamed without changes.

‎tables/en_US.cpp renamed to ‎lib/tables/en_US.cpp

File renamed without changes.

‎tables/es.cpp renamed to ‎lib/tables/es.cpp

File renamed without changes.

‎tables/fr_CA.cpp renamed to ‎lib/tables/fr_CA.cpp

File renamed without changes.

‎tables/fr_FR.cpp renamed to ‎lib/tables/fr_FR.cpp

File renamed without changes.

‎text2braille.cpp renamed to ‎lib/text2braille.cpp

File renamed without changes.

‎time_signature.cpp renamed to ‎lib/time_signature.cpp

File renamed without changes.

‎time_signature_def.hpp renamed to ‎lib/time_signature_def.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
// (see accompanying file LICENSE.txt or copy at
55
// http://www.gnu.org/licenses/gpl-3.0-standalone.html)
66

7-
#include "bmc/braille/parsing/grammar/time_signature.hpp"
7+
#include <bmc/braille/parsing/grammar/time_signature.hpp>
88
#include <boost/spirit/include/qi_core.hpp>
99
#include <boost/spirit/include/phoenix_core.hpp>
1010
#include <boost/spirit/include/phoenix_operator.hpp>
1111
#include <boost/spirit/include/phoenix_object.hpp>
1212
#include "brlsym.hpp"
13-
#include "spirit/qi/primitive/brl.hpp"
13+
#include <bmc/braille/parsing/qi/primitive/brl.hpp>
1414

1515
namespace bmc { namespace braille {
1616

‎tuplet_start.cpp renamed to ‎lib/tuplet_start.cpp

File renamed without changes.

‎tuplet_start_def.hpp renamed to ‎lib/tuplet_start_def.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
#ifndef BMC_TUPLET_START_DEF_HPP
88
#define BMC_TUPLET_START_DEF_HPP
99

10-
#include "bmc/braille/parsing/grammar/tuplet_start.hpp"
11-
#include "bmc/braille/ast/fusion_adapt.hpp"
12-
#include "spirit/qi/primitive/brl.hpp"
10+
#include <bmc/braille/parsing/grammar/tuplet_start.hpp>
11+
#include <bmc/braille/ast/fusion_adapt.hpp>
12+
#include <bmc/braille/parsing/qi/primitive/brl.hpp>
1313
#include "brlsym.hpp"
14-
#include "bmc/braille/parsing/error_handler.hpp"
15-
#include "bmc/braille/parsing/annotation.hpp"
14+
#include <bmc/braille/parsing/error_handler.hpp>
15+
#include <bmc/braille/parsing/annotation.hpp>
1616
#include <boost/spirit/include/qi_core.hpp>
1717
#include <boost/spirit/include/phoenix_core.hpp>
1818
#include <boost/spirit/include/phoenix_function.hpp>

‎value_disambiguation.cpp renamed to ‎lib/value_disambiguation.cpp

File renamed without changes.

‎value_disambiguator.cpp renamed to ‎lib/value_disambiguator.cpp

File renamed without changes.

‎test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE(key_signature_grammar_test_3) {
8989
BOOST_CHECK_EQUAL(attribute, -2);
9090
}
9191

92-
#include "spirit/qi/primitive/brl.hpp"
92+
#include "bmc/braille/parsing/qi/primitive/brl.hpp"
9393

9494
BOOST_AUTO_TEST_CASE(brl_parser_test) {
9595
std::wstring const input(L"#A");

0 commit comments

Comments
 (0)