issue #171 fix build

dibyendumajumdar · Dec 28, 2019 · da64639 · da64639
1 parent 2c13ac8
commit da64639
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -434,6 +434,9 @@ add_library(${LIBRAVI_NAME} ${LIBRAVI_BUILD_TYPE}
         ${DMR_C_JIT_SRCS}
         ${ASMVM_DEPS}
         )
+if (EMBEDDED_DMRC)
+    set(DMRC_DEF "USE_DMR_C=1")
+endif ()
 if (NOT STATIC_BUILD)
     if (WIN32)
         # enable DLL export
@@ -445,17 +448,15 @@ else()
     set_target_properties(${LIBRAVI_NAME} PROPERTIES PREFIX "")
 endif ()
 if (LLVM_JIT)
-    set_target_properties(${LIBRAVI_NAME} PROPERTIES COMPILE_DEFINITIONS "USE_LLVM=1")
+    message(STATUS "Setting USE_LLVM=1")
+    set_target_properties(${LIBRAVI_NAME} PROPERTIES COMPILE_DEFINITIONS "USE_LLVM=1 ${DMRC_DEF}")
 endif ()
 if (OMR_JIT)
-    set_target_properties(${LIBRAVI_NAME} PROPERTIES COMPILE_DEFINITIONS "USE_OMRJIT=1")
+    set_target_properties(${LIBRAVI_NAME} PROPERTIES COMPILE_DEFINITIONS "USE_OMRJIT=1 ${DMRC_DEF}")
 endif ()
 if (MIR_JIT)
     set_target_properties(${LIBRAVI_NAME} PROPERTIES COMPILE_DEFINITIONS "USE_MIRJIT=1")
 endif ()
-if (EMBEDDED_DMRC)
-    set_target_properties(${LIBRAVI_NAME} PROPERTIES COMPILE_DEFINITIONS "USE_DMR_C=1")
-endif ()
 target_link_libraries(${LIBRAVI_NAME} ${EXTRA_LIBRARIES} ${LLVM_LIBS} ${OMRJIT_LIBRARIES} ${MIRJIT_LIBRARIES})
 
 # Main Ravi executable

diff --git a/build-utils/cmake-64bit-llvm9r.bat b/build-utils/cmake-64bit-llvm9r.bat
@@ -1,5 +1,6 @@
 rmdir /s llvm9r
 mkdir llvm9r
 cd llvm9r
-cmake -DCMAKE_INSTALL_PREFIX=c:\Software\ravi -G "Visual Studio 15 2017 Win64" -DLLVM_JIT=ON -DLLVM_DIR=c:\Software\llvm900r\lib\cmake\llvm ..
+rem cmake -DCMAKE_INSTALL_PREFIX=c:\Software\ravi -G "Visual Studio 15 2017 Win64" -DLLVM_JIT=ON -DLLVM_DIR=c:\Software\llvm900r\lib\cmake\llvm ..
+cmake -DCMAKE_INSTALL_PREFIX=c:\Software\ravi -G "Visual Studio 16 2019" -DLLVM_JIT=ON -DLLVM_DIR=c:\Software\llvm900r\lib\cmake\llvm ..
 cd ..