working in Linux

Brunni · Mar 8, 2017 · 37f8917 · 37f8917
1 parent 3b07dd5
commit 37f8917
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@ install_manifest.txt
 CTestTestfile.cmake
 __pycache__/
 test_package/build/
+build/
+*.pyc
diff --git a/conanfile.py b/conanfile.py
@@ -56,3 +56,5 @@ def package(self):
 
 	def package_info(self):
 		self.cpp_info.libs = ["g3logger"]
+		if self.settings.os == "Linux":
+			self.cpp_info.libs.append("pthread")
diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt
@@ -4,5 +4,8 @@ cmake_minimum_required(VERSION 2.8.12)
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup()
 
+if(NOT MSVC)
+  ADD_DEFINITIONS ( -std=c++11 )
+endif()
 ADD_EXECUTABLE(example example.cpp)
 TARGET_LINK_LIBRARIES(example ${CONAN_LIBS})
diff --git a/test_package/conanfile.pyc b/test_package/conanfile.pyc