smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: rm configure_build macro set items in main CMakeLists.txt

Browse source
This commit is contained in:
sithlord48 2024-12-01 18:36:48 -05:00 committed by Chris Rizzitello
parent d6c682a923
commit 57f6248b6a
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -89,6 +89,11 @@ if(APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET 12) set(CMAKE_OSX_DEPLOYMENT_TARGET 12)
endif() endif()
# Set Output Folders
# TODO Remove when new wix packages are made with cpack
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
include(cmake/Definitions.cmake) include(cmake/Definitions.cmake)
include(cmake/Build.cmake) include(cmake/Build.cmake)
include(cmake/Libraries.cmake) include(cmake/Libraries.cmake)
@ -97,7 +102,6 @@ include(cmake/Packaging.cmake)
include(GNUInstallDirs) include(GNUInstallDirs)
configure_definitions() configure_definitions()
configure_build()
configure_libs() configure_libs()
add_subdirectory(doc) add_subdirectory(doc)

5
cmake/Build.cmake
View file

@ -13,11 +13,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
macro(configure_build)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
endmacro()
macro(post_config) macro(post_config)
# Build to a temp bin dir on Windows and then copy to the final bin dir # Build to a temp bin dir on Windows and then copy to the final bin dir