[pkg-d-commits] [ldc] 12/211: Move ldc-profdata source into the tools directory.

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to annotated tag v1.1.0
in repository ldc.

commit 8b0a0e42eff99aafdaebf51d176f1bcd078f395b
Author: Johan Engelen <jbc.engelen at gmail.com>
Date:   Thu Sep 15 20:25:27 2016 +0200

    Move ldc-profdata source into the tools directory.
---
 tools/CMakeLists.txt                                | 19 +++++++++++++++++--
 {utils => tools/ldc-profdata}/llvm-profdata-3.7.cpp |  0
 {utils => tools/ldc-profdata}/llvm-profdata-3.8.cpp |  0
 {utils => tools/ldc-profdata}/llvm-profdata-3.9.cpp |  0
 {utils => tools/ldc-profdata}/llvm-profdata-4.0.cpp |  0
 utils/CMakeLists.txt                                | 15 ---------------
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index a78132a..fe75214 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -28,6 +28,7 @@ function(build_d_tool output_exe compiler_args linker_args compile_deps link_dep
     )
 endfunction()
 
+#############################################################################
 # Build ldc-prune-cache
 add_custom_target(${LDCPRUNECACHE_EXE} ALL DEPENDS ${LDCPRUNECACHE_EXE_FULL})
 set(LDCPRUNECACHE_D_SRC
@@ -41,6 +42,20 @@ build_d_tool(
     "${LDCPRUNECACHE_D_SRC}"
     ""
 )
-
-# Install the tools
 install(PROGRAMS ${LDCPRUNECACHE_EXE_FULL} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+
+#############################################################################
+# Build ldc-profdata for converting profile data formats (source version depends on LLVM version)
+set(LDCPROFDATA_SRC ldc-profdata/llvm-profdata-${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.cpp)
+if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LDCPROFDATA_SRC})
+    add_executable(ldc-profdata ${LDCPROFDATA_SRC})
+    set_target_properties(
+        ldc-profdata PROPERTIES
+        OUTPUT_NAME "${LDCPROFDATA_EXE_NAME}"
+        RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin
+        COMPILE_FLAGS "${LLVM_CXXFLAGS} ${LDC_CXXFLAGS}"
+        LINK_FLAGS "${SANITIZE_LDFLAGS}"
+    )
+    target_link_libraries(ldc-profdata  ${LLVM_LIBRARIES} ${TERMINFO_LIBS} ${CMAKE_DL_LIBS} ${LLVM_LDFLAGS})
+    install(TARGETS ${LDCPROFDATA_EXE} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+endif()
diff --git a/utils/llvm-profdata-3.7.cpp b/tools/ldc-profdata/llvm-profdata-3.7.cpp
similarity index 100%
rename from utils/llvm-profdata-3.7.cpp
rename to tools/ldc-profdata/llvm-profdata-3.7.cpp
diff --git a/utils/llvm-profdata-3.8.cpp b/tools/ldc-profdata/llvm-profdata-3.8.cpp
similarity index 100%
rename from utils/llvm-profdata-3.8.cpp
rename to tools/ldc-profdata/llvm-profdata-3.8.cpp
diff --git a/utils/llvm-profdata-3.9.cpp b/tools/ldc-profdata/llvm-profdata-3.9.cpp
similarity index 100%
rename from utils/llvm-profdata-3.9.cpp
rename to tools/ldc-profdata/llvm-profdata-3.9.cpp
diff --git a/utils/llvm-profdata-4.0.cpp b/tools/ldc-profdata/llvm-profdata-4.0.cpp
similarity index 100%
rename from utils/llvm-profdata-4.0.cpp
rename to tools/ldc-profdata/llvm-profdata-4.0.cpp
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index fca44b1..36212b5 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -51,18 +51,3 @@ set_target_properties(
     LINK_FLAGS "${SANITIZE_LDFLAGS}"
 )
 target_link_libraries(not  ${LLVM_LIBRARIES} ${TERMINFO_LIBS} ${CMAKE_DL_LIBS} ${LLVM_LDFLAGS})
-
-# Build ldc-profdata for converting profile data formats (source version depends on LLVM version)
-set(LDCPROFDATA_SRC llvm-profdata-${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.cpp)
-if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LDCPROFDATA_SRC})
-    add_executable(ldc-profdata ${LDCPROFDATA_SRC})
-    set_target_properties(
-        ldc-profdata PROPERTIES
-        OUTPUT_NAME "${LDCPROFDATA_EXE_NAME}"
-        RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin
-        COMPILE_FLAGS "${LLVM_CXXFLAGS} ${LDC_CXXFLAGS}"
-        LINK_FLAGS "${SANITIZE_LDFLAGS}"
-    )
-    target_link_libraries(ldc-profdata  ${LLVM_LIBRARIES} ${TERMINFO_LIBS} ${CMAKE_DL_LIBS} ${LLVM_LDFLAGS})
-    install(TARGETS ${LDCPROFDATA_EXE} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-endif()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git