浏览代码

[TravisCI] enable cmake linux64 build

Andy Li 8 年之前
父节点
当前提交
8f61e2e1c1
共有 2 个文件被更改,包括 16 次插入3 次删除
  1. 10 0
      .travis.yml
  2. 6 3
      CMakeLists.txt

+ 10 - 0
.travis.yml

@@ -71,6 +71,16 @@ matrix:
       before_install: *linux32_before_install
       before_script:
         - sudo ldconfig
+    - haxe: development
+      os: linux
+      dist: trusty
+      env: ARCH=64 BUILD=cmake
+      before_install: *linux64_before_install
+      install:
+        - cmake .
+        - make
+      script:
+        - make test ARGS="-V"
     - haxe: development
       os: linux
       dist: trusty

+ 6 - 3
CMakeLists.txt

@@ -330,6 +330,9 @@ target_compile_definitions(fmt.hdll
 # Tests
 
 include(CTest)
-add_test(NAME hello.hl
-	COMMAND hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/hello.hl
-)
+if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    # HL/JIT is currently not supported when compiled to 64 bits
+    add_test(NAME hello.hl
+        COMMAND hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/hello.hl
+    )
+endif()