From 7cffead6cdae643d2a1c1b6df9aa8d55423227bb Mon Sep 17 00:00:00 2001
From: "denis.arrivault" <denis.arrivault@frontend.lif.univ-mrs.fr>
Date: Tue, 4 Dec 2018 10:58:28 +0100
Subject: [PATCH] Add c99 compilation option to targets + add explicit python
include
---
CMakeLists.txt | 6 ++++++
ltfat_C_kernel/CMakeLists.txt | 2 ++
2 files changed, 8 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e17dca..7799976 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,12 @@ set(LTFATPY_DIR "${CMAKE_SOURCE_DIR}/ltfatpy")
set(CKERNEL_DIR "${LTFATPY_SOURCE_DIR}/ltfat_C_kernel")
set(DOC_DIR "${LTFATPY_SOURCE_DIR}/doc")
+##### Find Python
+find_package( PythonLibs 3 REQUIRED )
+find_package( PythonInterp 3 REQUIRED )
+include_directories( ${PYTHON_INCLUDE_DIRS} )
+message("PYTHON INCLUDES : ${PYTHON_INCLUDE_DIRS}")
+
#### Find FFTW
find_package(FFTW REQUIRED)
message ("FFTW found")
diff --git a/ltfat_C_kernel/CMakeLists.txt b/ltfat_C_kernel/CMakeLists.txt
index 218fb2d..9fcd929 100644
--- a/ltfat_C_kernel/CMakeLists.txt
+++ b/ltfat_C_kernel/CMakeLists.txt
@@ -20,12 +20,14 @@ add_library(ltfatf STATIC ${SRC} ${SRC_BLASLAPACK})
target_link_libraries(ltfatf ${FFTW_LIBRARIES} ${FFTWF_LIBRARIES}
${LAPACK_LIBRARIES} ${CMAKE_EXE_LINKER_FLAGS})
target_compile_definitions(ltfatf PUBLIC LTFAT_SINGLE)
+set_property(TARGET ltfatf PROPERTY C_STANDARD 99)
install(TARGETS ltfatf ARCHIVE DESTINATION ${CKERNEL_DIR}/lib)
add_library(ltfat STATIC ${SRC} ${SRC_BLASLAPACK} ${SRC_NOTYPECHANGE})
target_link_libraries(ltfat ${FFTW_LIBRARIES} ${FFTWF_LIBRARIES}
${LAPACK_LIBRARIES} ${CMAKE_EXE_LINKER_FLAGS})
target_compile_definitions(ltfat PUBLIC LTFAT_DOUBLE)
+set_property(TARGET ltfat PROPERTY C_STANDARD 99)
install(TARGETS ltfat ARCHIVE DESTINATION ${CKERNEL_DIR}/lib)
#add_subdirectory(tests)
--
GitLab