Changeset 92c4b5b in nscp

Timestamp:

11/16/09 11:14:38 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

b3078b4

Parents:

d05c3f0

Message:

tidied up the build process a bit

Files:

• CMakeLists.txt (modified) (7 diffs)
• include/config.h.in (moved) (moved from include/config.h)

CMakeLists.txt

@@ -1 +1 @@
 cmake_minimum_required(VERSION 2.6)
+
+include(build.cmake)
   
 PROJECT(NSCP)
-#SET(CMAKE_MODULE_PATH ${NSCP_SOURCE_DIR})
 
 SET(VERSION_SERIES 0)
 SET(VERSION_MAJOR 4)
 SET(VERSION_MINOR 0)
-
 
 IF(NOT SHARED_LIBS)
@@ -25 +25 @@
 ENDIF(NOT MULTI_THREADED)
 
-SET(BUILD_SHARED_LIBS ${SHARED_LIBS})
-
 SET(NSCP_INCLUDE_PATH "${NSCP_SOURCE_DIR}/include" CACHE PATH "directory containing NSCP specific includes")
 INCLUDE_DIRECTORIES(${NSCP_INCLUDE_PATH})
 
-
-set(Boost_USE_STATIC_LIBS   ON)
-set(Boost_USE_MULTITHREADED ON)
-
+SET(BOOST_LIBRARYDIR ${BOOST_LIBRARYDIR} CACHE PATH "")
+SET(BOOST_INCLUDEDIR ${BOOST_INCLUDEDIR} CACHE PATH "")
+SET(BOOST_LIB_SUFFIX ${BOOST_LIB_SUFFIX} CACHE STRING "Look for Boost libraries ending with this")
 
 IF(WIN32)
-  #SET(USERLIB_ROOT "c:/libraries" CACHE PATH "directory containing the dependency libraries")
   SET(LIB_INSTALL_DIR "lib" CACHE STRING "Default path for libraries within ${CMAKE_INSTALL_PREFIX}")
   SET(RUNDIR "c:/nscp" CACHE PATH "Not really used in WIN32")
-  #SET(CONFIGURATION c:/witty/wt_config.xml CACHE PATH "Path for the wt configuration file")
-  #SET(DEPLOYROOT c:/nscp/ CACHE PATH "Path to deploy examples into")
-  #SET(BOOST_DIR ${USERLIB_ROOT} CACHE PATH "Use boost in directory")
 
-  SET(BOOST_LIBRARYDIR D:/source/lib/x86 CACHE PATH "")
-  SET(BOOST_INCLUDEDIR D:/source/include/boost-1_40 CACHE PATH "")
-  SET(BOOST_LIB_PREFIX lib CACHE STRING "Look for Boost libraries prefixed with this")
-  SET(BOOST_LIB_SUFFIX vc80-mt CACHE STRING "Look for Boost libraries ending with this")
 
   #SET(BOOST_VERSION "1_34_1" CACHE STRING "Use boost version in BOOST_DIR")
@@ -52 +41 @@
 
 ELSE(WIN32)
-
   SET(USERLIB_ROOT /usr CACHE PATH "Other installation prefix for dependent libraries")
   SET(LIB_INSTALL_DIR "lib" CACHE STRING "Default path for libraries within ${CMAKE_INSTALL_PREFIX}")
@@ -59 +47 @@
   SET(MAIN_CONFIGURATION /etc/nscp/nscp.xml CACHE PATH "Path for the client configurtion file")
   SET(DEPLOYROOT /usr/bin CACHE PATH "Path to deploy examples into)")
-  SET(BOOST_DIR /usr CACHE PATH "Boost installation path prefix")
-  SET(BOOST_COMPILER gcc CACHE STRING "Boost libraries compiler signature")
-  SET(BOOST_VERSION "1_34_1" CACHE STRING "Boost libraries version signature")
 ENDIF(WIN32)
 
-#SET(CMAKE_MODULE_PATH "../cmake/")
 FIND_PACKAGE(Boost COMPONENTS system filesystem thread REQUIRED)
 
-#INCLUDE(../cmake/WtFindBoost.txt)
-#INCLUDE(../cmake/WtFindAsio.txt)
+if(Boost_FOUND)
+  message(STATUS, "Found boost in: ${Boost_INCLUDE_DIRS}")
+else(Boost_FOUND)
+  message(FATAL_ERROR, "boost NOT fround: ${Boost_ERROR_REASON}")
+endif(Boost_FOUND)
+
+#INCLUDE(cmake/WtFindAsio.txt)
 #INCLUDE(cmake/WtFindSsl.txt)
-#INCLUDE(../cmake/FindICU.cmake)
+#INCLUDE(cmake/FindICU.cmake)
 
 
@@ -125 +114 @@
 # Compile time constants & make sure our build finds it
 CONFIGURE_FILE(
-  config.h.in
-  xconfig.h
+  ${NSCP_INCLUDE_PATH}/config.h.in
+  ${NSCP_INCLUDE_PATH}/config.h
 )
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
@@ -135 +124 @@
 
 include_directories("${PROJECT_BINARY_DIR}")
-
-#SET(RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/xxx/")
-#SET(LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/yyy/")
-#SET(EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}/zzz/")
-#SET(MODULE_OUTPUT_DIRECTORY  "${PROJECT_BINARY_DIR}/aaa/")
-#SET(ARCHIVE_OUTPUT_DIRECTORY  "${PROJECT_BINARY_DIR}/bbb/")
 
 MESSAGE(STATUS "Build path: ${PROJECT_BINARY_DIR}")
@@ -164 +147 @@
     set_target_properties ("nsclient++" "CheckHelpers" PROPERTIES PREFIX "../")
 endif()
-
-message(STATUS "${ALL_MODULES} -- ${CMAKE_CURRENT_SOURCE_DIR}")
-
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/cmake/FindWt.cmake DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${WT_CMAKE_FINDER_INSTALL_DIR} )
-