From 9d325708004c0f368154f70cc30409d04b94f83c Mon Sep 17 00:00:00 2001 From: eidheim Date: Thu, 4 Jun 2015 12:48:31 +0200 Subject: [PATCH] Added -O3, and OS X support. Also fixed a test on OS X. --- CMakeLists.txt | 6 ++++++ src/CMakeLists.txt | 4 ++-- tests/CodeCompleteResults_H_Test.cc | 10 ++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0c3bf2..99ac894 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,12 @@ cmake_minimum_required (VERSION 2.8.4) set(project_name clangmm) project(${project_name}) set(library_installation_path "/usr/local/lib/libclangmm/") + +if(APPLE) + set(Boost_USE_STATIC_LIBS "YES") + set(CMAKE_MACOSX_RPATH 1) +endif() + enable_testing() add_subdirectory(src) add_subdirectory(tests) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8e9259d..6c74fa5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3") set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_HOME_DIRECTORY}/cmake/Modules/") @@ -49,4 +49,4 @@ target_link_libraries(${project_name} ${LIBCLANG_LIBRARIES}) install(TARGETS ${project_name} LIBRARY DESTINATION ${library_installation_path}) install(FILES ${header_files} - DESTINATION ${library_installation_path}/include) \ No newline at end of file + DESTINATION ${library_installation_path}/include) diff --git a/tests/CodeCompleteResults_H_Test.cc b/tests/CodeCompleteResults_H_Test.cc index 8912a90..32bcd76 100644 --- a/tests/CodeCompleteResults_H_Test.cc +++ b/tests/CodeCompleteResults_H_Test.cc @@ -30,6 +30,12 @@ BOOST_AUTO_TEST_CASE(code_complete_results) { clang::CodeCompleteResults results(&tu, path, buffers, 4, 5); - BOOST_CHECK(results.size() == 105); - BOOST_CHECK(results.get(0).get_num_chunks() == 5); + bool substr_found=false; + for(int c=0;c