diff --git a/third_party/etc2comp/CMakeLists.txt b/third_party/etc2comp/CMakeLists.txt index 6a6392be0e..bba5428222 100644 --- a/third_party/etc2comp/CMakeLists.txt +++ b/third_party/etc2comp/CMakeLists.txt @@ -16,14 +16,4 @@ cmake_minimum_required(VERSION 2.8.9) project(EtcTest) set (CMAKE_CXX_STANDARD 11) -IF (APPLE) - set (CMAKE_CXX_FLAGS "-I/usr/include/i386-linux-gnu/c++/4.8 -I/usr/include/c++/4.8 -std=c++11 -g3 -Wall -O3") -ELSE () - IF (WIN32) - set (CMAKE_CXX_FLAGS "-I/usr/include/i386-linux-gnu/c++/4.8 -I/usr/include/c++/4.8 -W4 /EHsc") - ELSE() - set (CMAKE_CXX_FLAGS "-I/usr/include/i386-linux-gnu/c++/4.8 -I/usr/include/c++/4.8 -std=c++11 -pthread -g3 -Wall -O2") - ENDIF() -ENDIF () ADD_SUBDIRECTORY(EtcLib) -ADD_SUBDIRECTORY(EtcTool) diff --git a/third_party/etc2comp/tnt/README b/third_party/etc2comp/tnt/README index 1fdcd5295c..5adfe8f225 100644 --- a/third_party/etc2comp/tnt/README +++ b/third_party/etc2comp/tnt/README @@ -1,10 +1,18 @@ This folder was created as follows: +(1) + curl -L -O https://github.com/google/etc2comp/archive/9cd0f9c.zip unzip 9cd0f9c.zip mv etc2comp-* etc2comp -Then, add this line to EtcLib/CMakeLists.txt: +(2) + +Remove the outer IF block and the EtcTool line from CMakeLists.txt + +(3) + +Add this line to EtcLib/CMakeLists.txt: target_include_directories(EtcLib PUBLIC Etc EtcCodec)