[nifi-minifi-cpp] branch master updated: MINIFICPP-787: Add temporary work around to avoid using command line tools to inject this

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aldrin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git


The following commit(s) were added to refs/heads/master by this push:
     new cf25df9  MINIFICPP-787: Add temporary work around to avoid using command line tools to inject this
cf25df9 is described below

commit cf25df9236d075bc70addcbbc97c8351a8bf535f
Author: Marc Parisi <ph...@apache.org>
AuthorDate: Fri Mar 22 11:21:16 2019 -0400

    MINIFICPP-787: Add temporary work around to avoid using command line tools to inject this
    
    This closes #521.
    
    Signed-off-by: Aldrin Piri <al...@apache.org>
---
 CMakeLists.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e04fb6..ca384df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -675,10 +675,21 @@ install(FILES LICENSE README.md NOTICE
         DESTINATION .
         COMPONENT bin)
    
+if(WIN32)
+#preference is to use the exe type so that we have a solution that works well for cross compilation
+#but that leaves the onus up to the developer, so until we can automate some of that build let's enforce
+#the exe here temporarily
+#TODO: Remove this and automate this step.
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/main/minifi.exe
+        DESTINATION bin
+        COMPONENT bin)
+else()
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/main/minifi
         DESTINATION bin
         COMPONENT bin)
         
+endif()
+        
 
 if (WIN32)
 set(CPACK_GENERATOR "WIX")