From fb6fe389aece888e6bb5da0bdd8d1b5cb871e007 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Tue, 5 Feb 2013 18:27:08 +0100 Subject: [PATCH] small fixes to repair unix build --- src/simix/smx_network.c | 2 +- teshsuite/smpi/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c index 2cd4c1d84a..eb1ee0da9f 100644 --- a/src/simix/smx_network.c +++ b/src/simix/smx_network.c @@ -13,7 +13,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "Logging specific to SIMIX (network)"); static xbt_dict_t rdv_points = NULL; -XBT_PUBLIC(unsigned long int) smx_total_comms = 0; +XBT_EXPORT_NO_IMPORT(unsigned long int) smx_total_comms = 0; static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall); static void SIMIX_comm_copy_data(smx_action_t comm); diff --git a/teshsuite/smpi/CMakeLists.txt b/teshsuite/smpi/CMakeLists.txt index edf684095f..a6a544bbe0 100644 --- a/teshsuite/smpi/CMakeLists.txt +++ b/teshsuite/smpi/CMakeLists.txt @@ -4,7 +4,7 @@ if(enable_smpi) if(WIN32) set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") else() - set(CMAKE_C_COMPILER "sh ${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") + set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") -- 2.20.1