Skip to content

Commit 2ba575d

Browse files
Link code for nxtranslate as objects
Update #431
1 parent 122a854 commit 2ba575d

10 files changed

Lines changed: 18 additions & 42 deletions

File tree

applications/NXtranslate/CMakeLists.txt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,18 @@ set(SOURCES attr.cpp
6868
xml_util.cpp
6969
dynamic_retriever.cpp)
7070

71-
add_executable(nxtranslate ${SOURCES})
71+
add_executable(nxtranslate ${SOURCES} $<TARGET_OBJECTS:BinaryRetriever>
72+
$<TARGET_OBJECTS:TextCollist>
73+
$<TARGET_OBJECTS:TextPlain>
74+
$<TARGET_OBJECTS:TextXML>
75+
$<TARGET_OBJECTS:SNShistogram>
76+
$<TARGET_OBJECTS:FRM2>
77+
$<TARGET_OBJECTS:Loopy>
78+
$<TARGET_OBJECTS:Spec>
79+
$<TARGET_OBJECTS:Edf>)
7280

7381
target_link_libraries(nxtranslate
7482
NeXus_Shared_Library
75-
BinaryRetriever
76-
TextCollist
77-
TextPlain
78-
TextXML
79-
SNShistogram
80-
FRM2
81-
Loopy
82-
Spec
83-
Edf
8483
${LIBXML2_LIBRARIES})
8584

8685

applications/NXtranslate/FRM2/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,4 @@
2828

2929
include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
3030

31-
add_library (FRM2 frm2_retriever.cpp)
32-
33-
install (TARGETS FRM2 DESTINATION ${CMAKE_INSTALL_LIBDIR}
34-
COMPONENT Runtime)
31+
add_library (FRM2 OBJECT frm2_retriever.cpp)

applications/NXtranslate/binary/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@
2828

2929
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..")
3030

31-
add_library (BinaryRetriever BinaryRetriever.cpp)
31+
add_library (BinaryRetriever OBJECT BinaryRetriever.cpp)

applications/NXtranslate/esrf_edf/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,5 @@
2828

2929
include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
3030

31-
add_library (Edf edf_reader.cpp edf_retriever.cpp)
31+
add_library (Edf OBJECT edf_reader.cpp edf_retriever.cpp)
3232

33-
install (TARGETS Edf DESTINATION ${CMAKE_INSTALL_LIBDIR}
34-
COMPONENT Runtime)

applications/NXtranslate/loopy/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,4 @@
2828

2929
include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
3030

31-
add_library (Loopy retriever.cpp)
32-
33-
install (TARGETS Loopy DESTINATION ${CMAKE_INSTALL_LIBDIR}
34-
COMPONENT Runtime)
31+
add_library (Loopy OBJECT retriever.cpp)

applications/NXtranslate/sns_histogram/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,5 @@
2828

2929
include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
3030

31-
add_library (SNShistogram string_location_format.cpp
31+
add_library (SNShistogram OBJECT string_location_format.cpp
3232
SNS_retriever.cpp)
33-
34-
install (TARGETS SNShistogram DESTINATION ${CMAKE_INSTALL_LIBDIR}
35-
COMPONENT Runtime)

applications/NXtranslate/spec/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,4 @@
2828

2929
include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
3030

31-
add_library (Spec SPEClib.cpp spec_retriever.cpp)
32-
33-
install (TARGETS Spec DESTINATION ${CMAKE_INSTALL_LIBDIR}
34-
COMPONENT Runtime)
31+
add_library (Spec OBJECT SPEClib.cpp spec_retriever.cpp)

applications/NXtranslate/text_collist/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,4 @@
2828

2929
include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
3030

31-
add_library(TextCollist collist_retriever.cpp)
32-
33-
install (TARGETS TextCollist DESTINATION ${CMAKE_INSTALL_LIBDIR}
34-
COMPONENT Runtime)
31+
add_library(TextCollist OBJECT collist_retriever.cpp)

applications/NXtranslate/text_plain/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,4 @@
2828

2929
include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
3030

31-
add_library (TextPlain retriever.cpp)
32-
33-
install (TARGETS TextPlain DESTINATION ${CMAKE_INSTALL_LIBDIR}
34-
COMPONENT Runtime)
31+
add_library (TextPlain OBJECT retriever.cpp)

applications/NXtranslate/text_xml/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828

2929
include_directories("${CMAKE_CURRENT_SOURCE_DIR}" ${LIBXML2_INCLUDE_DIR})
3030

31-
add_library (TextXML xml_retriever.cpp
31+
add_library (TextXML OBJECT xml_retriever.cpp
3232
xml_retriever_dom.cpp
3333
void_copy.cpp)
34-
35-
install (TARGETS TextXML DESTINATION ${CMAKE_INSTALL_LIBDIR}
36-
COMPONENT Runtime)

0 commit comments

Comments
 (0)