version 0.1.8

[fms.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a14d8f..8c79cce 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,13 +72,19 @@ src/xyssl/sha1.c
 \r
 ADD_DEFINITIONS(-DTIXML_USE_STL)\r
 \r
-IF(CMAKE_COMPILER_IS_GNUCXX)\r
-       #ADD_DEFINITIONS(-fpermissive)\r
-       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")\r
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)\r
+# was for ZThreads\r
+#IF(CMAKE_COMPILER_IS_GNUCXX)\r
+#      #ADD_DEFINITIONS(-fpermissive)\r
+#      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")\r
+#ENDIF(CMAKE_COMPILER_IS_GNUCXX)\r
 \r
 ADD_EXECUTABLE(fms ${FMS_SRC})\r
 \r
+# For SQLite3 and shttpd\r
+IF(CMAKE_COMPILER_IS_GNUCC)\r
+       TARGET_LINK_LIBRARIES(fms dl)\r
+ENDIF(CMAKE_COMPILER_IS_GNUCC)\r
+\r
 IF(WIN32)\r
        TARGET_LINK_LIBRARIES(fms ws2_32)\r
 ENDIF(WIN32)\r
@@ -95,9 +101,6 @@ ELSE(SQLITE3_LIBRARY)
        ADD_LIBRARY(sqlite3 libs/sqlite3/sqlite3.c)\r
        TARGET_LINK_LIBRARIES(fms sqlite3)\r
        INCLUDE_DIRECTORIES(libs/sqlite3)\r
-       IF(CMAKE_COMPILER_IS_GNUCC)\r
-               TARGET_LINK_LIBRARIES(fms dl)\r
-       ENDIF(CMAKE_COMPILER_IS_GNUCC)\r
 ENDIF(SQLITE3_LIBRARY)\r
 \r
 IF(TINYXML_LIBRARY)\r