Skip to content

Commit

Permalink
Make it work on mac as well.
Browse files Browse the repository at this point in the history
  • Loading branch information
Andersbakken committed Aug 24, 2016
1 parent 0de663d commit 7ebee2e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 18 deletions.
29 changes: 12 additions & 17 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ endif ()

add_subdirectory(lua)

set(RCT_RTTI_ENABLED 1)
set(RCT_NO_INSTALL 1)
set(RCT_NO_LIBRARY 1)
# Everyting which as been set either in rct/rct.cmake or rct/compiler.cmake
Expand Down Expand Up @@ -100,6 +101,7 @@ endif ()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)

set(RTAGS_SOURCES
AST.cpp
ClangIndexer.cpp
ClangThread.cpp
ClassHierarchyJob.cpp
Expand Down Expand Up @@ -136,10 +138,6 @@ set(RTAGS_SOURCES
TokensJob.cpp
${RCT_SOURCES})

if (LUA_FOUND)
list(APPEND RTAGS_SOURCES AST.cpp)
endif ()

add_library(rtags STATIC ${RTAGS_SOURCES})
if (RTAGS_BUILD_CLANG)
add_dependencies(rtags llvmclang)
Expand All @@ -164,20 +162,17 @@ else ()
set(END_GROUP "-Wl,--end-group")
endif ()

set(RTAGS_LIBRARIES rtags ${START_GROUP} ${LIBCLANG_LIBRARIES} ${END_GROUP})
set(RTAGS_LIBRARIES rtags ${START_GROUP} ${LIBCLANG_LIBRARIES} ${END_GROUP} liblua)

if (LUA_FOUND)
set(RTAGS_LIBRARIES ${RTAGS_LIBRARIES} ${LUA_LIBRARIES})
include_directories(${LUA_INCLUDE_DIR})
add_definitions(-DRTAGS_HAS_LUA)
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set_source_files_properties(AST.cpp PROPERTIES
COMPILE_FLAGS "-Wno-unused-parameter -Wno-unused-variable -ftemplate-depth=2000 -Wno-cast-qual")
else ()
set_source_files_properties(AST.cpp PROPERTIES
COMPILE_FLAGS "-Wno-unused-but-set-parameter -Wno-unused-parameter -Wno-unused-variable -ftemplate-depth=2000 -Wno-cast-qual")
endif()
endif ()
include_directories(${CMAKE_CURRENT_LIST_DIR}/lua ${CMAKE_CURRENT_LIST_DIR}/lua/src)
add_definitions(-DRTAGS_HAS_LUA)
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set_source_files_properties(AST.cpp PROPERTIES
COMPILE_FLAGS "-Wno-unused-parameter -Wno-unused-variable -ftemplate-depth=2000 -Wno-cast-qual")
else ()
set_source_files_properties(AST.cpp PROPERTIES
COMPILE_FLAGS "-Wno-unused-but-set-parameter -Wno-unused-parameter -Wno-unused-variable -ftemplate-depth=2000 -Wno-cast-qual")
endif()

# RCT_LIBRARIES and stdc++ library must be at the end
set(RTAGS_LIBRARIES ${RTAGS_LIBRARIES} -lstdc++ ${RCT_LIBRARIES})
Expand Down
2 changes: 1 addition & 1 deletion src/lua
Submodule lua updated 118 files

0 comments on commit 7ebee2e

Please sign in to comment.