Merge pull request #3412 from NK-Nikunj/cmake_patch

Fixes linking with libhpx_wrap error with BSD and Windows based systems
STEllAR-GROUP · Aug 16, 2018 · 43c0b69 · 43c0b69
2 parents be06a49 + f2dfc99
commit 43c0b69
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cmake/HPX_SetupTarget.cmake b/cmake/HPX_SetupTarget.cmake
@@ -189,10 +189,11 @@ function(hpx_setup_target target)
 
   if(NOT target_NOLIBS)
     if(HPX_WITH_DYNAMIC_HPX_MAIN AND ("${_type}" STREQUAL "EXECUTABLE"))
-      set(hpx_libs hpx_wrap)
       if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+        set(hpx_libs hpx_wrap)
         set_target_properties(${target} PROPERTIES LINK_FLAGS "-Wl,-wrap=main")
       elseif(APPLE)
+        set(hpx_libs hpx_wrap)
         set_target_properties(${target} PROPERTIES LINK_FLAGS "-Wl,-e,_initialize_main")
       endif()
     endif()