diff --git a/.travis.yml b/.travis.yml index d250f15d..edfa7075 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,7 @@ cache: - $HOME/boost_1_64_0/stage/lib install: - # Use GCC 5. - if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi - - export CXXFLAGS="-fPIC" CFLAGS="-fPIC" # Build Boost. - wget https://raw.githubusercontent.com/WrinklyNinja/ci-scripts/1.4.0/install_boost.py - python install_boost.py --directory ~ --boost-version 1.64.0 -a 64 -t gcc-6 atomic chrono date_time filesystem iostreams locale log regex system thread diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b7a5754..39164cb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,8 @@ ELSE() set (MSVC_SHARED_RUNTIME ON) ENDIF() +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + ############################## # Get Build Revision ############################## @@ -72,7 +74,7 @@ set (LIBESPM_INCLUDE_DIRS "${SOURCE_DIR}/include") ExternalProject_Add(libgit2 PREFIX "external" URL "https://github.com/libgit2/libgit2/archive/v0.25.1.tar.gz" - CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF -DBUILD_CLAR=OFF -DSTATIC_CRT=${MSVC_STATIC_RUNTIME} + CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF -DBUILD_CLAR=OFF -DSTATIC_CRT=${MSVC_STATIC_RUNTIME} -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE} BUILD_COMMAND ${CMAKE_COMMAND} --build . --target git2 --config $(CONFIGURATION) INSTALL_COMMAND "") ExternalProject_Get_Property(libgit2 SOURCE_DIR BINARY_DIR) @@ -83,7 +85,7 @@ ExternalProject_Add(libloadorder PREFIX "external" DEPENDS libespm URL "https://github.com/WrinklyNinja/libloadorder/archive/9.5.4.tar.gz" - CMAKE_ARGS -DBOOST_ROOT=${BOOST_ROOT} -DBOOST_LIBRARYDIR=${BOOST_LIBRARYDIR} -DMSVC_STATIC_RUNTIME=${MSVC_STATIC_RUNTIME} + CMAKE_ARGS -DBOOST_ROOT=${BOOST_ROOT} -DBOOST_LIBRARYDIR=${BOOST_LIBRARYDIR} -DMSVC_STATIC_RUNTIME=${MSVC_STATIC_RUNTIME} -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE} BUILD_COMMAND ${CMAKE_COMMAND} --build . --target loadorder --config $(CONFIGURATION) INSTALL_COMMAND "") ExternalProject_Get_Property(libloadorder SOURCE_DIR BINARY_DIR) @@ -116,7 +118,7 @@ ExternalProject_Add(testing-plugins ExternalProject_Add(yaml-cpp PREFIX "external" URL "https://github.com/WrinklyNinja/yaml-cpp/archive/patched-for-loot.tar.gz" - CMAKE_ARGS -DMSVC_SHARED_RT=${MSVC_SHARED_RUNTIME} + CMAKE_ARGS -DMSVC_SHARED_RT=${MSVC_SHARED_RUNTIME} -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE} BUILD_COMMAND ${CMAKE_COMMAND} --build . --target yaml-cpp --config $(CONFIGURATION) INSTALL_COMMAND "") ExternalProject_Get_Property(yaml-cpp SOURCE_DIR BINARY_DIR)