stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed typo in cmake tests & reordered configuration file generation to execute after option handling

Browse source
This commit is contained in:
Snaipe 2015-07-31 12:01:02 +02:00
parent 59e5836046
commit e093954b56
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
CMakeLists.txt
View file

@ -31,7 +31,7 @@ endif()
find_package(Gettext)
find_package(Libintl)
if (GETTEXT_FOUND AND Libintl_FOUND)
if (GETTEXT_FOUND AND LIBINTL_LIB_FOUND)
include(GettextTranslate)
add_subdirectory(po)
set(ENABLE_NLS 1)
@ -43,13 +43,6 @@ CHECK_LIBRARY_EXISTS(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME)
find_package(PCRE)
find_package(Libcsptr REQUIRED)
# Generate the configure file
configure_file(
"${CMAKE_SOURCE_DIR}/src/config.h.in"
"${CMAKE_SOURCE_DIR}/src/config.h"
)
# List sources and headers
set(SOURCE_FILES
@ -100,6 +93,13 @@ set(INTERFACE_FILES
include/criterion/stats.h
)
# Generate the configure file
configure_file(
"${CMAKE_SOURCE_DIR}/src/config.h.in"
"${CMAKE_SOURCE_DIR}/src/config.h"
)
include_directories(include src ${CSPTR_INCLUDE_DIRS})
add_library(criterion SHARED ${SOURCE_FILES} ${INTERFACE_FILES})
target_link_libraries(criterion ${CSPTR_LIBRARIES})
@ -112,7 +112,7 @@ if (PCRE_FOUND)
target_link_libraries(criterion ${PCRE_LIBRARIES})
endif()
if (LIBINTL_FOUND)
if (LIBINTL_LIB_FOUND)
target_link_libraries(criterion ${LIBINTL_LIBRARIES})
endif()