Commit ea43c907 authored by Michaël Roynard's avatar Michaël Roynard

Merge branch 'dev' into 'master'

Minor fixes

See merge request !5
parents 4f7c100c bc11049a
Pipeline #2068 passed with stage
in 1 minute and 10 seconds
......@@ -15,7 +15,7 @@ class GtestconstexprextConan(ConanFile):
def source(self):
git = tools.Git()
git.clone(self.url)
git.clone("https://gitlab.lrde.epita.fr/mroynard/gtest-constexpr-ext.git")
def build(self):
cmake = CMake(self, generator="Ninja")
......
......@@ -5,7 +5,7 @@ target_compile_features(Gtest-constexpr-ext INTERFACE cxx_std_17)
target_include_directories(Gtest-constexpr-ext INTERFACE ${GTEST_CONSTEXPR_EXT_INCLUDE_DIR})
target_link_libraries(Gtest-constexpr-ext INTERFACE CONAN_PKG::gtest)
FIND_PACKAGE(Threads REQUIRED)
find_package(Threads REQUIRED)
target_link_libraries(Gtest-constexpr-ext INTERFACE Threads::Threads)
# dummy static project not linked anywere needed so that a vcxproj is generated with the sources in the solution
......@@ -16,6 +16,5 @@ set(GTEST_CONSTEXPR_EXT_SOURCES
add_library(Gtest-constexpr-ext_srcs EXCLUDE_FROM_ALL STATIC ${GTEST_CONSTEXPR_EXT_SOURCES})
set_target_properties(Gtest-constexpr-ext_srcs PROPERTIES LINKER_LANGUAGE CXX)
target_compile_features(Gtest-constexpr-ext_srcs PUBLIC cxx_std_17)
target_include_directories(Gtest-constexpr-ext_srcs PUBLIC ${GTEST_CONSTEXPR_EXT_INCLUDE_DIR})
source_group(TREE ${GTEST_CONSTEXPR_EXT_INCLUDE_DIR} FILES ${GTEST_CONSTEXPR_EXT_SOURCES})
target_link_libraries(Gtest-constexpr-ext_srcs PUBLIC Gtest-constexpr-ext)
source_group(TREE ${GTEST_CONSTEXPR_EXT_INCLUDE_DIR} FILES ${GTEST_CONSTEXPR_EXT_SOURCES})
......@@ -26,7 +26,7 @@ option(WITH_TESTS "Compile and run tests" ON)
if(WITH_TESTS)
FIND_PACKAGE(Threads REQUIRED)
find_package(Threads REQUIRED)
add_subdirectory(gtest-constexpr-ext)
endif(WITH_TESTS)
......@@ -8,7 +8,7 @@ add_executable(test test.cpp)
target_compile_features(test INTERFACE cxx_std_17)
target_link_libraries(test PRIVATE CONAN_PKG::gtest-constexpr-ext)
FIND_PACKAGE(Threads REQUIRED)
find_package(Threads REQUIRED)
target_link_libraries(test PRIVATE Threads::Threads)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment