Explorar o código

fix syntax error and osx dylib paths

Paul %!s(int64=11) %!d(string=hai) anos
pai
achega
d4f4c44656
Modificáronse 2 ficheiros con 14 adicións e 2 borrados
  1. 12 0
      CIBuild/osx/fix_lib_paths.sh
  2. 2 2
      CMakeLists.txt

+ 12 - 0
CIBuild/osx/fix_lib_paths.sh

@@ -39,6 +39,18 @@ do
    install_name_tool "$file" -change @@HOMEBREW_PREFIX@@/lib/libboost_filesystem-mt.dylib @executable_path/libboost_filesystem-mt.dylib
    install_name_tool "$file" -change @@HOMEBREW_PREFIX@@/lib/libboost_unit_test_framework-mt.dylib @executable_path/libboost_unit_test_framework-mt.dylib
    install_name_tool "$file" -change @@HOMEBREW_PREFIX@@/lib/libboost_chrono-mt.dylib @executable_path/libboost_chrono-mt.dylib
+   
+   install_name_tool "$file" -change /usr/local/lib/libboost_thread-mt.dylib @executable_path/libboost_thread-mt.dylib
+   install_name_tool "$file" -change /usr/local/lib/libboost_date_time-mt.dylib @executable_path/libboost_date_time-mt.dylib
+   install_name_tool "$file" -change /usr/local/lib/libboost_system-mt.dylib @executable_path/libboost_system-mt.dylib
+   install_name_tool "$file" -change /usr/local/lib/libboost_atomic-mt.dylib @executable_path/libboost_atomic-mt.dylib
+   install_name_tool "$file" -change /usr/local/lib/libboost_chrono-mt.dylib @executable_path/libboost_chrono-mt.dylib
+   install_name_tool "$file" -change /usr/local/lib/libboost_program_options-mt.dylib @executable_path/libboost_program_options-mt.dylib
+   install_name_tool "$file" -change /usr/local/lib/libboost_filesystem-mt.dylib @executable_path/libboost_filesystem-mt.dylib
+   install_name_tool "$file" -change /usr/local/lib/libboost_unit_test_framework-mt.dylib @executable_path/libboost_unit_test_framework-mt.dylib
+   install_name_tool "$file" -change /usr/local/lib/libboost_chrono-mt.dylib @executable_path/libboost_chrono-mt.dylib
+   
+   
    install_name_tool "$file" -change ${PWD}/bin_release/liblua.dylib  @executable_path/liblua.dylib
    install_name_tool "$file" -change /usr/local/lib/QtCore.framework/Versions/4/QtCore @executable_path/QtCore
    install_name_tool "$file" -change /usr/local/lib/QtGui.framework/Versions/4/QtGui @executable_path/QtGui

+ 2 - 2
CMakeLists.txt

@@ -195,7 +195,7 @@ else()
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
 endif()
 
-if (UNIX AND $ENV{COVERAGE} EQUALS 1)
+if (UNIX AND $ENV{COVERAGE}==1)
       message("Setting coverage compiler options")
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0") # debug, no optimisation
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage") # enabling coverage
@@ -269,7 +269,7 @@ if(WIN32)
 elseif(APPLE)
     # APPLE is also UNIX, so must check for APPLE before UNIX
     SET(CPACK_GENERATOR "DragNDrop")
-    if ("${CMAKE_BUILD_TYPE}" STREQUAL "" OR "${CMAKE_BUILD_TYPE}" STREQUAL "release")
+    if ("${CMAKE_BUILD_TYPE}" STREQUAL "" OR "${CMAKE_BUILD_TYPE}" STREQUAL "RELEASE")
        set(OSX_BIN_DIR, "${CMAKE_BINARY_DIR}/bin_release")
        message("DEBUG installer build, OSX_BIN_DIR=${OSX_BIN_DIR}")
     else()