Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nfc-tools/libnfc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 84b313abcc8e79128efdb9302e63aad2e0522d84
Choose a base ref
..
head repository: nfc-tools/libnfc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2c8f90b57c5fa4f1e6ec3e2092623bc51d45b1bf
Choose a head ref
Showing with 3 additions and 3 deletions.
  1. +3 −3 CMakeLists.txt
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -26,15 +26,15 @@ IF(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
STRING(REGEX REPLACE "\n$" "" GIT_REVISION "${GIT_REVISION}")
ENDIF(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")

# config.h
IF(WIN32)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/contrib/win32)
SET(CMAKE_C_FLAGS "-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE ${CMAKE_C_FLAGS}")
SET(LIBNFC_CONFDIR "./config" CACHE STRING "libnfc configuration directory")
ELSE(WIN32)
SET(LIBNFC_CONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/nfc" CACHE STRING "libnfc configuration directory")
SET(_XOPEN_SOURCE 600)
ENDIF(WIN32)

# config.h
SET(LIBNFC_CONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/nfc" CACHE STRING "libnfc configuration directory")
ADD_DEFINITIONS("-DHAVE_CONFIG_H")
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})