X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=CMakeLists.txt;h=4e06722d3ed36974e756494435b2d02c2813fe37;hb=c7fcb4c4bc5012a584add81a9509fc1f84c3c688;hp=be285e20da89683b76bb58f9695defcac1392969;hpb=964f55fd550fc711c0320ce6a24ad713040695d0;p=fms.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be285e2..4e06722 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,26 +53,29 @@ src/nntp/mime/Mime.cpp
 src/nntp/mime/MimeChar.cpp
 src/nntp/mime/MimeCode.cpp
 src/nntp/mime/MimeType.cpp
+src/pthreadwrapper/guard.cpp
+src/pthreadwrapper/mutex.cpp
+src/pthreadwrapper/runnable.cpp
+src/pthreadwrapper/thread.cpp
 src/xyssl/sha1.c
 )
 
 ADD_DEFINITIONS(-DTIXML_USE_STL)
 
-IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+IF(CMAKE_COMPILER_IS_GNUCXX)
 	ADD_DEFINITIONS(-fpermissive)
-ENDIF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 ADD_EXECUTABLE(fms ${FMS_SRC})
 
-INCLUDE_DIRECTORIES(libs/sqlite3 libs/tinyxml)
-
 IF(WIN32)
 	TARGET_LINK_LIBRARIES(fms ws2_32)
 ENDIF(WIN32)
 
 FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_s)
 FIND_LIBRARY(TINYXML_LIBRARY NAMES tinyxml tinyxml_s)
-FIND_LIBRARY(ZTHREADS_LIBRARY NAMES zthread ZThread zthread_s)
+#FIND_LIBRARY(ZTHREADS_LIBRARY NAMES zthread ZThread zthread_s)
+FIND_LIBRARY(PTHREADS_LIBRARY NAMES pthread pthreads pthreadvc2)
 
 IF(SQLITE3_LIBRARY)
 	TARGET_LINK_LIBRARIES(fms ${SQLITE3_LIBRARY})
@@ -80,8 +83,7 @@ ELSE(SQLITE3_LIBRARY)
 	MESSAGE(STATUS "Could not find system SQLite library.  Will compile from included source.")
 	ADD_LIBRARY(sqlite3 libs/sqlite3/sqlite3.c)
 	TARGET_LINK_LIBRARIES(fms sqlite3)
-ADD_LIBRARY(tinyxml libs/tinyxml/tinystr.cpp libs/tinyxml/tinyxml.cpp libs/tinyxml/tinyxmlerror.cpp libs/tinyxml/tinyxmlparser.cpp)
-
+	INCLUDE_DIRECTORIES(libs/sqlite3)
 ENDIF(SQLITE3_LIBRARY)
 
 IF(TINYXML_LIBRARY)
@@ -90,10 +92,17 @@ ELSE(TINYXML_LIBRARY)
 	MESSAGE(STATUS "Could not find system TinyXML library.  Will compile from included source.")
 	ADD_LIBRARY(tinyxml libs/tinyxml/tinystr.cpp libs/tinyxml/tinyxml.cpp libs/tinyxml/tinyxmlerror.cpp libs/tinyxml/tinyxmlparser.cpp)
 	TARGET_LINK_LIBRARIES(fms tinyxml)
+	INCLUDE_DIRECTORIES(libs/tinyxml)
 ENDIF(TINYXML_LIBRARY)
 
-IF(ZTHREADS_LIBRARY)
-	TARGET_LINK_LIBRARIES(fms ${ZTHREADS_LIBRARY})
-ELSE(ZTHREADS_LIBRARY)
-	MESSAGE(FATAL_ERROR "Could not find ZThreads library.  You must set the location manually.")
-ENDIF(ZTHREADS_LIBRARY)
+#IF(ZTHREADS_LIBRARY)
+#	TARGET_LINK_LIBRARIES(fms ${ZTHREADS_LIBRARY})
+#ELSE(ZTHREADS_LIBRARY)
+#	MESSAGE(FATAL_ERROR "Could not find ZThreads library.  You must set the location manually.")
+#ENDIF(ZTHREADS_LIBRARY)
+
+IF(PTHREADS_LIBRARY)
+	TARGET_LINK_LIBRARIES(fms ${PTHREADS_LIBRARY})
+ELSE(PTHREADS_LIBRARY)
+	MESSAGE(FATAL ERROR "Could not find pthreads library.  You must set the location manually.")
+ENDIF(PTHREADS_LIBRARY)