nelns_build_fix_mac_macports.patch

rti, 05/10/2010 09:24 pm

Download (1.4 kB)

b/code/nelns/CMakeModules/FindMySQL.cmake Mon May 10 15:50:44 2010 +0200
18 18
  FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
19 19
      /usr/include/mysql
20 20
      /usr/local/include/mysql
21
      /opt/local/include/mysql5/mysql
21 22
      $ENV{ProgramFiles}/MySQL/*/include
22 23
      $ENV{SystemDrive}/MySQL/*/include)
23 24

......
33 34
      /usr/local/lib
34 35
      /usr/lib/mysql
35 36
      /usr/local/lib/mysql
37
      /opt/local/lib/mysql5/mysql
36 38
      )
37 39
  ENDIF(WIN32 AND MSVC)
38 40

b/code/nelns/CMakeModules/nel.cmake Mon May 10 15:50:44 2010 +0200
102 102
    IF(WITH_COVERAGE)
103 103
      SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
104 104
    ENDIF(WITH_COVERAGE)
105
    SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
105
    SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++")
106
    IF(NOT APPLE)
107
      SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -lrt")
108
    ENDIF(NOT APPLE)
106 109
    SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g")
107 110
    SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6")
108 111
    SET(NL_RELEASEDEBUG_CFLAGS "-DNL_RELEASE_DEBUG -g -finline-functions -O3 ")