Merge pull request #7 from jengelh/master
build: stop building kek-win32 on non-Win32
This commit is contained in:
commit
c875b943d1
2 changed files with 13 additions and 2 deletions
|
@ -9,6 +9,8 @@ add_compile_options(-Wall -pedantic -Wextra)
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED True)
|
set(CMAKE_CXX_STANDARD_REQUIRED True)
|
||||||
|
|
||||||
|
if (NOT WIN32)
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
kek
|
kek
|
||||||
bus.cpp
|
bus.cpp
|
||||||
|
@ -34,6 +36,10 @@ add_executable(
|
||||||
utils.cpp
|
utils.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
endif (NOT WIN32)
|
||||||
|
|
||||||
|
if (WIN32)
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
kek-win32
|
kek-win32
|
||||||
bus.cpp
|
bus.cpp
|
||||||
|
@ -58,6 +64,8 @@ add_executable(
|
||||||
win32.cpp
|
win32.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
endif (WIN32)
|
||||||
|
|
||||||
include(CheckIPOSupported)
|
include(CheckIPOSupported)
|
||||||
check_ipo_supported(RESULT supported)
|
check_ipo_supported(RESULT supported)
|
||||||
|
|
||||||
|
@ -68,10 +76,13 @@ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE)
|
||||||
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
|
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
|
||||||
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
|
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
|
||||||
find_package(Threads)
|
find_package(Threads)
|
||||||
|
if (NOT WIN32)
|
||||||
target_link_libraries(kek Threads::Threads)
|
target_link_libraries(kek Threads::Threads)
|
||||||
|
else ()
|
||||||
target_link_libraries(kek-win32 Threads::Threads)
|
target_link_libraries(kek-win32 Threads::Threads)
|
||||||
|
|
||||||
target_link_libraries(kek-win32 ws2_32)
|
target_link_libraries(kek-win32 ws2_32)
|
||||||
|
endif ()
|
||||||
|
|
||||||
include(FindPkgConfig)
|
include(FindPkgConfig)
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ To build for e.g. linux:
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
cmake ..
|
cmake ..
|
||||||
make kek
|
make
|
||||||
|
|
||||||
Required:
|
Required:
|
||||||
* libncursesw5-dev
|
* libncursesw5-dev
|
||||||
|
@ -16,7 +16,7 @@ To build for e.g. windows:
|
||||||
mkdir build-win32
|
mkdir build-win32
|
||||||
cd build-win32
|
cd build-win32
|
||||||
cmake -DCMAKE_TOOLCHAIN_FILE=../mingw64.cmake ..
|
cmake -DCMAKE_TOOLCHAIN_FILE=../mingw64.cmake ..
|
||||||
make kek-win32
|
make
|
||||||
|
|
||||||
|
|
||||||
To run a disk image:
|
To run a disk image:
|
||||||
|
|
Loading…
Add table
Reference in a new issue