Corrected relative path.

This commit is contained in:
dimitri 2017-07-24 22:58:22 +02:00
parent bb63aa9e9b
commit 2c617b45aa
2 changed files with 6 additions and 7 deletions

View File

@ -8,7 +8,7 @@ class GlmConan(ConanFile):
url="https://github.com/g-truc/glm" url="https://github.com/g-truc/glm"
description="OpenGL Mathematics (GLM)" description="OpenGL Mathematics (GLM)"
license = "https://github.com/g-truc/glm/blob/manual/copying.txt" license = "https://github.com/g-truc/glm/blob/manual/copying.txt"
exports_sources = ["FindGLM.cmake", os.sep.join([".", "..", "..", "*"])] exports_sources = ["FindGLM.cmake", os.sep.join(["..", "..", "*"])]
exports = "lib_licenses/*" exports = "lib_licenses/*"
def build(self): def build(self):

View File

@ -3,11 +3,10 @@ cmake_minimum_required(VERSION 3.0.0)
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup() conan_basic_setup()
set(CMAKE_C_FLAGS "${CONAN_C_FLAGS}") if(MSVC)
set(CMAKE_CXX_FLAGS "${CONAN_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
set(CMAKE_SHARED_LINKER_FLAGS "${CONAN_SHARED_LINKER_FLAGS}") endif(MSVC)
add_executable(testGlm main.cpp) add_executable(testGlm main.cpp)
TARGET_COMPILE_DEFINITIONS(testGlm PUBLIC "${CONAN_DEFINES}")
TARGET_LINK_LIBRARIES(testGlm PUBLIC "${CONAN_LIBS}")
SET_TARGET_PROPERTIES(testGlm PROPERTIES LINK_FLAGS "${CONAN_EXE_LINKER_FLAGS}")