Skip to content

Commit

Permalink
Merge branch 'refs/heads/core4' into feature/add-target-component-alias
Browse files Browse the repository at this point in the history
# Conflicts:
#	nel/CMakeLists.txt
#	snowballs2/CMakeLists.txt
  • Loading branch information
zerotacg committed Jul 5, 2024
2 parents 762adb5 + 8abd54d commit cdac284
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion nel/tools/nel_unit_test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ TARGET_LINK_LIBRARIES(nel_unit_test ${CPPTEST_LIBRARIES} NeL::misc NeL::net nell
NL_DEFAULT_PROPS(nel_unit_test "Unit Tests")
NL_ADD_RUNTIME_FLAGS(nel_unit_test)

ADD_DEFINITIONS(-DNEL_UNIT_BASE="${PROJECT_SOURCE_DIR}/nel/tools/nel_unit_test/")
ADD_DEFINITIONS(-DNEL_UNIT_BASE="${PROJECT_SOURCE_DIR}/tools/nel_unit_test/")

INSTALL(TARGETS nel_unit_test RUNTIME DESTINATION ${NL_BIN_PREFIX})

0 comments on commit cdac284

Please sign in to comment.