X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=CMakeLists.txt;h=8c79cce630922b12ece09f0ad9c0ad11cf5cad75;hp=3a14d8fc509889653c0a64d85d33dcecb37dcbc3;hb=37a8d59548287dcad78ef00e7b18058721eb9935;hpb=f208e33c29132aacaec448e74341edea1b925a2a diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a14d8f..8c79cce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,13 +72,19 @@ src/xyssl/sha1.c ADD_DEFINITIONS(-DTIXML_USE_STL) -IF(CMAKE_COMPILER_IS_GNUCXX) - #ADD_DEFINITIONS(-fpermissive) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") -ENDIF(CMAKE_COMPILER_IS_GNUCXX) +# was for ZThreads +#IF(CMAKE_COMPILER_IS_GNUCXX) +# #ADD_DEFINITIONS(-fpermissive) +# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") +#ENDIF(CMAKE_COMPILER_IS_GNUCXX) ADD_EXECUTABLE(fms ${FMS_SRC}) +# For SQLite3 and shttpd +IF(CMAKE_COMPILER_IS_GNUCC) + TARGET_LINK_LIBRARIES(fms dl) +ENDIF(CMAKE_COMPILER_IS_GNUCC) + IF(WIN32) TARGET_LINK_LIBRARIES(fms ws2_32) ENDIF(WIN32) @@ -95,9 +101,6 @@ ELSE(SQLITE3_LIBRARY) ADD_LIBRARY(sqlite3 libs/sqlite3/sqlite3.c) TARGET_LINK_LIBRARIES(fms sqlite3) INCLUDE_DIRECTORIES(libs/sqlite3) - IF(CMAKE_COMPILER_IS_GNUCC) - TARGET_LINK_LIBRARIES(fms dl) - ENDIF(CMAKE_COMPILER_IS_GNUCC) ENDIF(SQLITE3_LIBRARY) IF(TINYXML_LIBRARY)