diff --git a/code/nelns/CMakeModules/FindMySQL.cmake b/code/nelns/CMakeModules/FindMySQL.cmake index bdec4e3bd..956d00a30 100644 --- a/code/nelns/CMakeModules/FindMySQL.cmake +++ b/code/nelns/CMakeModules/FindMySQL.cmake @@ -18,6 +18,7 @@ ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) FIND_PATH(MYSQL_INCLUDE_DIR mysql.h /usr/include/mysql /usr/local/include/mysql + /opt/local/include/mysql5/mysql $ENV{ProgramFiles}/MySQL/*/include $ENV{SystemDrive}/MySQL/*/include) @@ -33,6 +34,7 @@ ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) /usr/local/lib /usr/lib/mysql /usr/local/lib/mysql + /opt/local/lib/mysql5/mysql ) ENDIF(WIN32 AND MSVC) diff --git a/code/nelns/CMakeModules/nel.cmake b/code/nelns/CMakeModules/nel.cmake index c148f84f4..7995cbabd 100644 --- a/code/nelns/CMakeModules/nel.cmake +++ b/code/nelns/CMakeModules/nel.cmake @@ -102,7 +102,10 @@ MACRO(NL_SETUP_BUILD) IF(WITH_COVERAGE) SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}") ENDIF(WITH_COVERAGE) - SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt") + SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++") + IF(NOT APPLE) + SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -lrt") + ENDIF(NOT APPLE) SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g") SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6") SET(NL_RELEASEDEBUG_CFLAGS "-DNL_RELEASE_DEBUG -g -finline-functions -O3 ")