Linux fixes

brynmathias · Jun 4, 2009 · a383148 · a383148
1 parent 1d657e9
commit a383148
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
+INCLUDE (CheckLibraryExists)
 
 #to get sources if added
 #find -name "*.cc"
@@ -24,5 +25,11 @@ SET(EDA_SRCS
 #INCLUDE_DIRECTORIES(./include/)
 ADD_LIBRARY(eda_lib ${EDA_SRCS})
 ADD_EXECUTABLE(eda main.cc)
-TARGET_LINK_LIBRARIES(eda eda_lib wsock32)
 
+SET(EXTRALIBS "")
+CHECK_LIBRARY_EXISTS(wsock32 WSAStartup "" HAVE_LIBWSOCK32)
+IF(HAVE_LIBWSOCK32)
+  SET(EXTRALIBS ${EXTRALIBS} "wsock32")
+ENDIF(HAVE_LIBWSOCK32)
+
+TARGET_LINK_LIBRARIES(eda eda_lib ${EXTRALIBS})
diff --git a/util.h b/util.h
@@ -57,7 +57,10 @@ void StringSplit(const char* a, const std::string& in, std::vector<std::string>*
 
 #define INFO 0
 #define WARNING 1
-//#define ERROR 2
+#ifndef WIN32
+// This is a problem on windows
+#define ERROR 2
+#endif
 
 class Logging {
 public: