-#FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_s)\r
-#FIND_LIBRARY(TINYXML_LIBRARY NAMES tinyxml tinyxml_s)\r
-FIND_LIBRARY(ZTHREADS_LIBRARY NAMES zthread ZThread zthread_s)\r
+# add -lxnet and -lsocket on solaris\r
+IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")\r
+ TARGET_LINK_LIBRARIES(fms xnet)\r
+ TARGET_LINK_LIBRARIES(fms socket)\r
+ENDIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")\r
+\r
+IF(NOT USE_BUNDLED_SQLITE)\r
+ FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_s)\r
+ENDIF(NOT USE_BUNDLED_SQLITE)\r
+FIND_LIBRARY(TINYXML_LIBRARY NAMES tinyxml tinyxml_s)\r
+FIND_LIBRARY(PTHREADS_LIBRARY NAMES pthread pthreads pthreadvc2)\r
+FIND_LIBRARY(SHTTPD_LIBRARY NAMES shttpd shttpd_s)\r
+\r
+IF(SQLITE3_LIBRARY)\r
+ TARGET_LINK_LIBRARIES(fms ${SQLITE3_LIBRARY})\r
+ELSE(SQLITE3_LIBRARY)\r
+ IF(NOT USE_BUNDLED_SQLITE)\r
+ MESSAGE(STATUS "Could not find system SQLite library. Will compile from included source.")\r
+ ENDIF(NOT USE_BUNDLED_SQLITE)\r
+ ADD_LIBRARY(sqlite3 libs/sqlite3/sqlite3.c)\r
+ TARGET_LINK_LIBRARIES(fms sqlite3)\r
+ INCLUDE_DIRECTORIES(libs/sqlite3)\r
+ENDIF(SQLITE3_LIBRARY)\r