build: Move intx::int128 definition to main CMakeLists.txt

chfast · Jun 17, 2020 · 7d9457b · 7d9457b
1 parent 0b9809b
commit 7d9457b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,6 +40,16 @@ if(INTX_FUZZING)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${fuzzing_flags}")
 endif()
 
+
+set(INTX_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
+
+add_library(int128 INTERFACE)
+add_library(intx::int128 ALIAS int128)
+target_compile_features(int128 INTERFACE cxx_std_14)
+target_sources(int128 INTERFACE $<BUILD_INTERFACE:${INTX_INCLUDE_DIR}/intx/int128.hpp>)
+target_include_directories(int128 INTERFACE $<BUILD_INTERFACE:${INTX_INCLUDE_DIR}>$<INSTALL_INTERFACE:include>)
+
+
 add_subdirectory(lib/intx)
 
 if(INTX_TESTING)

diff --git a/lib/intx/CMakeLists.txt b/lib/intx/CMakeLists.txt
@@ -2,15 +2,6 @@
 # Copyright 2019-2020 Pawel Bylica.
 # Licensed under the Apache License, Version 2.0.
 
-set(INTX_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
-
-add_library(int128 INTERFACE)
-add_library(intx::int128 ALIAS int128)
-target_compile_features(int128 INTERFACE cxx_std_14)
-target_sources(int128 INTERFACE $<BUILD_INTERFACE:${INTX_INCLUDE_DIR}/intx/int128.hpp>)
-target_include_directories(int128 INTERFACE $<BUILD_INTERFACE:${INTX_INCLUDE_DIR}>$<INSTALL_INTERFACE:include>)
-
-
 add_library(intx STATIC
     ${INTX_INCLUDE_DIR}/intx/intx.hpp
     impl.cpp