Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Define correctly variables for windows.
[simgrid.git] / buildtools / Cmake / CompleteInFiles.cmake
index 168aff8..d585f96 100644 (file)
@@ -156,7 +156,7 @@ if(enable_ruby)
                                set(RUBY_LIBRARY_NAME ruby)
                        endif(NOT RUBY_LIBRARY_NAME)
                        string(REGEX REPLACE "libruby.*$" "" RUBY_LIBRARY ${RUBY_LIBRARY})
-                       SET(CMAKE_EXE_LINKER_FLAGS "-L${RUBY_LIBRARY}")
+                       SET(CMAKE_EXE_LINKER_FLAGS "-L${RUBY_LIBRARY} ")
                        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${RUBY_CONFIG_INCLUDE_DIR} ") #path to config.h
                        string(COMPARE EQUAL "${RUBY_INCLUDE_DIR}" "${RUBY_CONFIG_INCLUDE_DIR}" operation)
                        if(NOT operation)
@@ -481,7 +481,7 @@ if(HAVE_MAKECONTEXT OR WIN32)
        endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
        
        if(WIN32)
-           set(makecontext_CPPFLAGS_2 "-DWIN32 ${INCLUDES}")
+           set(makecontext_CPPFLAGS_2 "-D_XBT_WIN32 ${INCLUDES}")
        endif(WIN32)
 
        try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR