Module: sems
Branch: master
Commit: 083877e49d8fcc742c908501cc26433b911627a4
URL: 
https://github.com/sems-server/sems/commit/083877e49d8fcc742c908501cc26433b911627a4

Author: Mikko Lehto <msle...@iki.fi>
Committer: Mikko Lehto <msle...@iki.fi>
Date: 2016-02-08T04:49:52+02:00

cmake: non-base FreeBSD libraries are typically in /usr/local

---

Modified: CMakeLists.txt
Modified: cmake/FindLibevent2.cmake
Modified: core/CMakeLists.txt

---

Diff:  
https://github.com/sems-server/sems/commit/083877e49d8fcc742c908501cc26433b911627a4.diff
Patch: 
https://github.com/sems-server/sems/commit/083877e49d8fcc742c908501cc26433b911627a4.patch

---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31aa406..e6c7fef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -248,6 +248,10 @@ ENDIF(NOT ${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
 INCLUDE_DIRECTORIES (${SEMS_SOURCE_DIR}/core/ampi)
 INCLUDE_DIRECTORIES (${SEMS_SOURCE_DIR}/core/amci)
 INCLUDE_DIRECTORIES (${SEMS_SOURCE_DIR}/core)
+IF(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
+       INCLUDE_DIRECTORIES (/usr/local/include)
+       LINK_DIRECTORIES(/usr/local/lib)
+ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
 
 CONFIGURE_FILE( ${SEMS_SOURCE_DIR}/core/sems.h.cmake 
${SEMS_SOURCE_DIR}/core/sems.h )
 
diff --git a/cmake/FindLibevent2.cmake b/cmake/FindLibevent2.cmake
index c13a038..60d893c 100644
--- a/cmake/FindLibevent2.cmake
+++ b/cmake/FindLibevent2.cmake
@@ -1,4 +1,9 @@
-FIND_PATH(LIBEVENT2_INCLUDE_DIR event2/event.h HINTS /usr/include/event2 )
+IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+       FIND_PATH(LIBEVENT2_INCLUDE_DIR event2/event.h HINTS /usr/local/include 
)
+       SET(CMAKE_SHARED_LIBRARY_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX} 
/usr/local/lib)
+ELSE(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+       FIND_PATH(LIBEVENT2_INCLUDE_DIR event2/event.h HINTS 
/usr/include/event2 )
+ENDIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 FIND_LIBRARY(LIBEVENT2_LIBRARIES NAMES event)
 
 IF(LIBEVENT2_INCLUDE_DIR AND LIBEVENT2_LIBRARIES)
@@ -7,7 +12,7 @@ ENDIF(LIBEVENT2_INCLUDE_DIR AND LIBEVENT2_LIBRARIES)
 
 IF(LIBEVENT2_FOUND)
        IF (NOT Libevent2_FIND_QUIETLY)
-               MESSAGE(STATUS "Found libevent2 includes:       
${LIBEVENT2_INCLUDE_DIR}/event2/event.h")
+               MESSAGE(STATUS "Found libevent2 includes: 
${LIBEVENT2_INCLUDE_DIR}/event2/event.h")
                MESSAGE(STATUS "Found libevent2 library: 
${LIBEVENT2_LIBRARIES}")
        ENDIF (NOT Libevent2_FIND_QUIETLY)
 ELSE(LIBEVENT2_FOUND)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 69c549c..96abc07 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -11,12 +11,14 @@ INCLUDE_DIRECTORIES (ampi)
 INCLUDE_DIRECTORIES (amci)
 
 ADD_EXECUTABLE (sems ${sems_SRCS})
+
 IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-       TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} stdc++ execinfo thr)
+       TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} execinfo thr)
 ELSE(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-       TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} stdc++ resolv)
+       TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} resolv)
 ENDIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} event event_pthreads)
+TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} stdc++ event event_pthreads)
+
 
 IF(SPANDSP_FOUND)
        TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} spandsp)

_______________________________________________
Semsdev mailing list
Semsdev@lists.iptel.org
http://lists.iptel.org/mailman/listinfo/semsdev

Reply via email to