Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update of cmake config to reflect the vs proj changes since the last update

Browse Source 
Close #3918
This commit is contained in:
Christian Grasser 2017-11-25 19:43:52 +01:00 committed by Don HO
parent bdd9acb0f5
commit 9bba1291d4
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
PowerEditor/src/CMakeLists.txt
View File

@ -53,16 +53,23 @@ SET(projIncludDir ../../scintilla/include/
./WinControls/FunctionList/ ./WinControls/FunctionList/
./uchardet/ ./uchardet/
./WinControls/FileBrowser/ ./WinControls/FileBrowser/
./WinControls/ReadDirectoryChanges/) ./WinControls/ReadDirectoryChanges/
./MISC/md5/
./MISC/sha2/
./WinControls/PluginsAdmin/
./json/)
SET(src_files SET(src_files
./MISC/Common/LongRunningOperation.cpp ./MISC/Common/verifySignedfile.cpp
./MISC/Common/mutex.cpp ./MISC/md5/md5Dlgs.cpp
./MISC/sha2/sha-256.cpp
./MISC/Process/Processus.cpp ./MISC/Process/Processus.cpp
./WinControls/AboutDlg/AboutDlg.cpp ./WinControls/AboutDlg/AboutDlg.cpp
./WinControls/AnsiCharPanel/ansiCharPanel.cpp ./WinControls/AnsiCharPanel/ansiCharPanel.cpp
./ScitillaComponent/AutoCompletion.cpp ./ScitillaComponent/AutoCompletion.cpp
./WinControls/AnsiCharPanel/asciiListView.cpp
./WinControls/FileBrowser/fileBrowser.cpp ./WinControls/FileBrowser/fileBrowser.cpp
./WinControls/Grid/BabyGrid.cpp ./WinControls/Grid/BabyGrid.cpp
./WinControls/Grid/BabyGridWrapper.cpp ./WinControls/Grid/BabyGridWrapper.cpp
@ -74,6 +81,7 @@ SET(src_files
./ScitillaComponent/columnEditor.cpp ./ScitillaComponent/columnEditor.cpp
./MISC/Common/Common.cpp ./MISC/Common/Common.cpp
./WinControls/ContextMenu/ContextMenu.cpp ./WinControls/ContextMenu/ContextMenu.cpp
./WinControls/PluginsAdmin/pluginsAdmin.cpp
./WinControls/ReadDirectoryChanges/ReadDirectoryChanges.cpp ./WinControls/ReadDirectoryChanges/ReadDirectoryChanges.cpp
./WinControls/ReadDirectoryChanges/ReadDirectoryChangesPrivate.cpp ./WinControls/ReadDirectoryChanges/ReadDirectoryChangesPrivate.cpp
./WinControls/TabBar/ControlsTab.cpp ./WinControls/TabBar/ControlsTab.cpp
@ -82,6 +90,7 @@ SET(src_files
./WinControls/DockingWnd/DockingSplitter.cpp ./WinControls/DockingWnd/DockingSplitter.cpp
./ScitillaComponent/DocTabView.cpp ./ScitillaComponent/DocTabView.cpp
./WinControls/DocumentMap/documentMap.cpp ./WinControls/DocumentMap/documentMap.cpp
./WinControls/DocumentMap/documentSnapshot.cpp
./EncodingMapper.cpp ./EncodingMapper.cpp
./WinControls/OpenSaveFileDialog/FileDialog.cpp ./WinControls/OpenSaveFileDialog/FileDialog.cpp
./WinControls/FindCharsInRange/FindCharsInRange.cpp ./WinControls/FindCharsInRange/FindCharsInRange.cpp
@ -180,13 +189,14 @@ SET(src_files
) )
SET(include_files SET(include_files
./MISC/Common/LongRunningOperation.h ./MISC/Common/verifySignedfile.h
./MISC/Common/mutex.h ./MISC/md5/md5Dlgs.h
./MISC/Common/mutex.hxx ./MISC/sha2/sha-256.h
./MISC/Process/Processus.h ./MISC/Process/Processus.h
./WinControls/AboutDlg/AboutDlg.h ./WinControls/AboutDlg/AboutDlg.h
./WinControls/AnsiCharPanel/ansiCharPanel.h ./WinControls/AnsiCharPanel/ansiCharPanel.h
./ScitillaComponent/AutoCompletion.h ./ScitillaComponent/AutoCompletion.h
./WinControls/AnsiCharPanel/asciiListView.h
./WinControls/FileBrowser/fileBrowser.h ./WinControls/FileBrowser/fileBrowser.h
./WinControls/FileBrowser/fileBrowser_rc.h ./WinControls/FileBrowser/fileBrowser_rc.h
./WinControls/Grid/BabyGrid.h ./WinControls/Grid/BabyGrid.h
@ -201,6 +211,8 @@ SET(include_files
./ScitillaComponent/columnEditor.h ./ScitillaComponent/columnEditor.h
./MISC/Common/Common.h ./MISC/Common/Common.h
./WinControls/ContextMenu/ContextMenu.h ./WinControls/ContextMenu/ContextMenu.h
./WinControls/PluginsAdmin/pluginsAdmin.h
./WinControls/PluginsAdmin/pluginsAdminRes.h
./WinControls/ReadDirectoryChanges/ReadDirectoryChanges.h ./WinControls/ReadDirectoryChanges/ReadDirectoryChanges.h
./WinControls/ReadDirectoryChanges/ReadDirectoryChangesPrivate.h ./WinControls/ReadDirectoryChanges/ReadDirectoryChangesPrivate.h
./WinControls/ReadDirectoryChanges/ThreadSafeQueue.h ./WinControls/ReadDirectoryChanges/ThreadSafeQueue.h
@ -213,6 +225,7 @@ SET(include_files
./WinControls/DockingWnd/DockingSplitter.h ./WinControls/DockingWnd/DockingSplitter.h
./ScitillaComponent/DocTabView.h ./ScitillaComponent/DocTabView.h
./WinControls/DocumentMap/documentMap.h ./WinControls/DocumentMap/documentMap.h
./WinControls/DocumentMap/documentSnapshot.h
./EncodingMapper.h ./EncodingMapper.h
./WinControls/OpenSaveFileDialog/FileDialog.h ./WinControls/OpenSaveFileDialog/FileDialog.h
./MISC/FileNameStringSplitter.h ./MISC/FileNameStringSplitter.h
@ -314,17 +327,20 @@ SET(include_files
SET(rcFiles SET(rcFiles
./MISC/md5/md5Dlgs.rc
./WinControls/AnsiCharPanel/ansiCharPanel.rc ./WinControls/AnsiCharPanel/ansiCharPanel.rc
./WinControls/ClipboardHistory/clipboardHistoryPanel.rc ./WinControls/ClipboardHistory/clipboardHistoryPanel.rc
./WinControls/ColourPicker/ColourPopup.rc ./WinControls/ColourPicker/ColourPopup.rc
./ScitillaComponent/columnEditor.rc ./ScitillaComponent/columnEditor.rc
./WinControls/DockingWnd/DockingGUIWidget.rc ./WinControls/DockingWnd/DockingGUIWidget.rc
./WinControls/DocumentMap/documentMap.rc ./WinControls/DocumentMap/documentMap.rc
./WinControls/DocumentMap/documentSnapshot.rc
./WinControls/FileBrowser/fileBrowser.rc ./WinControls/FileBrowser/fileBrowser.rc
./WinControls/FindCharsInRange/findCharsInRange.rc ./WinControls/FindCharsInRange/findCharsInRange.rc
./ScitillaComponent/FindReplaceDlg.rc ./ScitillaComponent/FindReplaceDlg.rc
./WinControls/FunctionList/functionListPanel.rc ./WinControls/FunctionList/functionListPanel.rc
./Notepad_plus.rc ./Notepad_plus.rc
./WinControls/PluginsAdmin/pluginsAdmin.rc
./WinControls/Preference/preference.rc ./WinControls/Preference/preference.rc
./WinControls/ProjectPanel/ProjectPanel.rc ./WinControls/ProjectPanel/ProjectPanel.rc
./MISC/RegExt/regExtDlg.rc ./MISC/RegExt/regExtDlg.rc
@ -341,14 +357,14 @@ SET(rcFiles
IF (WIN32) IF (WIN32)
SET(option WIN32) SET(option WIN32)
SET(win32_LIBRARIES comctl32 shlwapi dbghelp) SET(win32_LIBRARIES comctl32 shlwapi dbghelp version crypt32 wintrust sensapi)
if ( MSVC ) if ( MSVC )
#do not use for mingw builds #do not use for mingw builds
SET(CMAKE_CXX_FLAGS "/EHa /MP /W4") SET(CMAKE_CXX_FLAGS "/EHa /MP /W4")
SET(defs -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x501 -D_USE_64BIT_TIME_T -DTIXML_USE_STL -DTIXMLA_USE_STL -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NON_CONFORMING_SWPRINTFS ) SET(defs -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x501 -D_USE_64BIT_TIME_T -DTIXML_USE_STL -DTIXMLA_USE_STL -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NON_CONFORMING_SWPRINTFS )
else ( MSVC ) else ( MSVC )
# For possible MinGW compilation # For possible MinGW compilation
SET(CMAKE_CXX_FLAGS "-include../gcc/include/various.h -std=c++14 -fpermissive") SET(CMAKE_CXX_FLAGS "-include../gcc/include/various.h -std=c++17 -fpermissive")
SET(defs -DUNICODE -D_UNICODE -D_USE_64BIT_TIME_T -DTIXML_USE_STL -DTIXMLA_USE_STL ) SET(defs -DUNICODE -D_UNICODE -D_USE_64BIT_TIME_T -DTIXML_USE_STL -DTIXMLA_USE_STL )
endif ( MSVC ) endif ( MSVC )
ENDIF (WIN32) ENDIF (WIN32)