Merge branch 'shared'

boost-cmake · Oct 10, 2017 · ee5272f · ee5272f
2 parents b6f2a4b + 29b1c30
commit ee5272f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/share/bcm/cmake/BCMFuture.cmake b/share/bcm/cmake/BCMFuture.cmake
@@ -47,17 +47,17 @@ macro(bcm_shadow_exists OUT TARGET)
         set(${OUT} "0")
     endif()
 endmacro()
-
+# Emulate rpath for windows
 if(WIN32)
     if(NOT COMMAND bcm_add_rpath)
         foreach(CONFIG ${CMAKE_CONFIGURATION_TYPES} "")
-            file(WRITE ${CMAKE_BINARY_DIR}/bcm_set_rpath_pre-${CONFIG}.cmake "")
+            file(WRITE ${CMAKE_BINARY_DIR}/bcm_set_rpath_pre-${CONFIG}.cmake "set(RPATH)\n")
             file(GENERATE OUTPUT ${CMAKE_BINARY_DIR}/bcm_set_rpath-${CONFIG}.cmake INPUT ${CMAKE_BINARY_DIR}/bcm_set_rpath_pre-${CONFIG}.cmake CONDITION $<CONFIG:${CONFIG}>)
         endforeach()
         function(bcm_add_rpath)
-            foreach(RPATH ${ARGN})
+            foreach(_RPATH ${ARGN})
                 foreach(CONFIG ${CMAKE_CONFIGURATION_TYPES} "")
-                    file(APPEND ${CMAKE_BINARY_DIR}/bcm_set_rpath_pre-${CONFIG}.cmake "set(ENV{PATH} \"${RPATH};\$ENV{PATH}\")\n")
+                    file(APPEND ${CMAKE_BINARY_DIR}/bcm_set_rpath_pre-${CONFIG}.cmake "list(APPEND RPATH \"${_RPATH}\")\n")
                 endforeach()
             endforeach()
         endfunction()

diff --git a/share/bcm/cmake/BCMTest.cmake b/share/bcm/cmake/BCMTest.cmake
@@ -121,6 +121,15 @@ function(bcm_test)
             foreach(CONFIG ${CMAKE_CONFIGURATION_TYPES} "")
                 file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PARSE_NAME}-test-run-${CONFIG}.cmake CONTENT "
 include(\"${CMAKE_BINARY_DIR}/bcm_set_rpath-$<CONFIG>.cmake\")
+if(CMAKE_CROSSCOMPILING)
+foreach(RP \${RPATH})
+    execute_process(COMMAND winepath -w \${RP} OUTPUT_VARIABLE _RPATH)
+    string(STRIP \"\${_RPATH}\" _RPATH)
+    set(ENV{WINEPATH} \"\${_RPATH};\$ENV{WINEPATH}\")
+endforeach()
+else()
+set(ENV{PATH} \"\${RPATH};\$ENV{PATH}\")
+endif()
 execute_process(
     COMMAND $<TARGET_FILE:${PARSE_NAME}> ${PARSE_ARGS} 
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 
@@ -130,8 +139,7 @@ if(NOT RESULT EQUAL 0)
 endif()
 " CONDITION $<CONFIG:${CONFIG}>)
             endforeach()
-            add_test(NAME ${PARSE_NAME} COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${PARSE_NAME}-test-run-$<CONFIG>.cmake)
-            # add_test(NAME ${PARSE_NAME} WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} COMMAND ${PARSE_NAME}${CMAKE_EXECUTABLE_SUFFIX} ${PARSE_ARGS})
+            add_test(NAME ${PARSE_NAME} COMMAND ${CMAKE_COMMAND} -DCMAKE_CROSSCOMPILING=${CMAKE_CROSSCOMPILING} -P ${CMAKE_CURRENT_BINARY_DIR}/${PARSE_NAME}-test-run-$<CONFIG>.cmake)
         else()
             add_test(NAME ${PARSE_NAME} COMMAND ${PARSE_NAME} ${PARSE_ARGS} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
         endif()