Skip to content

GitLab

Commit 637f841d authored by Sylvain Thery's avatar Sylvain Thery
Browse files
Options

tinyxml2 install bug

parent 57766e9f
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 9 deletions
CMakeLists.txt
View file @ 637f841d
...@@ -32,7 +32,7 @@ if(WIN32) ...@@ -32,7 +32,7 @@ if(WIN32)
endif() endif()
endif() endif()
# ======== Check Build Type =============
IF (NOT (${CMAKE_BUILD_TYPE} MATCHES "Debug|Release")) IF (NOT (${CMAKE_BUILD_TYPE} MATCHES "Debug|Release"))
IF (${CMAKE_CURRENT_BINARY_DIR} MATCHES "(.*)Debug|(.*)debug|(.*)DEBUG") IF (${CMAKE_CURRENT_BINARY_DIR} MATCHES "(.*)Debug|(.*)debug|(.*)DEBUG")
SET(CMAKE_BUILD_TYPE "Debug") SET(CMAKE_BUILD_TYPE "Debug")
...@@ -41,6 +41,7 @@ IF (NOT (${CMAKE_BUILD_TYPE} MATCHES "Debug|Release")) ...@@ -41,6 +41,7 @@ IF (NOT (${CMAKE_BUILD_TYPE} MATCHES "Debug|Release"))
ENDIF() ENDIF()
ENDIF() ENDIF()
# for shared or not shared # for shared or not shared
SET ( BUILD_SHARED_LIBS OFF CACHE BOOL "if used all library are build as shared type (.so/.dylib/.dll)" ) SET ( BUILD_SHARED_LIBS OFF CACHE BOOL "if used all library are build as shared type (.so/.dylib/.dll)" )
...@@ -193,11 +194,8 @@ ELSE() ...@@ -193,11 +194,8 @@ ELSE()
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Woverride-init -fPIC") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Woverride-init -fPIC")
# remove the 60000+ "no unused local typedefs" warnings with GCC4.8+ # remove the 60000+ "no unused local typedefs" warnings with GCC4.8+
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs")
if (GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-local-typedefs")
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)
endif() endif()
ENDIF() ENDIF()
......
ThirdParty/CMakeLists.txt
View file @ 637f841d
...@@ -4,7 +4,6 @@ include(ExternalProject) ...@@ -4,7 +4,6 @@ include(ExternalProject)
project(CGoGN_ThirdParty) project(CGoGN_ThirdParty)
SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/..) SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/..)
IF(WIN32) IF(WIN32)
...@@ -82,7 +81,9 @@ IF (WITH_TINYXML2) ...@@ -82,7 +81,9 @@ IF (WITH_TINYXML2)
INSTALL_COMMAND make install INSTALL_COMMAND make install
) )
INSTALL (DIRECTORY TinyXml2/include/ DESTINATION ${CGoGN_ROOT_DIR}/ThirdParty/include) 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}) INSTALL (FILES ${tinyLib_files} DESTINATION ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})
ENDIF (WITH_TINYXML2) ENDIF (WITH_TINYXML2)
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment