Commit 6b557e57 authored by Chris Cantwell's avatar Chris Cantwell

Tidied configuration messages.

parent 5dfcf43c
......@@ -28,11 +28,14 @@ EXTERNALPROJECT_ADD(
${TPSRC}/modmetis-5.1.0
)
SET(METIS_LIB metis CACHE FILEPATH
"METIS library" FORCE)
SET(METIS_LIB metis CACHE FILEPATH "METIS library" FORCE)
MARK_AS_ADVANCED(METIS_LIB)
LINK_DIRECTORIES(${TPDIST}/lib)
INCLUDE_DIRECTORIES(${TPDIST}/include)
MESSAGE(STATUS "Build Metis: ${TPDIST}/lib/lib${METIS_LIB}.a")
\ No newline at end of file
IF (WIN32)
MESSAGE(STATUS "Build Metis: ${TPDIST}/${LIB_DIR}/${METIS_LIB}.dll")
ELSE ()
MESSAGE(STATUS "Build Metis: ${TPDIST}/${LIB_DIR}/lib${METIS_LIB}.a")
ENDIF()
......@@ -50,7 +50,14 @@ IF (THIRDPARTY_BUILD_TINYXML)
LINK_DIRECTORIES(${TPDIST}/lib)
MESSAGE(STATUS "Build TinyXML: ${TPDIST}/${TINYXML_LIBRARY}.a")
IF (WIN32)
MESSAGE(STATUS
"Build TinyXML: ${TPDIST}/${LIB_DIR}/${TINYXML_LIBRARY}.dll")
ELSE ()
MESSAGE(STATUS
"Build TinyXML: ${TPDIST}/${LIB_DIR}/lib${TINYXML_LIBRARY}.a")
ENDIF ()
SET(TINYXML_CONFIG_INCLUDE_DIR ${TPINC})
ELSE()
ADD_CUSTOM_TARGET(tinyxml-2.6.2 ALL)
......@@ -61,4 +68,4 @@ ENDIF (THIRDPARTY_BUILD_TINYXML)
INCLUDE_DIRECTORIES(SYSTEM ${TINYXML_INCLUDE_DIR})
MARK_AS_ADVANCED(TINYXML_INCLUDE_DIR)
MARK_AS_ADVANCED(TINYXML_LIBRARY)
\ No newline at end of file
MARK_AS_ADVANCED(TINYXML_LIBRARY)
......@@ -52,16 +52,15 @@ IF (THIRDPARTY_BUILD_ZLIB)
IF (WIN32)
SET(ZLIB_LIBRARY zlib CACHE FILEPATH
"Zlib library" FORCE)
MESSAGE(STATUS "Build Zlib: ${TPDIST}/${LIB_DIR}/${ZLIB_LIBRARY}.dll")
ELSE ()
SET(ZLIB_LIBRARY z CACHE FILEPATH
"Zlib library" FORCE)
MESSAGE(STATUS "Build Zlib: ${TPDIST}/${LIB_DIR}/lib${ZLIB_LIBRARY}.a")
ENDIF ()
SET(ZLIB_INCLUDE_DIR ${TPDIST}/include CACHE PATH
"Zlib include" FORCE)
SET(ZLIB_INCLUDE_DIR ${TPDIST}/include CACHE PATH "Zlib include" FORCE)
LINK_DIRECTORIES(${TPDIST}/lib)
MESSAGE(STATUS "Build Zlib: ${TPDIST}/${ZLIB_LIBRARY}.a")
SET(ZLIB_CONFIG_INCLUDE_DIR ${TPINC})
ELSE (THIRDPARTY_BUILD_ZLIB)
ADD_CUSTOM_TARGET(zlib-1.2.7 ALL)
......@@ -72,4 +71,4 @@ ENDIF (THIRDPARTY_BUILD_ZLIB)
INCLUDE_DIRECTORIES(SYSTEM ${ZLIB_INCLUDE_DIR})
MARK_AS_ADVANCED(TINYXML_INCLUDE_DIR)
MARK_AS_ADVANCED(TINYXML_LIBRARY)
\ No newline at end of file
MARK_AS_ADVANCED(TINYXML_LIBRARY)
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