removed not required CURL module, renamed several cmake-build options for be more easy sortable by name

This commit is contained in:
filux
2015-09-27 19:46:35 +02:00
parent 4ad684deaf
commit 4bef525bf3
21 changed files with 358 additions and 406 deletions

View File

@@ -46,16 +46,12 @@ IF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
#MESSAGE(STATUS "Found cached Xerces-C lib [${XERCESC_LIBRARY}]")
ENDIF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
IF(WANT_STATIC_LIBS)
OPTION(XERCESC_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
ENDIF()
IF (NOT ${XERCESC_WAS_STATIC} STREQUAL ${XERCESC_STATIC})
IF (NOT ${XERCESC_WAS_STATIC} STREQUAL ${STATIC_XercesC})
UNSET(XERCESC_LIBRARY CACHE)
UNSET(XERCESC_LIBRARY_DEBUG CACHE)
ENDIF (NOT ${XERCESC_WAS_STATIC} STREQUAL ${XERCESC_STATIC})
ENDIF (NOT ${XERCESC_WAS_STATIC} STREQUAL ${STATIC_XercesC})
SET(XERCESC_WAS_STATIC ${XERCESC_STATIC} CACHE INTERNAL "" )
SET(XERCESC_WAS_STATIC ${STATIC_XercesC} CACHE INTERNAL "" )
IF (XERCESC_INCLUDE_DIR)
SET(XERCESC_INCLUDE ${XERCESC_INCLUDE_DIR})
@@ -73,7 +69,7 @@ ENDIF()
#MESSAGE(STATUS "Current Xerces-C lib [${XERCESC_LIBRARY}] XERCESC_INCLUDE [${XERCESC_INCLUDE}")
IF (XERCESC_STATIC AND NOT XERCESC_LIBRARY)
IF (STATIC_XercesC AND NOT XERCESC_LIBRARY)
MESSAGE(STATUS "Looking for static Xerces-C lib...")
FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 libxerces-c.a libxerces-c_3.a libxerces-c2_8_0.a libxerces-c_2.a libXerces.a
PATHS