aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKudlaty <none@none>2009-07-25 16:34:22 +0200
committerKudlaty <none@none>2009-07-25 16:34:22 +0200
commitd36a479b48111a2d3a38a4cf1b15f31720dfb268 (patch)
tree46aaf3de36494c1591c00eb5c70692f84e6aeb3f
parent3e4a9fcbe1bd1751ddce9da4f2ea7510c77556cd (diff)
Fix msg about have out of date ace lib, also some cosmetic change
--HG-- branch : trunk
-rw-r--r--CMakeLists.txt13
1 files changed, 8 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7581a495d49..78f9fad218d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -150,6 +150,14 @@ return()
#message(STATUS "And link using: ${ACE_LIBRARY}")
endif(ACE_FOUND)
+#somehow line below don't work. so for now change it to if exist
+#check_include_files(${ACE_INCLUDE_DIR}/ace/Stack_Trace.h HAVE_ACE_STACK_TRACE_H)
+IF(EXISTS ${ACE_INCLUDE_DIR}/ace/Stack_Trace.h)
+ SET(HAVE_ACE_STACK_TRACE_H 1)
+ELSE(EXISTS ${ACE_INCLUDE_DIR}/ace/Stack_Trace.h)
+ message(STATUS "** Your libace is out of date. Please update your libace!")
+ENDIF(EXISTS ${ACE_INCLUDE_DIR}/ace/Stack_Trace.h)
+
IF(UNIX AND NOT CENTOS)
FIND_READLINE()
IF(READLINE_FOUND)
@@ -162,11 +170,6 @@ IF(UNIX AND NOT CENTOS)
ENDIF(READLINE_FOUND)
ENDIF(UNIX AND NOT CENTOS)
-check_include_files(ace/Stack_Trace.h HAVE_ACE_STACK_TRACE_H)
-IF(NOT HAVE_ACE_STACK_TRACE_H)
- message(STATUS "** Your libace is old. Please update your libace!")
-ENDIF(NOT HAVE_ACE_STACK_TRACE_H)
-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")