X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=ddf3dadc0a86fec3d945bcdd0a7c5bb5e4c22964;hb=868c533e84b3c81b6604b45b84efa32073aa20b4;hp=5217bdcc1d32a43dd0e0054df3cd7ca69134fa98;hpb=6b896a9e1dc143bba86795be1e9336549db9b85f;p=fms.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5217bdc..ddf3dad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,34 +58,35 @@ src/xyssl/sha1.c
 
 ADD_DEFINITIONS(-DTIXML_USE_STL)
 
-ADD_LIBRARY(sqlite3 libs/sqlite3/sqlite3.c)
-ADD_LIBRARY(tinyxml libs/tinyxml/tinystr.cpp libs/tinyxml/tinyxml.cpp libs/tinyxml/tinyxmlerror.cpp libs/tinyxml/tinyxmlparser.cpp)
-
 ADD_EXECUTABLE(fms ${FMS_SRC})
 
 INCLUDE_DIRECTORIES(libs/sqlite3 libs/tinyxml)
 
-TARGET_LINK_LIBRARIES(fms sqlite3 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(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_s)
+FIND_LIBRARY(TINYXML_LIBRARY NAMES tinyxml tinyxml_s)
 FIND_LIBRARY(ZTHREADS_LIBRARY NAMES zthread ZThread zthread_s)
 
-#IF(SQLITE3_LIBRARY)
-#	TARGET_LINK_LIBRARIES(fms ${SQLITE3_LIBRARY})
-#ELSE(SQLITE3_LIBRARY)
-#	MESSAGE(FATAL_ERROR "Could not find SQLite library.  You must set the location manually.")
-#ENDIF(SQLITE3_LIBRARY)
+IF(SQLITE3_LIBRARY)
+	TARGET_LINK_LIBRARIES(fms ${SQLITE3_LIBRARY})
+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)
+
+ENDIF(SQLITE3_LIBRARY)
 
-#IF(TINYXML_LIBRARY)
-#	TARGET_LINK_LIBRARIES(fms ${TINYXML_LIBRARY})
-#ELSE(TINYXML_LIBRARY)
-#	MESSAGE(FATAL_ERROR "Could not find TinyXML library.  You must set the location manually.")
-#ENDIF(TINYXML_LIBRARY)
+IF(TINYXML_LIBRARY)
+	TARGET_LINK_LIBRARIES(fms ${TINYXML_LIBRARY})
+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)
+ENDIF(TINYXML_LIBRARY)
 
 IF(ZTHREADS_LIBRARY)
 	TARGET_LINK_LIBRARIES(fms ${ZTHREADS_LIBRARY})