Advertisement
Guest User

Untitled

a guest
Jul 11th, 2012
80
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 4.34 KB | None | 0 0
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index a30019d..eb83eb8 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -35,11 +35,11 @@ if(BUILDING_IN_SOURCE)
  6.    )
  7.  endif()
  8.  
  9. -if(WIN32 AND NOT MSVC)
  10. -  message(FATAL_ERROR
  11. -    "Under Windows other compiler than Microsoft Visual Studio are not supported."
  12. -  )
  13. -endif()
  14. +#if(WIN32 AND NOT MSVC)
  15. +#  message(FATAL_ERROR
  16. +#    "Under Windows other compiler than Microsoft Visual Studio are not supported."
  17. +#  )
  18. +#endif()
  19.  
  20.  find_package(Platform REQUIRED)
  21.  find_package(Git)
  22. diff --git a/dep/ACE_wrappers/CMakeLists.txt b/dep/ACE_wrappers/CMakeLists.txt
  23. index 42205c0..de7a1e4 100644
  24. --- a/dep/ACE_wrappers/CMakeLists.txt
  25. +++ b/dep/ACE_wrappers/CMakeLists.txt
  26. @@ -22,39 +22,6 @@ if(WIN32)
  27.    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ace/config.h.win ${CMAKE_CURRENT_SOURCE_DIR}/ace/config.h)
  28.  endif()
  29.  
  30. -if(WIN32 AND MSVC)
  31. -  # VS100 uses MSBuild.exe instead of devenv.com, so force it to use devenv.com
  32. -  if(VS100_FOUND)
  33. -    set(ACE_BUILD_TOOL ${VS100_DIR}/devenv.com)
  34. -  else()
  35. -    set(ACE_BUILD_TOOL ${CMAKE_BUILD_TOOL})
  36. -  endif()
  37. -
  38. -  if(PLATFORM MATCHES X86)
  39. -    set(ACE_CONFIGURATION Win32)
  40. -  else()
  41. -    set(ACE_CONFIGURATION x64)
  42. -  endif()
  43. -
  44. -  ExternalProject_Add(ACE_Project
  45. -    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
  46. -    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}
  47. -    INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
  48. -    DOWNLOAD_COMMAND ""
  49. -    CONFIGURE_COMMAND ""
  50. -    BUILD_COMMAND ""
  51. -    INSTALL_COMMAND ""
  52. -  )
  53. -  ExternalProject_Add_Step(ACE_Project ACE_Upgrade
  54. -    COMMAND ${ACE_BUILD_TOOL} <SOURCE_DIR>\\ace\\ace_vc8.sln /upgrade
  55. -    ALWAYS 0
  56. -  )
  57. -  ExternalProject_Add_Step(ACE_Project ACE_Build
  58. -    DEPENDEES ACE_Upgrade
  59. -    COMMAND ${ACE_BUILD_TOOL} <SOURCE_DIR>\\ace\\ace_vc8.sln /project ACE /build ${CMAKE_BUILD_TYPE}|${ACE_CONFIGURATION}
  60. -    ALWAYS 0
  61. -  )
  62. -elseif(UNIX)
  63.    if(CMAKE_BUILD_TOOL MATCHES "/gmake")
  64.      set(ACE_BUILD_TOOL gmake)
  65.    else()
  66. @@ -70,8 +37,3 @@ elseif(UNIX)
  67.      BUILD_COMMAND ${ACE_BUILD_TOOL} -j2 # export arch="ia32" &&
  68.      INSTALL_COMMAND ${ACE_BUILD_TOOL} install
  69.    )
  70. -else()
  71. -  message(FATAL_ERROR
  72. -    "This script doesn't support your system configuration to compile/install ACE."
  73. -  )
  74. -endif()
  75. diff --git a/dep/tbb/CMakeLists.txt b/dep/tbb/CMakeLists.txt
  76. index c7ff095..b28820e 100644
  77. --- a/dep/tbb/CMakeLists.txt
  78. +++ b/dep/tbb/CMakeLists.txt
  79. @@ -18,41 +18,6 @@
  80.  
  81.  include(ExternalProject)
  82.  
  83. -if(WIN32 AND MSVC)
  84. -  # VS100 uses MSBuild.exe instead of devenv.com, so force it to use devenv.com
  85. -  if(VS100_FOUND)
  86. -    set(TBB_BUILD_TOOL ${VS100_DIR}/devenv.com)
  87. -    set(TBB_SOURCE <SOURCE_DIR>\\build\\vs100project)
  88. -  else()
  89. -    set(TBB_BUILD_TOOL ${CMAKE_BUILD_TOOL})
  90. -    set(TBB_SOURCE <SOURCE_DIR>\\build\\vsproject)
  91. -  endif()
  92. -
  93. -  if(PLATFORM MATCHES X86)
  94. -    set(TBB_CONFIGURATION Win32)
  95. -  else()
  96. -    set(TBB_CONFIGURATION x64)
  97. -  endif()
  98. -
  99. -  ExternalProject_Add(TBB_Project
  100. -    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
  101. -    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}
  102. -    DOWNLOAD_COMMAND ""
  103. -    CONFIGURE_COMMAND ""
  104. -    BUILD_COMMAND ""
  105. -    INSTALL_COMMAND ""
  106. -  )
  107. -  ExternalProject_Add_Step(TBB_Project TBB_Upgrade
  108. -    COMMAND ${TBB_BUILD_TOOL} ${TBB_SOURCE}\\makefile.sln /upgrade
  109. -    ALWAYS 0
  110. -  )
  111. -  ExternalProject_Add_Step(TBB_Project TBB_Build
  112. -    DEPENDEES TBB_Upgrade
  113. -    COMMAND ${TBB_BUILD_TOOL} ${TBB_SOURCE}\\makefile.sln /project tbb /build ${CMAKE_BUILD_TYPE}|${TBB_CONFIGURATION}
  114. -    COMMAND ${TBB_BUILD_TOOL} ${TBB_SOURCE}\\makefile.sln /project tbbmalloc /build ${CMAKE_BUILD_TYPE}|${TBB_CONFIGURATION}
  115. -    ALWAYS 0
  116. -  )
  117. -elseif(UNIX)
  118.    if(APPLE)
  119.      set(APPLE_BUILD cd <SOURCE_DIR>/build/libs_release && install_name_tool -id "<INSTALL_DIR>/lib/libtbb.dylib" libtbb.dylib && install_name_tool -id "<INSTALL_DIR>/lib/libtbbmalloc.dylib" libtbbmalloc.dylib && cd <SOURCE_DIR>/build/libs_debug && install_name_tool -id "<INSTALL_DIR>/lib/libtbb_debug.dylib" libtbb_debug.dylib && install_name_tool -id "<INSTALL_DIR>/lib/libtbbmalloc_debug.dylib" libtbbmalloc_debug.dylib)
  120.    else()
  121. @@ -75,8 +40,3 @@ elseif(UNIX)
  122.      BUILD_COMMAND ${TBB_BUILD_TOOL} -j2 -C <SOURCE_DIR> # export arch="ia32" &&
  123.      INSTALL_COMMAND ${APPLE_BUILD}
  124.    )
  125. -else()
  126. -  message(FATAL_ERROR
  127. -    "This script doesn't support your system configuration to compile/install TBB."
  128. -  )
  129. -endif()
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement