diff options
Diffstat (limited to 'contrib/cmake/BuildPicoC.cmake')
| -rw-r--r-- | contrib/cmake/BuildPicoC.cmake | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/contrib/cmake/BuildPicoC.cmake b/contrib/cmake/BuildPicoC.cmake index 620f01f..c13937f 100644 --- a/contrib/cmake/BuildPicoC.cmake +++ b/contrib/cmake/BuildPicoC.cmake @@ -2,10 +2,23 @@ include(ExternalProject) if ("${CMAKE_GENERATOR}" STREQUAL "Xcode") set(PICOC_LIBNAME "Debug/libpicoc.a") + set(PICOC_LIBRARY ${CMAKE_BINARY_DIR}/deps/picoc/src/picoc-build/${PICOC_LIBNAME}) elseif (WIN32) - set(PICOC_LIBNAME "picoc.lib") + if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio") + set(PICOC_LIBNAME "picoc.lib") + set(PICOC_LIBRARY + "debug" + "${CMAKE_BINARY_DIR}/deps/picoc/src/picoc-build/Debug/${PICOC_LIBNAME}" + "optimized" + "${CMAKE_BINARY_DIR}/deps/picoc/src/picoc-build/Release/${PICOC_LIBNAME}" + ) + else() + set(PICOC_LIBNAME "picoc.lib") + set(PICOC_LIBRARY ${CMAKE_BINARY_DIR}/deps/picoc/src/picoc-build/${PICOC_LIBNAME}) + endif() elseif(UNIX) set(PICOC_LIBNAME "libpicoc.a") + set(PICOC_LIBRARY ${CMAKE_BINARY_DIR}/deps/picoc/src/picoc-build/${PICOC_LIBNAME}) endif() externalproject_add(picoc @@ -13,6 +26,9 @@ externalproject_add(picoc BUILD_IN_SOURCE 0 PREFIX ${CMAKE_BINARY_DIR}/deps/picoc UPDATE_COMMAND "" + BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config Release + COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config Debug + PATCH_COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/contrib/patches/picoc/CMakeLists.txt" <SOURCE_DIR>/CMakeLists.txt && ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/contrib/patches/picoc/platform.h" <SOURCE_DIR>/platform.h @@ -31,7 +47,6 @@ externalproject_add(picoc ) set(PICOC_INCLUDE_DIR ${CMAKE_BINARY_DIR}/deps/picoc/src/picoc) -set(PICOC_LIBRARY ${CMAKE_BINARY_DIR}/deps/picoc/src/picoc-build/${PICOC_LIBNAME}) set(PICOC_BUILT ON) |