Page MenuHomePhabricator (Chris)
Files F134032

No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e93e029..ff6eedc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,46 +1,47 @@
cmake_minimum_required(VERSION 3.2)
project(Guitar
VERSION 1.0.0
LANGUAGES CXX C
)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
# Disable in-source-build
set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
set(CMAKE_DISABLE_SOURCE_CHANGES ON)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
find_package(Qt5 COMPONENTS Core Widgets Network Svg REQUIRED)
find_package(zlib REQUIRED )
find_package(OpenSSL REQUIRED )
find_package(Qt5LinguistTools REQUIRED)
if(WIN32)
# check package at
# https://github.com/rprichard/winpty
find_package(winpty REQUIRED )
endif()
# extract version information
string(TIMESTAMP Guitar_copyright_year "%Y")
execute_process(
COMMAND git rev-parse --short=7 HEAD
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE Guitar_git_hash
OUTPUT_STRIP_TRAILING_WHITESPACE
)
configure_file(version.h.in version.h)
configure_file(win.rc.in win.rc.h)
configure_file(Info.plist.in Info.plist)
add_subdirectory(src)
+#add_subdirectory(extra)
diff --git a/extra/FileView/CMakeLists.txt b/extra/FileView/CMakeLists.txt
index 58071bb..932a6d9 100644
--- a/extra/FileView/CMakeLists.txt
+++ b/extra/FileView/CMakeLists.txt
@@ -1,64 +1,52 @@
cmake_minimum_required(VERSION 3.2)
project(FileView
VERSION 0.9.0
LANGUAGES CXX C
)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
-find_package(Qt5 COMPONENTS Core Widgets Network Svg REQUIRED)
-
-set(FileView_SOURCES
- main.cpp
- MainWindow.cpp
- ../../src/texteditor/AbstractCharacterBasedApplication.cpp
- ../../src/texteditor/InputMethodPopup.cpp
- ../../src/texteditor/TextEditorTheme.cpp
- ../../src/texteditor/TextEditorWidget.cpp
- ../../src/texteditor/unicode.cpp
- ../../src/texteditor/UnicodeWidth.cpp
- ../../src/FileViewWidget.cpp
- ../../src/common/joinpath.cpp
- ../../src/common/misc.cpp
- ../../src/ImageViewWidget.cpp
- ../../src/MemoryReader.cpp
- ../../src/Photoshop.cpp
- ../../src/ImageViewWidget.cpp
- )
-
-set(FileView_HEADERS
- MainWindow.h
- ../../src/texteditor/AbstractCharacterBasedApplication.h
- ../../src/texteditor/InputMethodPopup.h
- ../../src/texteditor/TextEditorTheme.h
- ../../src/texteditor/TextEditorWidget.h
- ../../src/texteditor/unicode.h
- ../../src/texteditor/UnicodeWidth.h
- ../../src/FileViewWidget.h
- ../../src/common/joinpath.h
- ../../src/common/misc.h
- ../../src/ImageViewWidget.h
- ../../src/MemoryReader.h
- ../../src/Photoshop.h
- ../../src/ImageViewWidget.h
- )
-
-set(FileView_UIS
- MainWindow.ui
- )
-
+# 再帰的にSourceを取得...としたいけど不要なものをとりすぎてしまうので限定的
+file(GLOB_RECURSE FileView_SOURCES ${CMAKE_SOURCE_DIR}/src/texteditor/*.cpp)
+file(GLOB_RECURSE common ${CMAKE_SOURCE_DIR}/src/common/*.cpp)
+list(APPEND FileView_SOURCES
+ ${common}
+ ${CMAKE_SOURCE_DIR}/src/FileViewWidget.cpp
+ ${CMAKE_SOURCE_DIR}/src/ImageViewWidget.cpp
+ ${CMAKE_SOURCE_DIR}/src/MemoryReader.cpp
+ ${CMAKE_SOURCE_DIR}/src/Photoshop.cpp)
+
+# MainWindow.cppをSWAP
+list(APPEND FileView_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/MainWindow.cpp)
+list(REMOVE_ITEM FileView_SOURCES ${CMAKE_SOURCE_DIR}/src/MainWindow.cpp)
+list(REMOVE_ITEM FileView_SOURCES ${CMAKE_SOURCE_DIR}/src/main.cpp)
+
+# main.cpp以外のSourceをコンパイル
+add_library(fileview-lib ${FileView_SOURCES})
+target_link_libraries(fileview-lib PUBLIC
+ Qt5::Widgets
+ Qt5::Network
+ Qt5::Svg)
+target_include_directories(fileview-lib PUBLIC ${CMAKE_BINARY_DIR})
+target_include_directories(fileview-lib PUBLIC ${PROJECT_SOURCE_DIR})
+target_include_directories(fileview-lib PUBLIC ${CMAKE_SOURCE_DIR}/src)
+target_include_directories(fileview-lib PUBLIC ${CMAKE_SOURCE_DIR}/src/texteditor)
+target_include_directories(fileview-lib PUBLIC ${CMAKE_SOURCE_DIR}/src/common)
+
+set_target_properties(fileview-lib PROPERTIES OUTPUT_NAME fileview)
+
+
+file(GLOB_RECURSE FileView_UIS ./*.ui)
+
+# main.cppをコンパイル
add_executable(${PROJECT_NAME}
- ${FileView_SOURCES}
- ${FileView_HEADERS}
- ${FileView_UIS}
- )
+ main.cpp
+ ${FileView_UIS})
-target_link_libraries(${PROJECT_NAME}
- Qt5::Widgets
- Qt5::Network
- Qt5::Svg
-)
+
+# 結合
+target_link_libraries(${PROJECT_NAME} fileview-lib)

File Metadata

Mime Type
text/x-diff
Expires
Wed, Jun 17, 9:14 PM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
70709
Default Alt Text
(4 KB)

Event Timeline