Bladeren bron

cmake fixes for luajit

mikymod 12 jaren geleden
bovenliggende
commit
758ebecea3
2 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 2 2
      tests/CMakeLists.txt
  2. 2 2
      tools/compilers/lua/CMakeLists.txt

+ 2 - 2
tests/CMakeLists.txt

@@ -24,8 +24,8 @@ target_link_libraries(strings crown)
 target_link_libraries(paths crown)
 target_link_libraries(paths crown)
 
 
 link_directories(${CROWN_THIRD}/luajit/lib)
 link_directories(${CROWN_THIRD}/luajit/lib)
-include_directories(${CROWN_THIRD}/luajit/include)
-target_link_libraries(script crown lua)
+include_directories(${CROWN_THIRD}/luajit/include/luajit-2.0)
+target_link_libraries(script crown luajit-5.1)
 
 
 add_test(allocators-test ${EXECUTABLE_OUTPUT_PATH}/allocators)
 add_test(allocators-test ${EXECUTABLE_OUTPUT_PATH}/allocators)
 add_test(containers-test containers)
 add_test(containers-test containers)

+ 2 - 2
tools/compilers/lua/CMakeLists.txt

@@ -11,7 +11,7 @@ set (HEADERS
 
 
 add_executable(lua-compiler ${SRC} ${HEADERS})
 add_executable(lua-compiler ${SRC} ${HEADERS})
 link_directories(${CROWN_THIRD}/luajit/lib)
 link_directories(${CROWN_THIRD}/luajit/lib)
-include_directories(${CROWN_THIRD}/luajit/include)
-target_link_libraries(lua-compiler crown-compiler-utils lua)
+include_directories(${CROWN_THIRD}/luajit/include/luajit-2.0)
+target_link_libraries(lua-compiler crown-compiler-utils luajit-5.1)
 
 
 install (TARGETS lua-compiler DESTINATION bin)
 install (TARGETS lua-compiler DESTINATION bin)