Переглянути джерело

Fix support of older systems: Remove C11 derective and add rt library to the link list

Suren A. Chilingaryan 8 роки тому
батько
коміт
55783eb24e
3 змінених файлів з 6 додано та 4 видалено
  1. 4 2
      CMakeLists.txt
  2. 1 1
      pcilib/CMakeLists.txt
  3. 1 1
      pcitool/CMakeLists.txt

+ 4 - 2
CMakeLists.txt

@@ -12,6 +12,8 @@ set(DISABLE_PCITOOL FALSE CACHE BOOL "Build only the library")
 find_package(PkgConfig REQUIRED)
 find_package(Threads REQUIRED)
 
+set(EXTRA_SYSTEM_LIBS -lrt)
+
 #Check in sibling directory
 if (NOT DISABLE_PCITOOL)
     pkg_check_modules(FASTWRITER fastwriter REQUIRED)
@@ -19,8 +21,8 @@ endif (NOT DISABLE_PCITOOL)
 
 check_include_files(stdatomic.h HAVE_STDATOMIC_H)
 
-add_definitions("-fPIC --std=c11 -Wall -O2 -gdwarf-2 -g3")
-#add_definitions("-fPIC --std=c11 -Wall -O2")
+add_definitions("-fPIC --std=c99 -Wall -O2 -gdwarf-2 -g3")
+#add_definitions("-fPIC --std=c99 -Wall -O2")
 
 include(cmake/version.cmake)
 VERSION_TO_VARS(${PCILIB_VERSION} PCILIB_VERSION_MAJOR PCILIB_VERSION_MINOR PCILIB_VERSION_MICRO)

+ 1 - 1
pcilib/CMakeLists.txt

@@ -5,7 +5,7 @@ include_directories(
 
 set(HEADERS pcilib.h pci.h export.h bar.h fifo.h model.h bank.h register.h kmem.h irq.h locking.h lock.h dma.h event.h plugin.h tools.h error.h debug.h env.h version.h config.h)
 add_library(pcilib SHARED pci.c export.c bar.c fifo.c model.c bank.c register.c kmem.c irq.c locking.c lock.c dma.c event.c plugin.c tools.c error.c debug.c env.c )
-target_link_libraries(pcilib dma protocols ${CMAKE_THREAD_LIBS_INIT} ${UFODECODE_LIBRARIES} ${CMAKE_DL_LIBS})
+target_link_libraries(pcilib dma protocols ${CMAKE_THREAD_LIBS_INIT} ${UFODECODE_LIBRARIES} ${CMAKE_DL_LIBS} ${EXTRA_SYSTEM_LIBS})
 add_dependencies(pcilib dma protocols)
 
 install(TARGETS pcilib

+ 1 - 1
pcitool/CMakeLists.txt

@@ -15,7 +15,7 @@ if (NOT DISABLE_PCITOOL)
     add_dependencies(pci pcitool)
     target_link_libraries(pci pcilib ${FASTWRITER_LIBRARIES})
     set_target_properties(pci PROPERTIES
-	LINK_FLAGS ${CMAKE_THREAD_LIBS_INIT}
+	LINK_FLAGS "${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS}"
     )
 
 #set_target_properties(pci PROPERTIES