Skip to content

Commit

Permalink
Merge pull request juj#31 from vbieleny/cpp-11-standard
Browse files Browse the repository at this point in the history
Fix build with older compilers
  • Loading branch information
juj authored Sep 1, 2021
2 parents d503ea8 + 8c5b50a commit a40fcaf
Showing 1 changed file with 9 additions and 12 deletions.
21 changes: 9 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 3.10)

project(RectangleBinPack VERSION "1.0.0" LANGUAGES CXX)

add_library(RectangleBinPack
set(TEST_PROJECT_NAME MaxRectsBinPackTest)

add_library(${PROJECT_NAME}
GuillotineBinPack.cpp
MaxRectsBinPack.cpp
Rect.cpp
Expand All @@ -12,16 +14,11 @@ add_library(RectangleBinPack
SkylineBinPack.cpp
)

target_include_directories(RectangleBinPack
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)

add_library(RectangleBinPack::RectangleBinPack ALIAS RectangleBinPack)
add_library(RectangleBinPack::RectangleBinPack ALIAS ${PROJECT_NAME})
add_executable(${TEST_PROJECT_NAME} test/MaxRectsBinPackTest.cpp MaxRectsBinPack.cpp Rect.cpp)

add_executable(MaxRectsBinPackTest test/MaxRectsBinPackTest.cpp MaxRectsBinPack.cpp Rect.cpp)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(${TEST_PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

target_include_directories(MaxRectsBinPackTest
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11)
target_compile_features(${TEST_PROJECT_NAME} PUBLIC cxx_std_11)

0 comments on commit a40fcaf

Please sign in to comment.