Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(435)

Unified Diff: CMakeLists.txt

Issue 1215463014: Modify how textual bitcode is injected into pnacl-sz. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Fix issues in path set 3. Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Makefile » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4708f4f7dc9ff7ee4cd6619cea1e055b3ac8bac..30c9f961d27f95fc1bd4ba0c4fd005bf0099aecb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,26 +3,33 @@ set(LLVM_LINK_COMPONENTS
Core
IRReader
NaClBitReader
+ NaClBitTestUtils
Support
)
file(GLOB pnacl_sz_SRCS "src/*.cpp")
add_llvm_tool(pnacl-sz ${pnacl_sz_SRCS})
-add_definitions(
+if(PNACL_BROWSER_TRANSLATOR)
+ add_definitions(
+ -DALLOW_DUMP=0
+ -DALLOW_LLVM_CL=0
+ -DALLOW_LLVM_IR=0
+ -DALLOW_LLVM_IR_AS_INPUT=0
+ -DALLOW_DISABLE_IR_GEN=0
+ -DALLOW_MINIMAL_BUILD=1
+ -DPNACL_BROWSER_TRANSLATOR=1
+ )
+else()
+ add_definitions(
-DALLOW_DUMP=1
-DALLOW_LLVM_CL=1
-DALLOW_LLVM_IR=1
-DALLOW_LLVM_IR_AS_INPUT=1
-DALLOW_DISABLE_IR_GEN=1
-DALLOW_MINIMAL_BUILD=0
- -DINPUT_IS_TEXTUAL_BITCODE=0
+ -DPNACL_BROWSER_TRANSLATOR=0
)
-
-if(PNACL_BROWSER_TRANSLATOR)
- add_definitions(-DPNACL_BROWSER_TRANSLATOR=1)
-else()
- add_definitions(-DPNACL_BROWSER_TRANSLATOR=0)
endif()
target_link_libraries(pnacl-sz pthread)
« no previous file with comments | « no previous file | Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698