Browse Source
closes #5485 #5368 clean up cmake and get darwin portability:
closes #5485 #5368 clean up cmake and get darwin portability:
for 5485: - remove icc handling stuff from cmake - clean up remaining cmake files - create libtokudb_static.a in a cleaner way using cmake OBJECT libs (requires cmake 2.8.9) - use POSITION_INDEPENDENT_CODE property instead of manually setting -fPIC for 5368: - fix compilation failures due to small differences between gcc and clang, mostly in tests - use toku_fileids_are_equal instead of memcmp to compare fileids (closes #5505) - create dummy implementation of partitioned_counter for osx (quick fix for, and closes #5506) - add mutex->valid bit under TOKU_PTHREAD_DEBUG - initialize mutex of DB_TXN created during recovery for 2PC (closes #5507) git-svn-id: file:///svn/toku/tokudb@48024 c7de825b-a66e-492c-adef-691d508d4ae1pull/73/head
committed by
Yoni Fogel
76 changed files with 285 additions and 406 deletions
-
13CMakeLists.txt
-
40cmake/merge_archives_unix.cmake.in
-
1cmake_modules/TokuFeatureDetection.cmake
-
39cmake_modules/TokuSetupCTest.cmake
-
196cmake_modules/TokuSetupCompiler.cmake
-
15cmake_modules/TokuSetupIntelCompiler.cmake
-
12cmake_modules/TokuThirdParty.cmake
-
4db-benchmark-test/multi-bench.cc
-
3db-benchmark-test/scanscan.cc
-
9ft/CMakeLists.txt
-
2ft/cachetable.cc
-
38ft/partitioned_counter.cc
-
2ft/recover.cc
-
6ft/tests/cachetable-prefetch-getandpin-test.cc
-
3ft/tests/cachetable-test.cc
-
2ft/tests/ftloader-test-extractor-errors.cc
-
2ft/tests/logcursor-timestamp.cc
-
26ft/tests/marked-omt-test.cc
-
34ft/tests/omt-tmpl-test.cc
-
4ft/tests/pqueue-test.cc
-
2ft/tests/test_partitioned_counter.cc
-
2ft/tests/test_toku_malloc_plain_free.cc
-
2portability/CMakeLists.txt
-
7portability/tests/CMakeLists.txt
-
7portability/toku_os_types.h
-
9portability/toku_pthread.h
-
24src/CMakeLists.txt
-
18src/lock_tree/CMakeLists.txt
-
7src/lock_tree/tests/test_footprint_point_write.cc
-
7src/lock_tree/tests/test_footprint_range_write.cc
-
17src/range_tree/CMakeLists.txt
-
2src/tests/del-multiple-huge-primary-row.cc
-
2src/tests/del-multiple-srcdb.cc
-
2src/tests/del-multiple.cc
-
2src/tests/env-put-multiple.cc
-
6src/tests/hotindexer-insert-committed-optimized.cc
-
6src/tests/hotindexer-insert-committed.cc
-
6src/tests/hotindexer-insert-provisional.cc
-
6src/tests/hotindexer-lock-test.cc
-
6src/tests/hotindexer-nested-insert-committed.cc
-
3src/tests/hotindexer-put-abort.cc
-
2src/tests/hotindexer-put-commit.cc
-
6src/tests/hotindexer-put-multiple.cc
-
3src/tests/hotindexer-simple-abort-put.cc
-
2src/tests/hotindexer-simple-abort.cc
-
4src/tests/hotindexer-undo-do-test.cc
-
4src/tests/key-val.h
-
2src/tests/loader-cleanup-test.cc
-
4src/tests/loader-dup-test.cc
-
2src/tests/loader-no-puts.cc
-
2src/tests/loader-reference-test.cc
-
2src/tests/loader-stress-del.cc
-
2src/tests/loader-stress-test.cc
-
8src/tests/loader-tpch-load.cc
-
2src/tests/powerfail.cc
-
2src/tests/put-multiple.cc
-
2src/tests/recover-del-multiple-abort.cc
-
2src/tests/recover-del-multiple-srcdb-fdelete-all.cc
-
2src/tests/recover-del-multiple.cc
-
2src/tests/recover-hotindexer-simple-abort-put.cc
-
2src/tests/recover-loader-test.cc
-
2src/tests/recover-put-multiple-abort.cc
-
2src/tests/recover-put-multiple.cc
-
4src/tests/recover-split-checkpoint.cc
-
2src/tests/recover-test-logsuppress-put.cc
-
2src/tests/recover-test-logsuppress.cc
-
2src/tests/recover-update-multiple-abort.cc
-
2src/tests/recover-update-multiple.cc
-
4src/tests/test_kv_gen.h
-
2src/tests/update-multiple-data-diagonal.cc
-
2src/tests/update-multiple-key0.cc
-
2src/tests/update-multiple-nochange.cc
-
2src/tests/update-multiple-with-indexer.cc
-
7src/ydb_txn.cc
-
1toku_include/config.h.in
-
4utils/CMakeLists.txt
@ -1,15 +0,0 @@ |
|||
option(INTEL_CC "Use the Intel compiler." OFF) |
|||
|
|||
if (INTEL_CC) |
|||
find_program(CMAKE_C_COMPILER NAMES icc) |
|||
find_program(CMAKE_CXX_COMPILER NAMES icpc) |
|||
find_program(CMAKE_AR NAMES xiar) |
|||
find_program(CMAKE_LINKER NAMES xild) |
|||
|
|||
if (CMAKE_C_COMPILER MATCHES CMAKE_C_COMPILER-NOTFOUND OR |
|||
CMAKE_CXX_COMPILER MATCHES CMAKE_CXX_COMPILER-NOTFOUND OR |
|||
CMAKE_AR MATCHES CMAKE_AR-NOTFOUND OR |
|||
CMAKE_LINKER MATCHES CMAKE_LINKER-NOTFOUND) |
|||
message(FATAL_ERROR "Cannot find Intel compiler. You may need to run `source /opt/intel/bin/compilervars.sh intel64'") |
|||
endif () |
|||
endif (INTEL_CC) |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue