Skip to content

Commit fc8e84a

Browse files
Copilottobbi
andcommitted
Add glm to test targets' LIBRARIES to fix missing include paths
Co-authored-by: tobbi <[email protected]>
1 parent 28e226c commit fc8e84a

2 files changed

Lines changed: 3 additions & 10 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
133133
endif()
134134

135135
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
136-
# On Apple Silicon (arm64), Homebrew installs to /opt/homebrew
137-
# On Intel Macs (x86_64), Homebrew installs to /usr/local
138-
if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
139-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/opt/homebrew/lib")
140-
list(APPEND CMAKE_PREFIX_PATH "/opt/homebrew")
141-
else()
142-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib")
143-
endif()
136+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib")
144137
endif()
145138

146139
if(MINGW)

tests/unit/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ make_unit_test(MD5Test SOURCE md5_test.cpp
2727

2828
make_unit_test(AATriangleTest SOURCE aatriangle_test.cpp
2929
EXTERNAL math/aatriangle.cpp
30-
LIBRARIES SDL2 DEFINITIONS GLM_ENABLE_EXPERIMENTAL)
30+
LIBRARIES SDL2 glm DEFINITIONS GLM_ENABLE_EXPERIMENTAL)
3131

3232
make_unit_test(CollisionTest SOURCE collision_test.cpp
3333
EXTERNAL math/rectf.cpp
34-
LIBRARIES SDL2 DEFINITIONS GLM_ENABLE_EXPERIMENTAL)
34+
LIBRARIES SDL2 glm DEFINITIONS GLM_ENABLE_EXPERIMENTAL)
3535
#make_unit_test(DynamicScopedTest SOURCE dynamic_scoped_test.cpp
3636
# LIBRARIES SDL2)
3737
#make_unit_test(FileSystemTest SOURCE file_system_test.cpp

0 commit comments

Comments
 (0)