cos: use /usr/local as prefix instead of debug/build
This commit is contained in:
parent
30cbbc425f
commit
5d0edcd17b
|
@ -10,7 +10,8 @@ ExternalProject_Add(aprutil-1
|
|||
#BINARY_DIR ""
|
||||
BUILD_IN_SOURCE TRUE
|
||||
UPDATE_COMMAND ""
|
||||
CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/ --with-apr=${CMAKE_BINARY_DIR}/build
|
||||
#CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/ --with-apr=${CMAKE_BINARY_DIR}/build
|
||||
CONFIGURE_COMMAND ./configure --with-apr=/usr/local/
|
||||
BUILD_COMMAND make
|
||||
INSTALL_COMMAND make install
|
||||
TEST_COMMAND ""
|
||||
|
|
|
@ -9,7 +9,8 @@ ExternalProject_Add(apr-1
|
|||
SOURCE_DIR "${TD_CONTRIB_DIR}/apr"
|
||||
BUILD_IN_SOURCE TRUE
|
||||
UPDATE_COMMAND ""
|
||||
CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/
|
||||
#CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/
|
||||
CONFIGURE_COMMAND ./configure
|
||||
BUILD_COMMAND make
|
||||
INSTALL_COMMAND make install
|
||||
TEST_COMMAND ""
|
||||
|
|
|
@ -8,7 +8,8 @@ ExternalProject_Add(curl
|
|||
SOURCE_DIR "${TD_CONTRIB_DIR}/curl"
|
||||
BUILD_IN_SOURCE TRUE
|
||||
UPDATE_COMMAND ""
|
||||
CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/ --without-ssl
|
||||
#CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/ --without-ssl
|
||||
CONFIGURE_COMMAND ./configure --without-ssl
|
||||
BUILD_COMMAND make
|
||||
INSTALL_COMMAND make install
|
||||
TEST_COMMAND ""
|
||||
|
|
|
@ -6,7 +6,8 @@ ExternalProject_Add(mxml
|
|||
#BINARY_DIR ""
|
||||
BUILD_IN_SOURCE TRUE
|
||||
UPDATE_COMMAND ""
|
||||
CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/
|
||||
#CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/
|
||||
CONFIGURE_COMMAND ./configure
|
||||
BUILD_COMMAND make
|
||||
INSTALL_COMMAND make install
|
||||
TEST_COMMAND ""
|
||||
|
|
|
@ -124,7 +124,7 @@ endif(${BUILD_WITH_SQLITE})
|
|||
|
||||
# cos
|
||||
if(${BUILD_WITH_COS})
|
||||
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/build/)
|
||||
#file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/build/)
|
||||
cat("${TD_SUPPORT_DIR}/mxml_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
|
||||
cat("${TD_SUPPORT_DIR}/apr_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
|
||||
cat("${TD_SUPPORT_DIR}/apr-util_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
|
||||
|
@ -376,7 +376,7 @@ endif()
|
|||
# cos
|
||||
if(${BUILD_WITH_COS})
|
||||
if(NOT ${TD_WINDOWS})
|
||||
set(CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/build)
|
||||
#set(CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/build)
|
||||
#ADD_DEFINITIONS(-DMINIXML_LIBRARY=${CMAKE_BINARY_DIR}/build/lib/libxml.a)
|
||||
option(ENABLE_TEST "Enable the tests" OFF)
|
||||
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/build/include)
|
||||
|
|
Loading…
Reference in New Issue