Skip to content

Commit 6bca537

Browse files
committed
updated build
1 parent c34c71c commit 6bca537

File tree

4 files changed

+81
-13
lines changed

4 files changed

+81
-13
lines changed

CMakeLists.txt

+59-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,66 @@
11
cmake_minimum_required(VERSION 3.8)
2-
project(Input_Lite)
2+
project(input_lite)
33

44
set(CMAKE_CXX_STANDARD 14)
55
set(CMAKE_CXX_STANDARD_REQUIRED ON)
66
set(CMAKE_CXX_EXTENSIONS OFF)
77

8-
add_subdirectory(src)
8+
if(MSVC)
9+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
10+
else()
11+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
12+
endif()
13+
14+
if(WIN32)
15+
set(INPUT_LITE_PLATFORM_SRC
16+
src/windows/Input.cpp
17+
)
18+
set(INPUT_LITE_PLATFORM_INC
19+
include/windows
20+
)
21+
22+
elseif(APPLE)
23+
24+
set(INPUT_LITE_PLATFORM_SRC
25+
src/ios/Input.cpp
26+
)
27+
set(INPUT_LITE_PLATFORM_INC
28+
include/ios
29+
)
30+
else()
31+
set(INPUT_LITE_PLATFORM_SRC
32+
src/linux/Input.cpp
33+
)
34+
find_package(X11 REQUIRED)
35+
set(INPUT_LITE_PLATFORM_INC
36+
include/linux
37+
${X11_INCLUDE_DIR}
38+
)
39+
endif()
40+
41+
include_directories(
42+
include
43+
${INPUT_LITE_PLATFORM_INC}
44+
)
45+
add_library(${PROJECT_NAME}
46+
src/InputManager.cpp
47+
src/Input_Lite.cpp
48+
${INPUT_LITE_PLATFORM_SRC}
49+
)
50+
51+
if(BUILD_SHARED_LIBS)
52+
install (TARGETS ${PROJECT_NAME}
53+
LIBRARY DESTINATION bin
54+
)
55+
else()
56+
install (TARGETS ${PROJECT_NAME}
57+
ARCHIVE DESTINATION lib
58+
)
59+
endif()
60+
61+
install (FILES
62+
include/Input_Lite.h
63+
DESTINATION include
64+
)
65+
966
add_subdirectory(Test)

Test/CMakeLists.txt

+22-11
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,30 @@
1-
project(Input_Lite_Test)
1+
project(input_lite_test)
22

3-
4-
if(MSVC)
5-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
3+
if(APPLE)
4+
find_library(corefoundation_lib CoreFoundation)
5+
find_library(cocoa_lib Cocoa)
6+
set(INPUT_LITE_PLATFORM_LIBS ${corefoundation_lib} ${cocoa_lib})
67
else()
7-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
8+
find_package(X11 REQUIRED)
9+
if(!X11_XTest_FOUND)
10+
message(FATAL_ERROR "X11 extensions are required, but not found!")
11+
endif()
12+
if(!X11_Xfixes_LIB)
13+
message(FATAL_ERROR "X11 fixes extension is required, but not found!")
14+
endif()
15+
find_package(Threads REQUIRED)
16+
set(INPUT_LITE_PLATFORM_LIBS
17+
${X11_LIBRARIES}
18+
${X11_Xfixes_LIB}
19+
${X11_XTest_LIB}
20+
${CMAKE_THREAD_LIBS_INIT}
21+
)
22+
823
endif()
924

10-
set(${PROJECT_NAME}_EXAMPLE_SRC
11-
main.cpp
12-
)
1325

14-
include_directories(${INPUT_LITE_INCLUDE_DIRS})
1526

16-
add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_EXAMPLE_SRC} ${${PROJECT_NAME}_PLATFORM_SRC})
17-
target_link_libraries(${PROJECT_NAME} ${INPUT_LITE_LIBS} )
27+
add_executable(${PROJECT_NAME} main.cpp)
28+
target_link_libraries(${PROJECT_NAME} input_lite ${INPUT_LITE_PLATFORM_LIBS})
1829

1930
add_test (NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME})
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)