diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-04-30 21:12:15 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-04-30 21:12:15 (GMT) |
| commit | b41f77f61791758cd20bd9a0709c7395e5f6ef29 (patch) | |
| tree | b522763b4a7143b0a0e9aaf2b745db3f45245d99 | |
| parent | b198912923c40cc97804b8aab1addb3caef89435 (diff) | |
| download | uscxml-b41f77f61791758cd20bd9a0709c7395e5f6ef29.zip uscxml-b41f77f61791758cd20bd9a0709c7395e5f6ef29.tar.gz uscxml-b41f77f61791758cd20bd9a0709c7395e5f6ef29.tar.bz2 | |
Still trying to fix linker issues for ubuntu
| -rw-r--r-- | CMakeLists.txt | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c7a907e..f57d7d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -319,26 +319,6 @@ include_directories(src) # Dependent libraries ############################################################ -if (NOT WIN32) - # libxml2 - find_package(LibXml2 REQUIRED) - include_directories(${LIBXML2_INCLUDE_DIR}) - list (APPEND USCXML_CORE_LIBS ${LIBXML2_LIBRARIES}) - set(XML_LIBRARIES ${LIBXML2_LIBRARIES}) - if (NOT APPLE) - list (APPEND USCXML_CORE_LIBS "rt") - list (APPEND USCXML_CORE_LIBS "rt") # yes it's needed twice e.g. on ubuntu - endif() - list (APPEND USCXML_CORE_LIBS "dl") - list (APPEND USCXML_CORE_LIBS "pthread") -elseif(WIN32) - list (APPEND XML_LIBRARIES "Ws2_32") - list (APPEND XML_LIBRARIES "Winmm") - list (APPEND XML_LIBRARIES "Iphlpapi") - list (APPEND XML_LIBRARIES "Netapi32") - list (APPEND USCXML_CORE_LIBS ${XML_LIBRARIES}) -endif() - # CURL find_package(CURL REQUIRED) include_directories(${CURL_INCLUDE_DIRS}) @@ -387,6 +367,25 @@ list (APPEND USCXML_CORE_LIBS ${EVENT_LIBRARY}) include(src/uscxml/CMakeLists.txt) include_directories(${USCXML_INCLUDE_DIRS}) +if (NOT WIN32) + # libxml2 + find_package(LibXml2 REQUIRED) + include_directories(${LIBXML2_INCLUDE_DIR}) + list (APPEND USCXML_CORE_LIBS ${LIBXML2_LIBRARIES}) + set(XML_LIBRARIES ${LIBXML2_LIBRARIES}) + if (NOT APPLE) + list (APPEND USCXML_CORE_LIBS "rt") + endif() + list (APPEND USCXML_CORE_LIBS "dl") + list (APPEND USCXML_CORE_LIBS "pthread") +elseif(WIN32) + list (APPEND XML_LIBRARIES "Ws2_32") + list (APPEND XML_LIBRARIES "Winmm") + list (APPEND XML_LIBRARIES "Iphlpapi") + list (APPEND XML_LIBRARIES "Netapi32") + list (APPEND USCXML_CORE_LIBS ${XML_LIBRARIES}) +endif() + ############################################################ # Binaries and tests |