diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2011-03-14 17:45:15 -0700 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2011-03-14 17:45:15 -0700 |
| commit | 247d88011349be8e8b47486b67b70842de09a43c (patch) | |
| tree | 36f5339ef3ba5931f27ff33ae2dce44c1f6d9b84 /cmake | |
| parent | 2c185a9dfd3be8e718858b946333c433c375c295 (diff) | |
| parent | 55048cdf79f3c607ab986c35d0422e591e7f6448 (diff) | |
| download | nodejs-247d88011349be8e8b47486b67b70842de09a43c.tar.gz nodejs-247d88011349be8e8b47486b67b70842de09a43c.tar.bz2 nodejs-247d88011349be8e8b47486b67b70842de09a43c.zip | |
Merge branch 'v0.4'
Conflicts:
src/node_version.h
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/configure.cmake | 2 | ||||
| -rw-r--r-- | cmake/node_build.cmake | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cmake/configure.cmake b/cmake/configure.cmake index 66907b83e..f0cb24599 100644 --- a/cmake/configure.cmake +++ b/cmake/configure.cmake @@ -62,6 +62,8 @@ endif() if(${node_platform} MATCHES darwin) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Carbon") + # explicitly set this so that we don't check again when building libeio + set(HAVE_FDATASYNC 0) else() # OSX fdatasync() check wrong: http://public.kitware.com/Bug/view.php?id=10044 check_function_exists(fdatasync HAVE_FDATASYNC) diff --git a/cmake/node_build.cmake b/cmake/node_build.cmake index 295bb3e63..9d89432f0 100644 --- a/cmake/node_build.cmake +++ b/cmake/node_build.cmake @@ -62,6 +62,7 @@ set(node_sources src/node_script.cc src/node_os.cc src/node_dtrace.cc + src/node_string.cc src/node_natives.h ${node_extra_src}) |