From c4bec199e8221352c6b9dba8d29ac1613cbb13d7 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 15 Feb 2012 15:43:37 +0100 Subject: [PATCH] Make only dll for windows --- buildtools/Cmake/MakeLibWin.cmake | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/buildtools/Cmake/MakeLibWin.cmake b/buildtools/Cmake/MakeLibWin.cmake index 27f7216c24..7715f97512 100644 --- a/buildtools/Cmake/MakeLibWin.cmake +++ b/buildtools/Cmake/MakeLibWin.cmake @@ -1,16 +1,13 @@ ### Make Libs #>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32 -add_library(simgrid STATIC ${simgrid_sources}) -add_library(simgrid_shared SHARED ${simgrid_sources}) -add_library(gras STATIC ${gras_sources}) +add_library(simgrid SHARED ${simgrid_sources}) +add_library(gras SHARED ${gras_sources}) -set_target_properties(gras PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC -DDLL_STATIC" VERSION ${libgras_version} OUTPUT_NAME "gras") -set_target_properties(simgrid PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC -DDLL_STATIC" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid") -set_target_properties(simgrid_shared PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid_shared") +set_target_properties(gras PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libgras_version} OUTPUT_NAME "gras") +set_target_properties(simgrid PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid") set(GRAS_DEP "ws2_32 -lpthread") -set(SIMGRID_DEP "ws2_32 -lpcre -lpthread") -set(SIMGRID_SHARED_DEP "ws2_32 -lpthread") +set(SIMGRID_DEP "ws2_32 -lpthread") if(ARCH_32_BITS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486") @@ -19,12 +16,11 @@ else(ARCH_32_BITS) endif(ARCH_32_BITS) target_link_libraries(gras ${GRAS_DEP}) -target_link_libraries(simgrid ${SIMGRID_DEP}) -target_link_libraries(simgrid_shared ${SIMGRID_SHARED_DEP} ${PATH_PCRE_LIB}) +target_link_libraries(simgrid ${SIMGRID_DEP} ${PATH_PCRE_LIB}) find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS) message(STATUS "pexports: ${PEXPORTS_PATH}") if(PEXPORTS_PATH) -add_custom_command(TARGET simgrid_shared POST_BUILD -COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid_shared.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid_shared.ref) +add_custom_command(TARGET simgrid POST_BUILD +COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid.ref) endif(PEXPORTS_PATH) \ No newline at end of file -- 2.20.1