Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/CMakeLists.txt b/CMakeLists.txt
- index a30019d..eb83eb8 100644
- --- a/CMakeLists.txt
- +++ b/CMakeLists.txt
- @@ -35,11 +35,11 @@ if(BUILDING_IN_SOURCE)
- )
- endif()
- -if(WIN32 AND NOT MSVC)
- - message(FATAL_ERROR
- - "Under Windows other compiler than Microsoft Visual Studio are not supported."
- - )
- -endif()
- +#if(WIN32 AND NOT MSVC)
- +# message(FATAL_ERROR
- +# "Under Windows other compiler than Microsoft Visual Studio are not supported."
- +# )
- +#endif()
- find_package(Platform REQUIRED)
- find_package(Git)
- diff --git a/dep/ACE_wrappers/CMakeLists.txt b/dep/ACE_wrappers/CMakeLists.txt
- index 42205c0..de7a1e4 100644
- --- a/dep/ACE_wrappers/CMakeLists.txt
- +++ b/dep/ACE_wrappers/CMakeLists.txt
- @@ -22,39 +22,6 @@ if(WIN32)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ace/config.h.win ${CMAKE_CURRENT_SOURCE_DIR}/ace/config.h)
- endif()
- -if(WIN32 AND MSVC)
- - # VS100 uses MSBuild.exe instead of devenv.com, so force it to use devenv.com
- - if(VS100_FOUND)
- - set(ACE_BUILD_TOOL ${VS100_DIR}/devenv.com)
- - else()
- - set(ACE_BUILD_TOOL ${CMAKE_BUILD_TOOL})
- - endif()
- -
- - if(PLATFORM MATCHES X86)
- - set(ACE_CONFIGURATION Win32)
- - else()
- - set(ACE_CONFIGURATION x64)
- - endif()
- -
- - ExternalProject_Add(ACE_Project
- - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
- - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}
- - INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
- - DOWNLOAD_COMMAND ""
- - CONFIGURE_COMMAND ""
- - BUILD_COMMAND ""
- - INSTALL_COMMAND ""
- - )
- - ExternalProject_Add_Step(ACE_Project ACE_Upgrade
- - COMMAND ${ACE_BUILD_TOOL} <SOURCE_DIR>\\ace\\ace_vc8.sln /upgrade
- - ALWAYS 0
- - )
- - ExternalProject_Add_Step(ACE_Project ACE_Build
- - DEPENDEES ACE_Upgrade
- - COMMAND ${ACE_BUILD_TOOL} <SOURCE_DIR>\\ace\\ace_vc8.sln /project ACE /build ${CMAKE_BUILD_TYPE}|${ACE_CONFIGURATION}
- - ALWAYS 0
- - )
- -elseif(UNIX)
- if(CMAKE_BUILD_TOOL MATCHES "/gmake")
- set(ACE_BUILD_TOOL gmake)
- else()
- @@ -70,8 +37,3 @@ elseif(UNIX)
- BUILD_COMMAND ${ACE_BUILD_TOOL} -j2 # export arch="ia32" &&
- INSTALL_COMMAND ${ACE_BUILD_TOOL} install
- )
- -else()
- - message(FATAL_ERROR
- - "This script doesn't support your system configuration to compile/install ACE."
- - )
- -endif()
- diff --git a/dep/tbb/CMakeLists.txt b/dep/tbb/CMakeLists.txt
- index c7ff095..b28820e 100644
- --- a/dep/tbb/CMakeLists.txt
- +++ b/dep/tbb/CMakeLists.txt
- @@ -18,41 +18,6 @@
- include(ExternalProject)
- -if(WIN32 AND MSVC)
- - # VS100 uses MSBuild.exe instead of devenv.com, so force it to use devenv.com
- - if(VS100_FOUND)
- - set(TBB_BUILD_TOOL ${VS100_DIR}/devenv.com)
- - set(TBB_SOURCE <SOURCE_DIR>\\build\\vs100project)
- - else()
- - set(TBB_BUILD_TOOL ${CMAKE_BUILD_TOOL})
- - set(TBB_SOURCE <SOURCE_DIR>\\build\\vsproject)
- - endif()
- -
- - if(PLATFORM MATCHES X86)
- - set(TBB_CONFIGURATION Win32)
- - else()
- - set(TBB_CONFIGURATION x64)
- - endif()
- -
- - ExternalProject_Add(TBB_Project
- - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
- - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}
- - DOWNLOAD_COMMAND ""
- - CONFIGURE_COMMAND ""
- - BUILD_COMMAND ""
- - INSTALL_COMMAND ""
- - )
- - ExternalProject_Add_Step(TBB_Project TBB_Upgrade
- - COMMAND ${TBB_BUILD_TOOL} ${TBB_SOURCE}\\makefile.sln /upgrade
- - ALWAYS 0
- - )
- - ExternalProject_Add_Step(TBB_Project TBB_Build
- - DEPENDEES TBB_Upgrade
- - COMMAND ${TBB_BUILD_TOOL} ${TBB_SOURCE}\\makefile.sln /project tbb /build ${CMAKE_BUILD_TYPE}|${TBB_CONFIGURATION}
- - COMMAND ${TBB_BUILD_TOOL} ${TBB_SOURCE}\\makefile.sln /project tbbmalloc /build ${CMAKE_BUILD_TYPE}|${TBB_CONFIGURATION}
- - ALWAYS 0
- - )
- -elseif(UNIX)
- if(APPLE)
- 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)
- else()
- @@ -75,8 +40,3 @@ elseif(UNIX)
- BUILD_COMMAND ${TBB_BUILD_TOOL} -j2 -C <SOURCE_DIR> # export arch="ia32" &&
- INSTALL_COMMAND ${APPLE_BUILD}
- )
- -else()
- - message(FATAL_ERROR
- - "This script doesn't support your system configuration to compile/install TBB."
- - )
- -endif()
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement