Link code for nxtranslate as objects

Update #431
nexusformat · Jun 2, 2016 · 2ba575d · 2ba575d
1 parent 122a854
commit 2ba575d
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 42 deletions.
diff --git a/applications/NXtranslate/CMakeLists.txt b/applications/NXtranslate/CMakeLists.txt
@@ -68,19 +68,18 @@ set(SOURCES attr.cpp
             xml_util.cpp
             dynamic_retriever.cpp)
 
-add_executable(nxtranslate ${SOURCES})
+add_executable(nxtranslate ${SOURCES} $<TARGET_OBJECTS:BinaryRetriever>
+                                      $<TARGET_OBJECTS:TextCollist>
+                                      $<TARGET_OBJECTS:TextPlain>
+                                      $<TARGET_OBJECTS:TextXML>
+                                      $<TARGET_OBJECTS:SNShistogram>
+                                      $<TARGET_OBJECTS:FRM2>
+                                      $<TARGET_OBJECTS:Loopy>
+                                      $<TARGET_OBJECTS:Spec>
+                                      $<TARGET_OBJECTS:Edf>)
 
 target_link_libraries(nxtranslate
                       NeXus_Shared_Library
-                      BinaryRetriever
-                      TextCollist
-                      TextPlain
-                      TextXML
-                      SNShistogram
-                      FRM2
-                      Loopy
-                      Spec
-                      Edf
                       ${LIBXML2_LIBRARIES})
 
 

diff --git a/applications/NXtranslate/FRM2/CMakeLists.txt b/applications/NXtranslate/FRM2/CMakeLists.txt
@@ -28,7 +28,4 @@
 
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
-add_library (FRM2 frm2_retriever.cpp)
-
-install (TARGETS FRM2 DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT Runtime)
+add_library (FRM2 OBJECT frm2_retriever.cpp)
diff --git a/applications/NXtranslate/binary/CMakeLists.txt b/applications/NXtranslate/binary/CMakeLists.txt
@@ -28,4 +28,4 @@
 
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..")
 
-add_library (BinaryRetriever BinaryRetriever.cpp)
+add_library (BinaryRetriever OBJECT BinaryRetriever.cpp)
diff --git a/applications/NXtranslate/esrf_edf/CMakeLists.txt b/applications/NXtranslate/esrf_edf/CMakeLists.txt
@@ -28,7 +28,5 @@
 
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
-add_library (Edf edf_reader.cpp edf_retriever.cpp)
+add_library (Edf OBJECT edf_reader.cpp edf_retriever.cpp)
 
-install (TARGETS Edf DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT Runtime)
diff --git a/applications/NXtranslate/loopy/CMakeLists.txt b/applications/NXtranslate/loopy/CMakeLists.txt
@@ -28,7 +28,4 @@
 
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
-add_library (Loopy retriever.cpp)
-
-install (TARGETS Loopy DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT Runtime)
+add_library (Loopy OBJECT retriever.cpp)
diff --git a/applications/NXtranslate/sns_histogram/CMakeLists.txt b/applications/NXtranslate/sns_histogram/CMakeLists.txt
@@ -28,8 +28,5 @@
 
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
-add_library (SNShistogram string_location_format.cpp
+add_library (SNShistogram OBJECT string_location_format.cpp
                           SNS_retriever.cpp)
-
-install (TARGETS SNShistogram DESTINATION ${CMAKE_INSTALL_LIBDIR} 
-        COMPONENT Runtime)
diff --git a/applications/NXtranslate/spec/CMakeLists.txt b/applications/NXtranslate/spec/CMakeLists.txt
@@ -28,7 +28,4 @@
 
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
-add_library (Spec SPEClib.cpp spec_retriever.cpp)
-
-install (TARGETS Spec DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT Runtime)
+add_library (Spec OBJECT SPEClib.cpp spec_retriever.cpp)
diff --git a/applications/NXtranslate/text_collist/CMakeLists.txt b/applications/NXtranslate/text_collist/CMakeLists.txt
@@ -28,7 +28,4 @@
 
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
-add_library(TextCollist collist_retriever.cpp)
-
-install (TARGETS TextCollist DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT Runtime)
+add_library(TextCollist OBJECT collist_retriever.cpp)
diff --git a/applications/NXtranslate/text_plain/CMakeLists.txt b/applications/NXtranslate/text_plain/CMakeLists.txt
@@ -28,7 +28,4 @@
 
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
-add_library (TextPlain retriever.cpp)
-
-install (TARGETS TextPlain DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT Runtime)
+add_library (TextPlain OBJECT retriever.cpp)
diff --git a/applications/NXtranslate/text_xml/CMakeLists.txt b/applications/NXtranslate/text_xml/CMakeLists.txt
@@ -28,9 +28,6 @@
 
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}" ${LIBXML2_INCLUDE_DIR})
 
-add_library (TextXML xml_retriever.cpp
+add_library (TextXML OBJECT xml_retriever.cpp
                      xml_retriever_dom.cpp
                      void_copy.cpp)
-
-install (TARGETS TextXML DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT Runtime)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,4 +28,4 @@

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

		add_library (BinaryRetriever BinaryRetriever.cpp)
		add_library (BinaryRetriever OBJECT BinaryRetriever.cpp)