ソースを参照

Corrected relative path.

dimitri 8 年 前
コミット
2c617b45aa

+ 1 - 1
util/conan-package/conanfile.py

@@ -8,7 +8,7 @@ class GlmConan(ConanFile):
     url="https://github.com/g-truc/glm"
     description="OpenGL Mathematics (GLM)"
     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/*"
 
     def build(self):

+ 5 - 6
util/conan-package/test_package/CMakeLists.txt

@@ -3,11 +3,10 @@ cmake_minimum_required(VERSION 3.0.0)
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup()
 
-set(CMAKE_C_FLAGS "${CONAN_C_FLAGS}")
-set(CMAKE_CXX_FLAGS "${CONAN_CXX_FLAGS}")
-set(CMAKE_SHARED_LINKER_FLAGS "${CONAN_SHARED_LINKER_FLAGS}")
+if(MSVC)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
+endif(MSVC)
 
 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}")
+
+