Changeset 3eedfa6 in nscp for service

Timestamp:

11/12/09 23:32:23 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

d05c3f0

Parents:

818b54e

Message:

fixed so we have a settings subsytem (ini files) which work on linux

File:

• service/CMakeLists.txt (modified) (4 diffs)

service/CMakeLists.txt

@@ -2 +2 @@
   
 PROJECT(NSCP)
-SET(CMAKE_MODULE_PATH ${NSCP_SOURCE_DIR})
+#SET(CMAKE_MODULE_PATH ${NSCP_SOURCE_DIR})
 
 SET(VERSION_SERIES 0)
@@ -62 +62 @@
 ENDIF(WIN32)
 
-find_package(Boost COMPONENTS system filesystem thread REQUIRED)
+#SET(CMAKE_MODULE_PATH "../cmake/")
+FIND_PACKAGE(Boost COMPONENTS system filesystem thread REQUIRED)
 
 #INCLUDE(../cmake/WtFindBoost.txt)
 #INCLUDE(../cmake/WtFindAsio.txt)
 INCLUDE(../cmake/WtFindSsl.txt)
+#INCLUDE(../cmake/FindICU.cmake)
+
+#IF(NOT WIN32)
+# FIND_PACKAGE(ICU REQUIRED)
+# IF(NOT ICU_FOUND)
+#   MESSAGE(FATAL_ERROR "ICU package not found..")
+# ELSE(NOT ICU_FOUND)
+#   ADD_DEFINITIONS( -DSI_CONVERT_ICU )
+# ENDIF(NOT ICU_FOUND)
+#ENDIF(NOT WIN32)
+
+IF(NOT WIN32)
+  FIND_PACKAGE(Threads REQUIRED)
+  IF (NOT CMAKE_USE_PTHREADS_INIT)
+    message(FATAL_ERROR "Could not find POSIX threads")
+  ELSE (NOT CMAKE_USE_PTHREADS_INIT)
+    #add_definitions(-D_REENTRANT)
+  ENDIF (NOT CMAKE_USE_PTHREADS_INIT)
+  FIND_PACKAGE(Threads REQUIRED)
+ENDIF(NOT WIN32)
+
+
 
 # Boost is used nearly everywhere, so we can put these here
@@ -105 +128 @@
   ../include/NSCHelper.cpp
   ../include/arrayBuffer.cpp
+  ../include/simpleini/ConvertUTF.c
 # ../include/ServiceCmd.cpp
   ../include/b64/b64.c
@@ -112 +136 @@
   ${Boost_FILESYSTEM_LIBRARY}
   ${Boost_LIBRARIES}
+  ${CMAKE_THREAD_LIBS_INIT}
   ${EXTRA_LIBS}
 )