diff options
| author | Dennis Brentjes <d.brentjes@gmail.com> | 2017-03-14 09:27:06 +0100 |
|---|---|---|
| committer | Dennis Brentjes <d.brentjes@gmail.com> | 2017-03-14 09:27:06 +0100 |
| commit | 44273a12096fe99a847c53480847f90f15622624 (patch) | |
| tree | d0cce46ca424f981b7adfdf3e88be66453c7ab6d | |
| parent | b989f4381c77cd95ee06e600e264907991bbd461 (diff) | |
| download | cmix-44273a12096fe99a847c53480847f90f15622624.tar.gz cmix-44273a12096fe99a847c53480847f90f15622624.tar.bz2 cmix-44273a12096fe99a847c53480847f90f15622624.zip | |
Fixes some protobuf issues with linuxbrew systems.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libcmix-protobuf/CMakeLists.txt | 9 | ||||
| -rwxr-xr-x | run.sh | 5 |
3 files changed, 7 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 691860f..b13ae4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6.1) +cmake_minimum_required(VERSION 3.5.1) project(cmix) diff --git a/libcmix-protobuf/CMakeLists.txt b/libcmix-protobuf/CMakeLists.txt index 27eff16..81c4879 100644 --- a/libcmix-protobuf/CMakeLists.txt +++ b/libcmix-protobuf/CMakeLists.txt @@ -13,11 +13,8 @@ add_library(cmix-protobuf set_target_properties(cmix-protobuf PROPERTIES COMPILE_FLAGS -w) -target_include_directories(cmix-protobuf - PUBLIC ${Protobuf_INCLUDE_DIRS} -) - target_include_directories(cmix-protobuf SYSTEM + PUBLIC ${PROTOBUF_INCLUDE_DIRS} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ) @@ -30,5 +27,5 @@ target_compile_options(cmix-protobuf ) target_link_libraries(cmix-protobuf - PRIVATE ${Protobuf_LIBRARIES} -)
\ No newline at end of file + PRIVATE ${PROTOBUF_LIBRARIES} +) @@ -1,7 +1,8 @@ #!/bin/bash -build_dir=/home/dennis/projects/cmix/build-cmix-Desktop-Debug -#build_dir=/home/dennis/projects/cmix/build-gcc +#build_dir=/home/dennis/projects/cmix/build-cmix-Desktop-Debug +build_dir=/home/dbrentje/projects/cmix/build + if [ $# == 0 ] ; then tool="" elif [ $1 == "benchmark" ] ; then |