Merge pull request #9 from seec-team/development

OS X corrections
seec-team · Aug 8, 2016 · 90789f7 · 90789f7
2 parents 87f9ab5 + 57732f3
commit 90789f7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,7 +38,7 @@ before_install:
   - ICU_SOURCE_URL="http://download.icu-project.org/files/icu4c/57rc/icu4c-57rc-src.tgz"
   - CMAKE_URL="http://www.cmake.org/files/v3.3/cmake-3.3.2-Linux-x86_64.tar.gz"
   - WXWIDGETS_VERSION_TAG="v3.0.2"
-  - SEEC_VERSION_STRING="0.27.0"
+  - SEEC_VERSION_STRING="0.30.0"
   - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
 
 install:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,7 +49,7 @@ if(NOT "${LLVM_INSTALL_OVERRIDE}" STREQUAL "")
   set(LLVM_INSTALL "${LLVM_INSTALL_OVERRIDE}")
 endif()
 
-include_directories("${LLVM_INSTALL}/include")
+include_directories(BEFORE "${LLVM_INSTALL}/include")
 message(STATUS "LLVM include ${LLVM_INSTALL}/include")
 
 add_definitions(${LLVM_DEFINITIONS})
@@ -67,13 +67,13 @@ if( NOT EXISTS ${ICU_INSTALL}/include/${MULTIARCH}/unicode/unistr.h )
     message(FATAL_ERROR "ICU_INSTALL (${ICU_INSTALL}) is not a valid ICU installation.")
   else()
     message("Using ICU at ${ICU_INSTALL}")
-    include_directories( BEFORE ${ICU_INSTALL}/include )
+    include_directories(${ICU_INSTALL}/include )
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${ICU_INSTALL}/lib")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -L${ICU_INSTALL}/lib")
   endif()
 else()
   message("Using ICU at ${ICU_INSTALL} for architecture ${MULTIARCH}")
-  include_directories( BEFORE ${ICU_INSTALL}/include/${MULTIARCH} )
+  include_directories(${ICU_INSTALL}/include/${MULTIARCH} )
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${ICU_INSTALL}/lib/${MULTIARCH}")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -L${ICU_INSTALL}/lib/${MULTIARCH}")
 endif()

diff --git a/lib/Runtimes/Tracer/CMakeLists.txt b/lib/Runtimes/Tracer/CMakeLists.txt
@@ -1,3 +1,6 @@
+cmake_policy(SET CMP0042 NEW)
+
+set (CMAKE_MACOSX_RPATH FALSE)
 set (RUNTIME_TRACER_VERSION_MAJOR "1")
 set (RUNTIME_TRACER_VERSION_MINOR "0")
 set (RUNTIME_TRACER_VERSION "${RUNTIME_TRACER_VERSION_MAJOR}.${RUNTIME_TRACER_VERSION_MINOR}")
@@ -107,7 +110,7 @@ SET_TARGET_PROPERTIES(
     NO_SONAME TRUE
     VERSION ${RUNTIME_TRACER_VERSION}
     SOVERSION ${RUNTIME_TRACER_VERSION}
-    INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/seec"
+    INSTALL_NAME_DIR "@rpath"
 )
 
 INSTALL(TARGETS seecRuntimeTracer

diff --git a/lib/wxWidgets/Config.cpp b/lib/wxWidgets/Config.cpp
@@ -109,7 +109,7 @@ std::string getUserLocalDataPath()
   }
 
   if (!ConfigPath.DirExists()) {
-    ConfigPath.AssignDir(StdPaths.GetUserLocalDataDir());
+    ConfigPath.AssignDir(wxStandardPaths::Get().GetUserLocalDataDir());
   }
 #else
   ConfigPath.AssignDir(wxStandardPaths::Get().GetUserLocalDataDir());

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -10,9 +10,14 @@ set(TEST_PRINT_COMPARE ${TEST_ROOT}/print_compare_trace.sh)
 
 enable_testing()
 
+set(SEEC_CC_FLAGS "")
+if(NOT "${CMAKE_OSX_SYSROOT}" STREQUAL "")
+  set(SEEC_CC_FLAGS "${SEEC_CC_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT}")
+endif(NOT "${CMAKE_OSX_SYSROOT}" STREQUAL "")
+
 macro(seec_test_build BINARY SOURCE ARGS)
  add_test(NAME ${SEEC_TEST_PREFIX}build-${BINARY}
-          COMMAND ${TEST_SCRIPT} SEEC_WRITE_INSTRUMENTED=${BINARY}.instrumented.ll ${SEEC_INSTALL}/bin/seec-cc -std=c99 -fvisibility=hidden ${ARGS} -o ${BINARY} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE})
+          COMMAND ${TEST_SCRIPT} SEEC_WRITE_INSTRUMENTED=${BINARY}.instrumented.ll ${SEEC_INSTALL}/bin/seec-cc ${SEEC_CC_FLAGS} -std=c99 -fvisibility=hidden ${ARGS} -o ${BINARY} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE})
 endmacro(seec_test_build)
 
 macro(seec_test_print_trace BINARY TEST)