Skip to content

Commit 8d55d13

Browse files
committed
- Fix squish install
1 parent 32ffaf9 commit 8d55d13

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ version:
4848
major: 0
4949
minor: 1
5050
patch: 0
51-
release: 3
51+
release: 4
5252
versionprefix: rel-

CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,17 +228,20 @@ if(BUILD_PLATFORM)
228228
# libsquish doesn't support out-of-source compilation, bleh
229229
SOURCE_DIR ${CMAKE_BINARY_DIR}/source/squish
230230
BINARY_DIR ${CMAKE_BINARY_DIR}/source/squish
231+
INSTALL_DIR ${CMAKE_BINARY_DIR}/install/squish
231232

232233
GIT_REPOSITORY https://github.com/Cavewhere/squish.git
233234

234-
CONFIGURE_COMMAND true
235+
CONFIGURE_COMMAND
236+
${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/install/squish/lib
237+
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/install/squish/include
235238

236239
BUILD_COMMAND
237240
make
238241
-f ${CMAKE_BINARY_DIR}/source/squish/Makefile
239242

240243
install
241-
-e INSTALL_DIR=${CMAKE_BINARY_DIR}/build/squish
244+
-e INSTALL_DIR=${CMAKE_BINARY_DIR}/install/squish
242245

243246
INSTALL_COMMAND true
244247
)
@@ -326,6 +329,6 @@ if(BUILD_PLATFORM)
326329
endif()
327330

328331
install (
329-
DIRECTORY ${CMAKE_BINARY_DIR}/install
332+
FILES ${CMAKE_BINARY_DIR}/CMakeCache.txt
330333
DESTINATION libs
331334
)

0 commit comments

Comments
 (0)