1
0
Fork 0

Back to OSX for tests

This commit is contained in:
Kaveh Vahedipour 2016-02-08 22:30:11 +01:00
parent 7ca6de6075
commit 1a368e1ce3
3 changed files with 77 additions and 15 deletions

View File

@ -71,13 +71,13 @@ endif()
include(ExternalProject)
set (V8_BUILD_COMMAND make -j8 -f Makefile-v8 strictaliasing=off snapshot=off werror=no "${V8_PLATFORM}" CC="${CMAKE_C_COMPILER}" CXX="${CMAKE_CXX_COMPILER}")
if (DARWIN)
set (V8_BUILD_COMMAND "${V8_BUILD_COMMAND}" CXXFLAGS=-stdlib=libc++)
if (APPLE AND CMAKE_COMPILER_IS_CLANG)
set (V8_BUILD_COMMAND "${V8_BUILD_COMMAND}" CXXFLAGS=-stdlib=libc++)
endif()
ExternalProject_Add(v8_build
SOURCE_DIR "${V8_DIR}"
BUILD_IN_SOURCE TRUE
BUILD_COMMAND ${V8_BUILD_COMMAND}
BUILD_COMMAND "${V8_BUILD_COMMAND}"
INSTALL_COMMAND ""
)

View File

@ -1,29 +1,35 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.2
# Generated by "Unix Makefiles" Generator, CMake Version 3.4
# Default target executed when no arguments are given to make.
default_target: all
.PHONY : default_target
# Allow only one "make -f Makefile2" at a time, but pass parallelism.
.NOTPARALLEL:
#=============================================================================
# Special targets provided by cmake.
# Disable implicit rules so canonical targets will work.
.SUFFIXES:
# Remove some rules from gmake that .SUFFIXES does not remove.
SUFFIXES =
.SUFFIXES: .hpux_make_needs_suffix_list
# Suppress display of executed commands.
$(VERBOSE).SILENT:
# A target that is always out of date.
cmake_force:
.PHONY : cmake_force
#=============================================================================
@ -33,48 +39,50 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
CMAKE_COMMAND = /usr/bin/cmake
CMAKE_COMMAND = /Applications/CMake.app/Contents/bin/cmake
# The command to remove a file.
RM = /usr/bin/cmake -E remove -f
RM = /Applications/CMake.app/Contents/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
# The top-level source directory on which CMake was run.
CMAKE_SOURCE_DIR = /home/kaveh/cmake/3rdParty/V8-4.3.61
CMAKE_SOURCE_DIR = /Users/kvahed/git/cmake/3rdParty
# The top-level build directory on which CMake was run.
CMAKE_BINARY_DIR = /home/kaveh/cmake/3rdParty/V8-4.3.61
CMAKE_BINARY_DIR = /Users/kvahed/git/cmake/3rdParty/V8-4.3.61
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..."
/usr/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available.
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
/Applications/CMake.app/Contents/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : edit_cache
# Special rule for the target edit_cache
edit_cache/fast: edit_cache
.PHONY : edit_cache/fast
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
/Applications/CMake.app/Contents/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
rebuild_cache/fast: rebuild_cache
.PHONY : rebuild_cache/fast
# The main all target
all: cmake_check_build_system
$(CMAKE_COMMAND) -E cmake_progress_start /home/kaveh/cmake/3rdParty/V8-4.3.61/CMakeFiles /home/kaveh/cmake/3rdParty/V8-4.3.61/CMakeFiles/progress.marks
$(CMAKE_COMMAND) -E cmake_progress_start /Users/kvahed/git/cmake/3rdParty/V8-4.3.61/CMakeFiles /Users/kvahed/git/cmake/3rdParty/V8-4.3.61/CMakeFiles/progress.marks
$(MAKE) -f CMakeFiles/Makefile2 all
$(CMAKE_COMMAND) -E cmake_progress_start /home/kaveh/cmake/3rdParty/V8-4.3.61/CMakeFiles 0
$(CMAKE_COMMAND) -E cmake_progress_start /Users/kvahed/git/cmake/3rdParty/V8-4.3.61/CMakeFiles 0
.PHONY : all
# The main clean target
@ -84,6 +92,7 @@ clean:
# The main clean target
clean/fast: clean
.PHONY : clean/fast
# Prepare targets for installation.
@ -101,6 +110,45 @@ depend:
$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
#=============================================================================
# Target rules for targets named ev_build
# Build rule for target.
ev_build: cmake_check_build_system
$(MAKE) -f CMakeFiles/Makefile2 ev_build
.PHONY : ev_build
# fast build rule for target.
ev_build/fast:
$(MAKE) -f CMakeFiles/ev_build.dir/build.make CMakeFiles/ev_build.dir/build
.PHONY : ev_build/fast
#=============================================================================
# Target rules for targets named v8_build
# Build rule for target.
v8_build: cmake_check_build_system
$(MAKE) -f CMakeFiles/Makefile2 v8_build
.PHONY : v8_build
# fast build rule for target.
v8_build/fast:
$(MAKE) -f CMakeFiles/v8_build.dir/build.make CMakeFiles/v8_build.dir/build
.PHONY : v8_build/fast
#=============================================================================
# Target rules for targets named zlib_build
# Build rule for target.
zlib_build: cmake_check_build_system
$(MAKE) -f CMakeFiles/Makefile2 zlib_build
.PHONY : zlib_build
# fast build rule for target.
zlib_build/fast:
$(MAKE) -f CMakeFiles/zlib_build.dir/build.make CMakeFiles/zlib_build.dir/build
.PHONY : zlib_build/fast
# Help Target
help:
@echo "The following are some of the valid targets for this Makefile:"
@ -109,6 +157,9 @@ help:
@echo "... depend"
@echo "... edit_cache"
@echo "... rebuild_cache"
@echo "... zlib_build"
@echo "... ev_build"
@echo "... v8_build"
.PHONY : help

View File

@ -115,10 +115,21 @@ if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -g")
endif ()
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set (CMAKE_COMPILER_IS_CLANG 1)
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Intel")
set (CMAKE_COMPILER_IS_INTEL 1)
elseif (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
set (CMAKE_COMPILER_IS_INTEL 1)
endif()
# OSX
if (APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++11 -stdlib=libc++")
add_definitions("-Wno-deprecated-declarations")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++11")
if (CMAKE_COMPILER_IS_CLANG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
add_definitions("-Wno-deprecated-declarations")
endif()
endif ()
# Visual Studio