From 637f841d2d039fa12745527b0451f56be2f849f8 Mon Sep 17 00:00:00 2001 From: Sylvain Thery Date: Tue, 13 Jan 2015 13:16:53 +0100 Subject: [PATCH] tinyxml2 install bug --- CMakeLists.txt | 10 ++++------ ThirdParty/CMakeLists.txt | 7 ++++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 47d292ad..51e5912a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ if(WIN32) endif() endif() - +# ======== Check Build Type ============= IF (NOT (${CMAKE_BUILD_TYPE} MATCHES "Debug|Release")) IF (${CMAKE_CURRENT_BINARY_DIR} MATCHES "(.*)Debug|(.*)debug|(.*)DEBUG") SET(CMAKE_BUILD_TYPE "Debug") @@ -41,6 +41,7 @@ IF (NOT (${CMAKE_BUILD_TYPE} MATCHES "Debug|Release")) ENDIF() ENDIF() + # for shared or not shared SET ( BUILD_SHARED_LIBS OFF CACHE BOOL "if used all library are build as shared type (.so/.dylib/.dll)" ) @@ -193,11 +194,8 @@ ELSE() SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Woverride-init -fPIC") # remove the 60000+ "no unused local typedefs" warnings with GCC4.8+ if(CMAKE_COMPILER_IS_GNUCXX) - execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) - if (GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-local-typedefs") - endif(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-local-typedefs") endif() ENDIF() diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt index d3e05334..147ee4bb 100644 --- a/ThirdParty/CMakeLists.txt +++ b/ThirdParty/CMakeLists.txt @@ -4,7 +4,6 @@ include(ExternalProject) project(CGoGN_ThirdParty) - SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/..) IF(WIN32) @@ -82,7 +81,9 @@ IF (WITH_TINYXML2) INSTALL_COMMAND make install ) INSTALL (DIRECTORY TinyXml2/include/ DESTINATION ${CGoGN_ROOT_DIR}/ThirdParty/include) - FILE(GLOB_RECURSE tinyLib_files ${CGoGN_ROOT_DIR}/ThirdParty/TinyXml2/lib/*.so.* ${CGoGN_ROOT_DIR}/ThirdParty/TinyXml2/lib/*.a ) + FILE( GLOB_RECURSE tinyLib_files + ${CGoGN_ROOT_DIR}/ThirdParty/TinyXml2/lib/*.so* + ${CGoGN_ROOT_DIR}/ThirdParty/TinyXml2/lib/*.a + ${CGoGN_ROOT_DIR}/ThirdParty/TinyXml2/lib/*.dylib ) INSTALL (FILES ${tinyLib_files} DESTINATION ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE}) - ENDIF (WITH_TINYXML2) \ No newline at end of file -- GitLab